6603a9a474
Add adult trade shuffle to randomizer
2022-08-06 12:58:08 -05:00
ba160cf997
merge in develop-zhora
2022-08-06 12:26:38 -04:00
9062eaaca5
Should fix switch build pt 2
2022-08-06 12:21:11 -04:00
43461cec69
Should fix switch build
2022-08-06 12:15:27 -04:00
1b8168cfbb
Merge pull request #1067 from garrettjoecox/shuffleCowsFix
...
Fix cows giving free bottles, too generous
2022-08-06 04:50:59 -04:00
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
5574442fdc
fix ganon's boss key
2022-08-06 04:30:03 -04:00
e274530073
Fix cows giving free bottles, too generous
2022-08-06 03:03:11 -05:00
b420638267
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into keysanity
2022-08-06 00:48:55 -05:00
1ee89c50e2
Merge pull request #1066 from briaguya-ai/zhora-to-next
...
zhora to rando-next
2022-08-06 01:48:01 -04:00
5346217af3
Misc fixes
2022-08-06 00:29:05 -05:00
2d9d67bbd0
Add missing case
2022-08-05 23:44:53 -05:00
cc4300ef8b
Revert accidental changes
2022-08-05 23:40:43 -05:00
61c88386a1
Merge branch 'develop-zhora' into zhora-to-next
2022-08-06 00:26:50 -04:00
733ce5d28f
Use scene enum, handle thieves hideout keys
2022-08-05 23:26:50 -05:00
4a78375c8f
And like magic, keysanity working :D
2022-08-05 23:08:46 -05: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
e9d1bf2d56
Initial work for keysanity
2022-08-04 22:28:21 -05:00
63ace6a4cc
Change ItemTableID to be uint16_t so we can use ModIndex for it.
2022-08-04 22:50:55 -04:00
1789e5dddd
Fix ice traps for cow shuffle
2022-08-04 20:59:46 -05:00
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
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
5f913cb9bf
Merge pull request #1037 from briaguya-ai/rachael-to-zhora
...
Rachael to zhora
2022-08-03 23:18:24 -04:00
1da655adb5
Resolve merge conflicts with develop-zhora
2022-08-03 23:13:53 -04: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
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
bd86c792c3
Moves release version text ( #1028 )
2022-08-03 22:44:43 -04:00
dffcbb035e
Fixes glitchy dungeon maps. ( #1032 )
2022-08-03 22:43:55 -04:00
0f7a88bd5a
This should fix (all?) 60fps interpolation issues left. ( #938 )
...
* This should fix (all?) 60fps interpolation issues left.
Resolves #631 #917
* Update z_fishing.c
* Re-adds Emil's interpolation in certain places.
* move open/close disps out of if statments checking timer based vars, revert fishing to use recordopen/closed child
* move disps out of ifs for morpha
* use recordopen/recordclose for volv
* recordopen/recordclose for ganondorf
* switch back to recordopen/recordclose for ganondorf floor
* Frame interpolation now uses a 64bit parameter rather than 32.
* More 60fps fixes
* Fix close child typo
* add todo calls to recordopen/recordclose
* fix build
* revert long long frame interpolation
* add some epochs
* add more epochs
* bongo epochs
* the rest of the epochs
* fix the typo fix the build
* interpolation fixes pr cleanup
* init/cleanup bongo epochs
* bongo hand trails
* Fixes niw feathers
* Fixes bongo bongo hands, and replaces epoch * i with epoch + i
* don't update epochs
Co-authored-by: briaguya <briaguya@alice>
2022-08-03 22:36:13 -04:00
97adc4a7f2
Changes string.h include in CVar.cpp
2022-08-03 21:48:51 -04:00
6190388164
Now using posix strdrup on non-msvc builds.
2022-08-03 21:48:51 -04:00
8c9d067657
LUS Cleanup: CVars functions are now consistent
2022-08-03 21:48:51 -04:00
6d3d5e7da5
LUS Cleanup: Removes unnecessary ModManager class.
2022-08-03 21:48:39 -04:00
212d774613
Clean up unnecessary compiler checks.
2022-08-03 21:12:51 -04:00
e68fac14c8
Uses correct audio player per platform now.
2022-08-03 21:12:51 -04:00
lilDavid