lilDavid
46be24b595
Add missing semicolons and return values
2022-08-07 18:58:17 -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
lilDavid
8ee597298c
Change cursor sound and add files to build system
2022-08-06 15:01:35 -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
Garrett Cox
e274530073
Fix cows giving free bottles, too generous
2022-08-06 03:03:11 -05:00
briaguya
61c88386a1
Merge branch 'develop-zhora' into zhora-to-next
2022-08-06 00:26:50 -04: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
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
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
Kenix3
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
Kenix3
fd379896d6
LUS Cleanup: Clean up hooks system.
2022-08-03 21:12:51 -04:00
Garrett Cox
8c2feb537d
Use 454+cowId to identify cows in randomizer.cpp
2022-08-03 11:26:14 -05:00
Garrett Cox
25a272ce0c
Fix shuffle cows bug from copy paste
2022-08-03 09:07:38 -05:00
Garrett Cox
723e34a06a
Move some flags around and use global array instead of flag for shuffle cows
2022-08-03 08:44:48 -05:00
Garrett Cox
c18203878b
Add shuffleCows options for randomizer
2022-08-03 00:14:38 -05:00
Garrett Cox
6d0d608e38
Unrestricted warping in randomizer ( #951 )
2022-08-02 23:51:07 -04:00
Christopher Leggett
fe02818d51
Randomizer: Ocarina of Time Ice Trap Fix ( #964 )
...
* Fixes Ice Trap on OoT check from preventing SoT check
* Removes unneeded GlobalContext argument.
2022-08-02 23:48:51 -04:00
Nycz
db33604171
added Cheat Sync Time ( #957 )
...
* added Cheat Sync Time
This syncs the ingame time with the real world time.
I wasnt quite sure where to put the code so im sorry if this is bad i just wanted to contribute to this project.
* Update soh/src/code/z_play.c
Co-authored-by: Christopher Leggett <chris@leggett.dev>
* Update z_play.c
added suggestions from leggettc18
* Update z_play.c
Co-authored-by: Christopher Leggett <chris@leggett.dev>
2022-08-02 23:48:41 -04:00
InfoManiac742
27e0f19dac
Remember save location ( #980 )
...
* Remember save location
* Clarified grotto caveat
* Update ImGuiImpl.cpp
2022-08-02 23:47:57 -04:00
aMannus
b89cc25df3
Fixed deku stick on B and horse swordless ( #995 )
2022-08-02 23:46:39 -04:00
Kenix3
352b46c1f5
LUS Cleanup: Console class is now in the Ship namespace
2022-08-02 22:54:38 -04:00
Kenix3
c1659d3dcf
Adds a function for grabbing physical device from virtual slot.
2022-08-02 22:37:42 -04:00
Kenix3
b3c3882b12
LUS Cleanup: Make ControlDeck a member of Window
2022-08-02 22:37:42 -04:00
PurpleHato
da79e43adf
TWEAK: forgot item_list
2022-08-03 01:03:28 +02:00
PurpleHato
31af53957d
TWEAK: de de repetition
2022-08-03 00:58:51 +02:00
PurpleHato
f281a07dfb
TWEAK: French dup entry
2022-08-03 00:52:14 +02:00
Christopher Leggett
7eba85c3b4
Prevents blocking Song of Time check by shielding. ( #1001 )
2022-08-02 18:09:53 -04:00
David Chavez
d9443d98f0
Store RGBA Cvar as JSON object ( #996 )
...
* Store RGBA Cvar as JSON object
* Use existing split string method
* Extract key setting to var
2022-08-02 18:09:33 -04:00
Christopher Leggett
73447f05ab
Revert Goron Spin Fix ( #1003 )
...
* Fixes Goron Wakeup animations
* Cleanup of some unneeded code.
* Fixes comment spacing
* Revert goron's back to spinny behavior with smooth transitions.
2022-08-02 18:09:02 -04:00
briaguya
ac776ce7bc
Merge branch 'develop-zhora' into zhornext
2022-08-02 15:49:59 -04:00
David Chavez
53229f0905
Merge branch 'develop-rachael' into rachael-zhora
...
# Conflicts:
# libultraship/libultraship/ImGuiImpl.cpp
2022-08-02 20:05:40 +02:00
Josh Bodner
18013e1ae0
Do this in Rachael instead
2022-08-02 13:57:34 -04:00
briaguya
f7abf79bf3
update rando tooltips to utilize auto newlines
2022-08-02 13:26:26 -04:00
