Commit Graph

390 Commits

Author SHA1 Message Date
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 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 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
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 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 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
Christopher Leggett 7eba85c3b4 Prevents blocking Song of Time check by shielding. (#1001) 2022-08-02 18:09:53 -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 d1ddc2a0c3 Merge branch 'develop-zhora' into zhora-to-rnext-merge 2022-08-02 13:02:13 -04:00
briaguya 412264050a Merge pull request #746 from Sarge-117/rando-quest-item-fanfares
Rando: Item Fanfares
2022-08-02 03:24:36 -07:00
Garrett Cox 9389ceb8c1 Speed up lifting silver rocks and obelisks by 5x (#953)
* Speed up lifting silver rocks and obelisks by 3x

* Increase rock lifting speed to 5x

* Fix bug that sped up picking up small rocks, grass, bombflowers

* Add enhancement checkbox for faster block lifting and reduced speed to 3x
2022-07-31 22:09:30 -04:00
Christopher Leggett d332c3d9d6 Randomizer Allows Skull Kid to accept Mask after receiving an ice trap. (#963)
* Allows Skull Kid to accept Mask after receiving an ice trap.

* Extracts obscure rando check into a clearly named function.

* Fixes missing semicolon...
2022-07-31 21:58:13 -04:00
Christopher Leggett b59c9cdf02 Randomizer: Fixes LACS and Prelude checks under certain conditions (#961)
* Prevents LACS flag from getting set when it shouldn't be.

* Fixes Prelude and LACS checks so they apply immediately if missed.

* Refactors the scene-flag-setting code into its own function.

* Renames new enums and props to be clearer and not specific to scene flags.

* Refactors pendingFlag data into a separate struct.
2022-07-31 21:57:30 -04:00
Kenix3 4f29833476 Adds beta quest Gameshark cheat. (#975)
* Adds beta quest Gameshark cheat.

* Fixes issue where lus was including a function from soh.

* Limits beta quest to 0-8
2022-07-31 21:52:10 -04:00
Garrett Cox d648c7275c Hide Dpad in minimal UI (#955) 2022-07-31 21:51:36 -04:00
KiritoDev a1ed35e5bd Fixed slowdown on dodongo (#945)
* Fixed slowdown on dodongo

* Invalidate only works on pc

* Added todo comment
2022-07-31 21:49:54 -04:00
vaguerant 361a986b8e Add bottle swipes to Fast Drops; rename to Skip Pickup Messages (#847)
* Add bottle-swipes to Fast Drops; rename to Fast Pickups

* More freecam friendly

* Resolve freecam interaction

* Rename to "Skip Pickup Messages"
2022-07-31 21:37:47 -04:00
Sarge-117 b98c8b4abb Minor enhancement: Allow toggling on equipment screen (#813)
* Allow Equipment Toggle

Allow player to toggle equipment on/off on the equipment subscreen.  For tunics and boots, this will revert them to Kokiri Tunic/Kokiri Boots.  For shields, it will un-equip the shield entirely.  For swords, only BGS/Giant's Knife is affected, and it will revert to Master Sword.

* Set up Cvar and check for MS

Set up the cvar/imgui and add a check that we own the Master Sword (in case we're in the Ganon fight)
2022-07-31 21:35:05 -04:00
David Chavez 582f084973 Use tex sizes from texture rather than hardcoded values (#610)
* Use tex sizes from texture rather than hardcoded values

* Dynamic do action tex sizes

* Remove unused minimap texture keys

* Restore MESSAGE_STATIC_TEX_SIZE

* Use dynamic offsets

* MACRO it up

* Enable SPDLOG in Xcode

* Handle non-existent texture
2022-07-31 21:32:40 -04:00
Nicholas Estelami 0193489b00 RGBA8 CVar Support Added 2022-07-31 16:57:04 -04:00
aMannus fa0a66695c Skips time travel cutscene in rando (#956) 2022-07-27 22:18:27 -04:00
Sarge-117 9f41ea0ab4 Move function to code_800EC960.c
Moved Audio_PlayFanfare_Rando to a better home
2022-07-27 18:14:26 -07:00
Sarge-117 4e2da51c54 Code cleanup
Some optimizations per suggestions
2022-07-27 17:21:09 -07:00
GaryOderNichts 6818247317 Big-endian support (#909) 2022-07-27 23:50:56 +02:00