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
Christopher Leggett
194c4f4e52
Adds new files to CMakeLists.
2022-08-06 15:54:19 -04: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
Christopher Leggett
ba160cf997
merge in develop-zhora
2022-08-06 12:26:38 -04:00
Christopher Leggett
9062eaaca5
Should fix switch build pt 2
2022-08-06 12:21:11 -04:00
Christopher Leggett
43461cec69
Should fix switch build
2022-08-06 12:15:27 -04: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
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
briaguya
1ee89c50e2
Merge pull request #1066 from briaguya-ai/zhora-to-next
...
zhora to rando-next
2022-08-06 01:48:01 -04: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
Christopher Leggett
63ace6a4cc
Change ItemTableID to be uint16_t so we can use ModIndex for it.
2022-08-04 22:50:55 -04:00
Garrett Cox
1789e5dddd
Fix ice traps for cow shuffle
2022-08-04 20:59:46 -05:00
Christopher Leggett
95d439bb30
Adds rough ability to differentiate between rando and vanilla items.merge stashed changes from before develop-zhora merge
2022-08-04 20:54:51 -04: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
d397c1d871
Increment version
2022-08-04 17:35:49 -04:00
Kenix3
2f5f089e7f
Increment version
2022-08-04 17:35:32 -04:00
briaguya
facd1723f8
don't use signed ints for epochs ( #1044 )
...
Co-authored-by: briaguya <briaguya@alice>
2022-08-04 17:32:23 -04:00
briaguya
2d22099805
Merge pull request #1039 from HarbourMasters/develop-zhora
...
zhora -> rando-next
2022-08-03 21:02:29 -07:00
Kenix3
5f913cb9bf
Merge pull request #1037 from briaguya-ai/rachael-to-zhora
...
Rachael to zhora
2022-08-03 23:18:24 -04:00
Christopher Leggett
1da655adb5
Resolve merge conflicts with develop-zhora
2022-08-03 23:13:53 -04: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
Baoulettes
d61d4e508a
fix same name controller entry being unselectable ( #1031 )
...
This fix being unable to select both entry of controller that has same ID and Name (for example Mayflash mf103 in my tests got two port both ports has same name and ID.
2022-08-03 22:45:02 -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
