Christopher Leggett
cd01e8b778
Moves deku scrub messages into CustomMessageTable.
2022-07-25 21:31:17 -04:00
Christopher Leggett
9f2eb46663
Takes Ganondor's text & hint from CustomMessageTable
2022-07-24 19:43:11 -04:00
Christopher Leggett
c1155bb08c
Cleans up unused z_message_PAL code.
2022-07-24 19:35:24 -04:00
Christopher Leggett
661946b4f5
Pulls altar text from CustomMessageTable instead of gSaveContext.
2022-07-24 19:34:12 -04:00
Christopher Leggett
780e9f4669
Fixes storage of altar and ganon hints/text.
...
Only one language is stored in gSaveContext at the moment so store the one language in all 3 CustomMessageEntry languages.
2022-07-24 19:23:54 -04:00
Christopher Leggett
a33c3d606a
Fixes minor oversight from previous commit.
2022-07-24 18:54:05 -04:00
Christopher Leggett
a21998c489
Does some refactoring of rando custom message registration
...
The goal was less verbosity when adding new get-item messages later.
2022-07-24 18:47:55 -04:00
Christopher Leggett
dca922ade8
Merge branch 'develop-zhora' of https://github.com/HarbourMasters/Shipwright into custom-messages
2022-07-24 18:08:10 -04:00
Josh Bodner
ffb3523cb5
Add an option to always win the Goron spinning pot jackpot ( #913 )
2022-07-24 22:00:54 +02:00
lilDavid
62d9390c9b
Add option to allow the ocarina to be played faster ( #903 )
...
* Add the ability to play the ocarina really fast like in MM3D
* Clean up CVar condition
* Rename Unlimited Ocarina Speed to Prevent Dropped Ocarina Inputs
2022-07-24 09:48:06 -04:00
vaguerant
38ecb6cfff
Bug fix: Water Temple gate & bootcommands.c cleanup ( #618 )
...
* Vanilla bug fix: child Water Temple gate
* Clean up bootcommands.c
2022-07-24 09:15:33 -04:00
vaguerant
ccf1bffd4f
Timer Savers: Mask Select in Inventory ( #670 )
...
* Timer Savers: Mask Select in Inventory
* Merge derp
* Implement suggestions per @briaguya-ai
* Fix cut & paste derp
2022-07-24 09:14:36 -04:00
vaguerant
1de5b72802
L-button cheats disable minimap toggle ( #514 )
...
* L-button cheats disable minimap toggle
* Add debug mode to exclusion list
per @briaguya-ai
2022-07-24 09:13:43 -04:00
David Chavez
b3d3148383
Merge branch 'develop-rachael' into develop-zhora
2022-07-22 02:34:55 +02:00
earthcrafterman
2ad78887b9
Added a time saver option to allow players to instantly put items away ( #600 )
...
* Added a time saver option to allow players to instantly put items away
Expanded the range of damage multiplication to 80 (20 hearts of damage for each quarter heart) so players can play a sudden death challenge
* The damage sliders are now comboboxes
Damage multiplication is now exponential instead of incremental
The FPS slider is now a text input
* Splitting into solely being a quick putaway PR
* Removed some leftover code from the split
2022-07-22 02:31:49 +02:00
David Chavez
1ca12feaed
Adds Xcode project ( #769 )
...
* Add Xcode project
Add dynamic lib paths
Generate resources scripts
Fix after rebase
tweak targets
Set min deployment target
* remove project
* readd project with correct gitignore
2022-07-21 20:15:45 -04:00
briaguya
84236e7ac3
stop floor under shadow statue opening immediately ( #857 )
...
* stop floor under shadow statue opening immediately
* use ActorResetFunc to reset sStatueRotY
Co-authored-by: briaguya <briaguya@alice>
2022-07-22 02:11:13 +02:00
Baoulettes
df756b2ce0
Cosmetics editor - Feature requested ( #841 )
...
* Precise positionning, reset margin and pos
* Fix big hearts issues
* add + and - to the editor
* add const to the char*
* Fix labels issues
2022-07-22 01:33:39 +02:00
lilDavid
c7c16c39b0
Add fixes for power crouch stab to the Enhancements menu ( #874 )
...
* Add optional fixes for power crouch stab
* Add line break in "Fix Megaton Hammer" tooltip
Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>
Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>
2022-07-22 01:22:09 +02:00
vaguerant
059045481c
Controller option: Navi on L ( #861 )
2022-07-22 01:21:18 +02:00
Christopher Leggett
44dbd3a8a9
Fixes naming discrepancy of textbox positions. ( #854 )
...
Equivalent to https://github.com/zeldaret/oot/pull/1329
2022-07-22 01:13:04 +02:00
Sarge-117
52f22275e3
Fix Giant's Knife unexpected behaviours ( #834 )
...
* Giant's Knife Behaviour Fixes
Fixes a case where Giant's Knife (specifically, breaking and re-buying it) can behave unexpectedly if you don't have a Kokiri Sword in your inventory. Also fixes the broken icon not showing up in inventory after you break it.
* less whitespace
* fix 0xE check
Accidentally committed with the wrong check
* Move the grayscale code up
Moved the grayscaling portion up higher in the function and renamed "bool not_acquired" to "bool age_restricted". Thanks to @vaguerant for the suggestion!
2022-07-22 00:39:04 +02:00
Baoulettes
c19beca980
Fast Save Loader crashes fixes ( #848 )
2022-07-22 00:36:46 +02:00
briaguya
eb49053e73
Prevent unrestricted items camera crash ( #852 )
2022-07-22 00:35:30 +02:00
RaelCappra
e41873fff4
Savestate crash fix on Ubuntu ( #843 )
2022-07-22 00:34:04 +02:00
briaguya
dfa929a16f
Reset var for shadow boss key room spike walls ( #860 )
2022-07-22 00:31:26 +02:00
Christopher Leggett
880e3928cf
Fixes odd rando interaction with malon after receiving her check. ( #867 )
2022-07-22 00:28:43 +02:00
Jeffrey Crowell
41d1bbe137
Fix nullptr dereference in morpha ( #870 )
...
reported on discord, i don't have the ability to reproduce this, but it
appears to be a benign fix, as the only time that the tent2 is checked
down later is guarded by a null check.
2022-07-22 00:27:44 +02:00
Josh Bodner
1d208c7dc2
Revert to using boolean in json
2022-07-21 11:04:37 -07:00
Josh Bodner
2edc81ee2d
Attempt to restore formatting of randomizer.cpp
2022-07-21 11:03:28 -07:00
Christopher Leggett
21c585b2ce
Removes randomizer_custom_messages, as I relocated its logic elsewhere.
2022-07-21 13:10:04 -04:00
Christopher Leggett
b5dc097587
Cleanup and move most hint logic to CustomMessage.
...
Haven't removed where rando stores the hints for itself and the ganon and altar hints are still pulled from the randomizer class' local storage, but gossip stone hints are pulled from the custom message table now.
2022-07-21 13:05:15 -04:00
Josh Bodner
cddca2700a
Move Child Zelda spoiler write out of for loop so it's not repeatedly hit
2022-07-20 23:08:57 -07:00
Josh Bodner
17b3f65276
Fix the issue for real
2022-07-20 22:57:18 -07:00
Josh Bodner
75a4d2cf99
Actually use the same strings everywhere lol
2022-07-20 21:50:55 -07:00
Josh Bodner
795ee54f2b
Remove use of std::format since Jenkins doesn't like it
2022-07-20 21:44:32 -07:00
Josh Bodner
3633bdeeaf
Fix Child Zelda Skip rando setting always on
2022-07-20 19:57:38 -07:00
Christopher Leggett
c5f66373c3
Adds ability to store and retrieve textbox size and position.
2022-07-19 22:51:39 -04:00
Christopher Leggett
2d1aa1d13a
Merge in develop-zhora
2022-07-19 20:28:21 -04:00
Christopher Leggett
32abe61554
Implements a basic CreateMessage function for non-GetItem text.
2022-07-19 00:31:37 -04:00
PurpleHato
235cef6abf
FIX: RetrictItem SunSong issue ( #839 )
...
Thanks @vaguerant
2022-07-18 22:47:37 -04:00
MelonSpeedruns
e871b53afc
Free cam collision v2 ( #836 )
2022-07-18 22:47:23 -04:00
Andrew Van Caem
edfa369639
Add yShift position when displaying the positions of cylinders ( #823 )
2022-07-18 19:31:52 -04:00
Christopher Leggett
169f757954
Fixes ice trap chests to have short chest animations ( #817 )
2022-07-18 19:31:04 -04:00
David Chavez
4745f73655
[macOS] Bring support down to macOS 10.15 ( #816 )
...
* Pull out CC and CXX flags
* Set minimum deployment target
* Update version to 3.0.0
2022-07-18 19:30:29 -04:00
GaryOderNichts
660897ff63
Avoid UB on ocarinaAction shifts ( #809 )
2022-07-18 19:29:24 -04:00
PurpleHato
9118788149
ADD: SaveEditor Edit current D-Pad Item ( #799 )
...
* ADD: Dapd on "current Dpad equip
* TWEAK: Spelling
* TWEAK: Shows it only if gDpadEquips is enable
* TWEAK: Forgot one "D-pad"
* TWEAK: Spacing
2022-07-18 19:24:56 -04:00
briaguya
9e8335c1f0
fix non-rando non-3d-drops small key crash ( #789 )
...
Co-authored-by: briaguya <briaguya@alice>
2022-07-18 19:22:12 -04:00
briaguya
d45968270a
Address rando pr comments ( #742 )
...
* prefix randomizer methods with Randomizer_
* make filename a local var
* remove unused file, update malon to use new names
* move randomizertypes to randomizer directory
* rename to Randomizer_GetSettingValue
Co-authored-by: briaguya <briaguya@alice>
2022-07-18 19:20:07 -04:00
Christopher Leggett
e04b2c80b6
Implements the custom text for gInjectSkulltulaCount.
...
Also auto-dissmisses the textbox when gSkulltulaFreeze is on. When gInjectSkulltulaCount is off, text is not auto-dismissed just like before, since that is base game text still.
2022-07-17 22:02:22 -04:00
