Commit Graph

1119 Commits

Author SHA1 Message Date
Christopher Leggett
59baf24dc6
Merge branch 'develop-zhora' of https://github.com/HarbourMasters/Shipwright into custom-messages 2022-08-08 19:46:09 -04:00
David Chavez
9b33827d02
[ci] Share Generated Assets Across All Platforms (#1074) 2022-08-09 00:02:35 +02:00
Garrett Cox
a0ac945b4e Make logic consistent across z_parameter & z_sram 2022-08-08 14:18:15 -05:00
Garrett Cox
8f55dd0624 Add support for shuffling maps and compasses 2022-08-08 14:07:02 -05:00
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
David Chavez
9afbe42720
Use -O2 for Release config builds (#1083) 2022-08-08 12:01:45 +02:00
Christopher Leggett
7f233de502
Fixes CMake to explicity launch python interpreter on Windows. (#1089) 2022-08-08 10:31:47 +02:00
briaguya
f8f8e01039
Merge pull request #1088 from HarbourMasters/develop-zhora
quick zhora to rando next
2022-08-07 21:41:31 -04:00
lilDavid
46be24b595 Add missing semicolons and return values 2022-08-07 18:58:17 -05:00
Sarge-117
a5acf6da20 Set Navi timer back to normal 2022-08-07 16:33:44 -07:00
Sarge-117
48a41bd11c Comment clarity 2022-08-07 16:31:50 -07:00
Sarge-117
6e8b45d129 Fix text colours (Navi text is always light blue)
Navi text should always be \x44
2022-08-07 15:50:53 -07:00
Sarge-117
7144d1a321 First test of Rando-specific Navi tips
First test of this experiment
2022-08-07 15:26:03 -07: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
ed9378375d
[cmake] Use static libraries with vcpkg on Windows (#1079) 2022-08-07 18:23:20 +02: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
briaguya
a03ffc90dc
Merge pull request #1081 from garrettjoecox/fixShuffleCowsUI
Change shuffle cows to checkbox and remove extra line
2022-08-07 04:12:29 -04: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
qurious-pixel
b2ac01bc98
[CI] Link Updated SDL2 version (#1078) 2022-08-07 03:52:22 +02:00
David Chavez
1794683d3a Ignore build.c 2022-08-06 21:06:40 -04:00
David Chavez
c70e3f38b1 Enable SPD logging in libultra 2022-08-06 21:06:40 -04:00
David Chavez
aadabe1ecd Better instructions for VS solutions 2022-08-06 21:06:40 -04:00
briaguya
7f58ef14ee add a command to copy the otr to the build dir 2022-08-06 21:06:21 -04:00
briaguya
8efeceb236 formatting 2022-08-06 21:05:51 -04:00
briaguya
9a126dec4e add version requirements in building.md 2022-08-06 21:05:51 -04:00
briaguya
f007ca4d37
Merge pull request #1075 from briaguya-ai/clean-up-cowsanity
Clean up cowsanity
2022-08-06 19:07:39 -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
lilDavid
f885195fc9 Apply trade item timer disabling consistently 2022-08-06 16:01:29 -05:00
lilDavid
7cfe21f865 Fix non-randomizer carpenter's son despawning 2022-08-06 15:58:57 -05:00
lilDavid
c8289f5946 Skip lines in Adult Trade Shuffle description 2022-08-06 15:38:32 -05:00
th-2021
7ef3fff869
add soh icon for Windows (#1060) 2022-08-06 22:19:06 +02:00
lilDavid
8ee597298c Change cursor sound and add files to build system 2022-08-06 15:01:35 -05: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
lilDavid
f41b939a71 Only show adult trade items in the save editor if they're shuffled 2022-08-06 12:58:21 -05:00
lilDavid
6603a9a474 Add adult trade shuffle to randomizer 2022-08-06 12:58:08 -05:00
briaguya
1b8168cfbb
Merge pull request #1067 from garrettjoecox/shuffleCowsFix
Fix cows giving free bottles, too generous
2022-08-06 04:50:59 -04:00
Garrett Cox
acb3d14193
Merge pull request #1 from briaguya-ai/fix-ganon-boss-key
fix ganon's boss key
2022-08-06 03:31:16 -05:00