20bbf85f00
Sets player getItemId before other messagebox instance.
2022-08-09 07:26:17 -04:00
6f7b38539b
Moves setting of getItemId into a rando save if block.
2022-08-09 01:56:47 -04:00
95918e0cb2
Fixes skulltula messages for custom items.
2022-08-09 01:42:47 -04:00
b9e18519a2
Removes Skulltula text auto-dismiss in tokensanity
...
More precisely, removes the auto-dimissal from the Skulltula
textbox when in a rando save and any token shuffle is on.
Bonus Fix: parses the Skullsanity setting from the spoilerfile,
which wasn't happening before.
2022-08-08 23:40:02 -04:00
ffc36efe50
Reimplements FOWL ice trap text boxes.
...
They got lost in the custom-messages merge. Reimplemented them
in the custom-messages system.
2022-08-08 23:11:45 -04:00
8410a79b26
Merge branch 'rando-next' into zhora-to-next
2022-08-08 22:27:04 -04:00
816fac6c06
Merge branch 'develop-zhora' into zhora-to-next
2022-08-08 22:23:06 -04:00
317de33a8b
Merge branch 'develop-rachael' into rachael-to-zhora
2022-08-08 21:43:04 -04:00
fa090c51f6
Merge pull request #831 from leggettc18/custom-messages
...
System for Creating and Storing Custom Messages
2022-08-08 21:24:48 -04:00
e63d84bd7d
Adapts this branch for cmake building.
2022-08-08 21:14:29 -04:00
4ea7f8371f
Rando: Zelda sequence fixes ( #1095 )
...
* Fixed zelda sequence oddities
* Fixed code inconsistency
* Adressed review comments
* Adressed review comments, removed unneccesary entrance skip
* Addressed some more review comments
* tiny cleanup
2022-08-08 19:59:06 -04:00
0e10b59307
Update z_kaleido_item.c ( #1046 )
2022-08-08 19:58:01 -04:00
4bf4ad3359
Update z_en_ru1.c ( #1042 )
2022-08-08 19:56:56 -04:00
f80ba4102a
Add instant boomerang recall ( #1006 )
2022-08-08 19:55:07 -04:00
1f5d323d89
Randomizer: Skip Cutscenes ( #846 )
...
* Skip Jabu Jabu's fishy feeding time if rando is enabled Issue #757
Also skip the ganon tower fall cutscene if you died to ganon during the ganon fight for issue #773
* Immediately give control back to player when talon running cutscene starts.
* Fix case of not skipping Gannon
2022-08-08 19:48:53 -04:00
59baf24dc6
Merge branch 'develop-zhora' of https://github.com/HarbourMasters/Shipwright into custom-messages
2022-08-08 19:46:09 -04:00
9afbe42720
Use -O2 for Release config builds ( #1083 )
2022-08-08 12:01:45 +02:00
f8f8e01039
Merge pull request #1088 from HarbourMasters/develop-zhora
...
quick zhora to rando next
2022-08-07 21:41:31 -04:00
e51e7f3d45
[cmake] Fix Switch icon ( #1084 )
...
* Update CMakeLists.txt
* fix switch icon
* Update soh/CMakeLists.txt
* Update soh/CMakeLists.txt
Co-authored-by: David Chavez <david@dcvz.io >
2022-08-07 16:47:16 +02:00
f7267be29a
Change shuffle cows to checkbox and remove extra line
2022-08-07 02:10:54 -05:00
cac6869a56
Merge pull request #1080 from HarbourMasters/develop-zhora
...
zhora -> rando-next
2022-08-07 02:16:11 -04:00
91ad58aa3e
Merge pull request #1061 from garrettjoecox/frogSongs
...
Shuffle frog song rupees
2022-08-07 02:13:24 -04:00
cb2410d9c5
Handle audio thread properly
2022-08-06 21:52:42 -04:00
c3253fe59f
add comment explaining ocarina mode setting
2022-08-06 18:23:47 -04:00
0eb8f5c95f
remove commented out lines
2022-08-06 18:15:24 -04:00
e0d6445f24
remove unused cow stuff
2022-08-06 18:14:01 -04:00
46c3541458
seems to be working, still needs cleanup
2022-08-06 18:07:16 -04:00
7ef3fff869
add soh icon for Windows ( #1060 )
2022-08-06 22:19:06 +02:00
e274530073
Fix cows giving free bottles, too generous
2022-08-06 03:03:11 -05:00
61c88386a1
Merge branch 'develop-zhora' into zhora-to-next
2022-08-06 00:26:50 -04:00
97d363c91e
Merge pull request #1019 from garrettjoecox/shuffleCows
...
Add shuffleCows options for randomizer
2022-08-06 00:03:27 -04:00
9a145221ec
Remove newline
2022-08-05 21:02:02 -05:00
de34fd7e94
Check coords for other cows rather than falling back
2022-08-05 16:11:17 -05:00
528dbcdc17
More suggested changes
2022-08-05 14:59:04 -05:00
5de662a326
Fix ice traps
2022-08-05 12:05:22 -05:00
ed3cddbeaf
Add option to shuffle frog song rupees
2022-08-05 09:52:11 -05:00
11d7a78e62
More changes from suggestions
2022-08-05 01:38:45 -05:00
1ebca42f46
Move to cmake across all platforms ( #363 )
2022-08-05 07:59:19 +02:00
93d0d7443a
LUS Cleanup: Removes GameSettings class. Moves code to Imgui. ( #1036 )
...
* LUS Cleanup: Removes GameSettings class. Moves code to Imgui.
* Fixes more strdup problems and finalized removal of GameSetting.
* Reverts changes to Directory.h
* Update Directory.h
* Fixes PR.
* Update Directory.h
* Update rando_main.cpp
2022-08-05 01:03:11 -04:00
c23457d666
Automatically save after every scene transition ( #984 )
...
* Automatically save after every scene transition
* Refactor and don't save in grottos
* Don't save in cutscenes
* Save after getting items as well
* Fix paren
2022-08-05 00:15:49 -04:00
1789e5dddd
Fix ice traps for cow shuffle
2022-08-04 20:59:46 -05:00
587147dc40
Remove count of cows from tooltip
2022-08-04 19:44:08 -05:00
ebcf574085
Use Randomizer_GetItemIdFromKnownCheck instead for shuffleCows
2022-08-04 19:42:58 -05:00
d397c1d871
Increment version
2022-08-04 17:35:49 -04:00
2f5f089e7f
Increment version
2022-08-04 17:35:32 -04:00
facd1723f8
don't use signed ints for epochs ( #1044 )
...
Co-authored-by: briaguya <briaguya@alice>
2022-08-04 17:32:23 -04:00
2d22099805
Merge pull request #1039 from HarbourMasters/develop-zhora
...
zhora -> rando-next
2022-08-03 21:02:29 -07:00
739434e3e4
Merge branch 'develop-rachael' into rachael-to-zhora
2022-08-03 23:01:11 -04:00
78ad282056
Fix Navi HUD text regression ( #1020 )
...
* Fix Navi HUD text regression
* Fix the fix
2022-08-03 22:47:54 -04:00
bd86c792c3
Moves release version text ( #1028 )
2022-08-03 22:44:43 -04:00
Christopher Leggett