Commit Graph

576 Commits

Author SHA1 Message Date
Garrett Cox cb97c2a205 Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into keysanity 2022-08-08 12:08:06 -05:00
Garrett Cox 34b8d7d5f8 Handle impa giving a key if skip zelda is on 2022-08-08 11:09:06 -05:00
briaguya f8f8e01039 Merge pull request #1088 from HarbourMasters/develop-zhora
quick zhora to rando next
2022-08-07 21:41:31 -04:00
Garrett Cox c8ac2d7c7e Finally found fix for boss keys... 2022-08-07 16:41:57 -05:00
Garrett Cox 8b59466ce5 Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into keysanity 2022-08-07 15:41:44 -05:00
Garrett Cox 01a36f525e Handle keys in checkObtainability 2022-08-07 15:41:30 -05:00
Garrett Cox ec801530b7 Move some more items around, boss keys still broken 2022-08-07 14:32:54 -05:00
th-2021 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
Garrett Cox f7267be29a Change shuffle cows to checkbox and remove extra line 2022-08-07 02:10:54 -05:00
briaguya cac6869a56 Merge pull request #1080 from HarbourMasters/develop-zhora
zhora -> rando-next
2022-08-07 02:16:11 -04:00
briaguya 91ad58aa3e Merge pull request #1061 from garrettjoecox/frogSongs
Shuffle frog song rupees
2022-08-07 02:13:24 -04:00
Garrett Cox ea9d76621c Fix issue with keysanity values not loading from spoiler file 2022-08-06 22:01:55 -05:00
GaryOderNichts cb2410d9c5 Handle audio thread properly 2022-08-06 21:52:42 -04:00
briaguya c3253fe59f add comment explaining ocarina mode setting 2022-08-06 18:23:47 -04:00
briaguya 0eb8f5c95f remove commented out lines 2022-08-06 18:15:24 -04:00
briaguya e0d6445f24 remove unused cow stuff 2022-08-06 18:14:01 -04:00
briaguya 46c3541458 seems to be working, still needs cleanup 2022-08-06 18:07:16 -04:00
Garrett Cox ea909b748e Add super basic custom messages for keysanity, not pretty... 2022-08-06 16:51:58 -05:00
th-2021 7ef3fff869 add soh icon for Windows (#1060) 2022-08-06 22:19:06 +02:00
Garrett Cox 8aba2b6323 Merge branch 'keysanity' of github.com:garrettjoecox/Shipwright into keysanity 2022-08-06 14:18:50 -05:00
Garrett Cox 77f2e56039 Support starts with and more options on ganons boss key 2022-08-06 14:07:46 -05:00
briaguya 5574442fdc fix ganon's boss key 2022-08-06 04:30:03 -04:00
Garrett Cox e274530073 Fix cows giving free bottles, too generous 2022-08-06 03:03:11 -05:00
Garrett Cox b420638267 Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into keysanity 2022-08-06 00:48:55 -05:00
Garrett Cox 5346217af3 Misc fixes 2022-08-06 00:29:05 -05:00
Garrett Cox 2d9d67bbd0 Add missing case 2022-08-05 23:44:53 -05:00
Garrett Cox cc4300ef8b Revert accidental changes 2022-08-05 23:40:43 -05:00
briaguya 61c88386a1 Merge branch 'develop-zhora' into zhora-to-next 2022-08-06 00:26:50 -04:00
Garrett Cox 733ce5d28f Use scene enum, handle thieves hideout keys 2022-08-05 23:26:50 -05:00
Garrett Cox 4a78375c8f And like magic, keysanity working :D 2022-08-05 23:08:46 -05:00
briaguya 97d363c91e Merge pull request #1019 from garrettjoecox/shuffleCows
Add shuffleCows options for randomizer
2022-08-06 00:03:27 -04:00
Garrett Cox 9a145221ec Remove newline 2022-08-05 21:02:02 -05:00
Garrett Cox de34fd7e94 Check coords for other cows rather than falling back 2022-08-05 16:11:17 -05:00
Garrett Cox 528dbcdc17 More suggested changes 2022-08-05 14:59:04 -05:00
Garrett Cox 5de662a326 Fix ice traps 2022-08-05 12:05:22 -05:00
Garrett Cox ed3cddbeaf Add option to shuffle frog song rupees 2022-08-05 09:52:11 -05:00
Garrett Cox 11d7a78e62 More changes from suggestions 2022-08-05 01:38:45 -05:00
th-2021 1ebca42f46 Move to cmake across all platforms (#363) 2022-08-05 07:59:19 +02:00
Kenix3 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
Josh Bodner 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
Garrett Cox e9d1bf2d56 Initial work for keysanity 2022-08-04 22:28:21 -05:00
Garrett Cox 1789e5dddd Fix ice traps for cow shuffle 2022-08-04 20:59:46 -05:00
Garrett Cox 587147dc40 Remove count of cows from tooltip 2022-08-04 19:44:08 -05:00
Garrett Cox ebcf574085 Use Randomizer_GetItemIdFromKnownCheck instead for shuffleCows 2022-08-04 19:42:58 -05:00
Kenix3 2f5f089e7f Increment version 2022-08-04 17:35:32 -04:00
briaguya 2d22099805 Merge pull request #1039 from HarbourMasters/develop-zhora
zhora -> rando-next
2022-08-03 21:02:29 -07:00
briaguya 739434e3e4 Merge branch 'develop-rachael' into rachael-to-zhora 2022-08-03 23:01:11 -04:00
vaguerant 78ad282056 Fix Navi HUD text regression (#1020)
* Fix Navi HUD text regression

* Fix the fix
2022-08-03 22:47:54 -04:00
Ada bd86c792c3 Moves release version text (#1028) 2022-08-03 22:44:43 -04:00
Christopher Leggett dffcbb035e Fixes glitchy dungeon maps. (#1032) 2022-08-03 22:43:55 -04:00