Commit Graph

933 Commits

Author SHA1 Message Date
briaguya f8f8e01039
Merge pull request #1088 from HarbourMasters/develop-zhora
quick zhora to rando next
2022-08-07 21:41:31 -04: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
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
th-2021 7ef3fff869
add soh icon for Windows (#1060) 2022-08-06 22:19:06 +02: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 e274530073 Fix cows giving free bottles, too generous 2022-08-06 03:03:11 -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
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 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 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 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
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
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 97adc4a7f2 Changes string.h include in CVar.cpp 2022-08-03 21:48:51 -04:00