Commit Graph

1118 Commits

Author SHA1 Message Date
aMannus b4614acf70 Update Enhancement Presets with new options (#1114) 2022-08-16 22:18:44 +02:00
aMannus cd37a56161 Rando: Fix being able to get Sun's Song check multiple times (#1185) 2022-08-16 22:16:44 +02:00
Josh Bodner eb632ccb50 Adjustable push speed (#1190) 2022-08-16 22:09:11 +02:00
Christopher Leggett 0f2e7db8e0 Fix Ice Traps on Windows and Mac (#1216) 2022-08-16 21:49:52 +02:00
GaryOderNichts a3d0962054 Fix ocarina right stick controls (#1211) 2022-08-16 13:47:41 +02:00
lilDavid 46a421f933 Add window to customize specific controls (#1122) 2022-08-16 09:43:09 +02:00
Zaxus125 b7f9960a60 [cmake] Improve OTRExporter asset extraction script, Lower required CMake to 3.16 (#1196)
* supply ZAPD.out path as an argument to extract_assets.py rather than regenerating the script

Generating an entirely new script file to change a string is excessive.
Instead, extract_assets.py takes in one optional positional argument that
contains the path to ZAPD.out, the original purpose for the string
replacement.

This also removes the need for the file(CHMOD ...) command, which bumps
the minimum cmake version all the way up to 3.19.

Additionally, there was an extra script being generated in
OTRExporter/CMakeLists.txt that used the same CHMOD logic, but did not
accurately declare its minimum version to 3.19, this removes that unused
logic.

* OTRExporter: accept a rom path as an argument to extract_assets.py
2022-08-16 09:34:30 +02:00
th-2021 b46c7a0607 [cmake] Use SDL2, GLEW and GLFW from vcpkg (Windows) (#1194) 2022-08-16 09:29:45 +02:00
briaguya ee9ea3f2bd add 3drando license (#1206)
Co-authored-by: briaguya <briaguya@alice>
2022-08-15 21:17:58 -04:00
Sarge-117 4be473fede Add German translations
Thanks to Menzelmeister on Discord for translating to German
2022-08-15 14:02:48 -07:00
briaguya a31256d956 controller menu cleanup (#1166) 2022-08-15 23:02:45 +02:00
Jeff Manian 7a9160ed78 Clarify how to build and run on Mac (#1195) 2022-08-14 23:21:16 -04:00
briaguya 42bce9d33e don't abuse epochs (#1179)
* don't abuse epochs

* update bongo hand trails

Co-authored-by: briaguya <briaguya@alice>
2022-08-14 23:18:12 -04:00
aMannus fabe051d3d Fix lost woods leading music in rando (#1155) 2022-08-14 23:04:40 -04:00
Julien Lemay 8945b2ed48 Fix Save Editor Event Check Inf "A" Row flags (#1138)
Fix Save Editor Event Check Inf Flags "A" Row flags not working. It was set to "eci1" instead of "eci10".
2022-08-14 23:02:14 -04:00
aMannus d575a3dda6 Fixed rotation of freestanding key checks in rando (#1135) 2022-08-14 23:01:30 -04:00
aMannus 37dd045bd2 Rando: Fix bomb/bombchu shops (#1134)
* Fix bomb shops in rando

* Addressed review comments
2022-08-14 23:01:00 -04:00
aMannus 651e0ddad4 Fixed 2 incorrect needs_save instances (#1115) 2022-08-14 22:59:12 -04:00
GaryOderNichts 68e7f2e6c1 Wii U support (#1097)
* Wii U support

* [WiiU] Combined Dockerfile

* [WiiU] Combined Dockerfile

* [WiiU] Combined Dockerfile

* Add Jenkins support

* wiiu: fix scissor clamp

* wiiu: improve button remapping

* wiiu: fix scaling issues

* Update Dockerfile after merge

* Pull assets before build

* Only stop container once

* Adjust logging sinks

* wiiu: Change button mapping to match PC version

* wiiu: Implement controller changes

* wiiu: Update BUILDING.md

Co-authored-by: qurious-pixel <62252937+qurious-pixel@users.noreply.github.com>
Co-authored-by: David Chavez <david@dcvz.io>
2022-08-14 22:57:24 -04:00
Sarge-117 fa19df9201 Merge remote-tracking branch 'upstream/rando-next' into rando-navi-tips 2022-08-14 10:16:35 -07:00
KiritoDev b989ef4f7f Fixed error screen (#1184) 2022-08-14 12:41:15 -04:00
briaguya f70c1ff88a Merge pull request #1160 from aMannus/rando-better-dupe-handling
Rando: Added more items to have dupe handling
2022-08-13 00:30:12 -04:00
briaguya 8c965b4dc7 Merge pull request #1171 from aMannus/item-tracker-improvements
Item tracker improvements
2022-08-12 23:39:00 -04:00
briaguya 82f69a0f09 Merge pull request #1173 from lilDavid/adult_trade_fixes
Adult trade shuffle bugfixes
2022-08-12 23:37:28 -04:00
lilDavid 92d0d3e35e Let Cojiro crow in Adult Trade Shuffle 2022-08-12 17:12:52 -05:00
lilDavid e9354cc9a1 Don't spawn Fado and the carpenter's son at once 2022-08-12 17:12:19 -05:00
lilDavid 282192eb5e Properly hatch pocket cucco using Sun's Song 2022-08-12 17:02:03 -05:00
aMannus 4c9f2493d7 Brought CVar naming in line with others 2022-08-12 22:51:40 +02:00
lilDavid 947a97608c Save Editor Adult Trade Shuffle bugfixes:
- Having multiple items with the collapsing header open rapidly cycles trade items
 - Unchecking any item's checkbox cycles the trade item (it should only do so if it's the one you've selected)
 - Setting the adult trade slot sets the wrong items' flags
 - Emptying the adult trade slot doesn't reset all trade items' flags
2022-08-12 15:43:08 -05:00
aMannus 3689abd01f One more small code cleanup 2022-08-12 22:39:12 +02:00
aMannus 5f2bcb39c9 Small code cleanup 2022-08-12 22:16:23 +02:00
aMannus 4d7982911e More fixes and code cleanup 2022-08-12 22:08:10 +02:00
sholdee 789cf13aae [ci] move asset gen timeout to steps block (#1163) 2022-08-12 18:59:20 +02:00
aMannus ff64bc42fb First pass fixes item tracker save loading 2022-08-12 18:21:28 +02:00
aMannus aa7380fe06 Added missing double defense 2022-08-12 13:14:15 +02:00
Kenix3 86faa42acf Make libultra OSContPad struct consistent with the one from libultraship 2022-08-11 19:41:53 -04:00
Kenix3 d623ac5918 Copy over right stick Y axis sensitivity in the UI when the X sensitivity is changed. 2022-08-11 19:41:53 -04:00
Kenix3 4a3e43f73f VirtualController -> DummyController in CMake 2022-08-11 19:41:53 -04:00
Kenix3 094388187f Cleans up Controllers
Renames VirtualController to DummyController.
Makes controller axis treated the same as buttons.
Made Controller class members private or protected
Made Controller class treat deadzones, sensitivities, and press thresholds consistently.
2022-08-11 19:41:53 -04:00
aMannus 1e36de19aa Added more duplicate item handling 2022-08-11 11:57:43 +02:00
briaguya 5156ccbfd5 Merge pull request #1154 from aMannus/maps-compasses-name-change
Rando: Small fixes for "Maps/Compasses"
2022-08-11 04:17:21 -04:00
th-2021 791f7774a5 [cmake] Split OTRGui into it's own target (#1116) 2022-08-11 10:05:54 +02:00
sholdee e88000aeb0 [ci] asset stage tweaks (#1120) 2022-08-11 10:05:26 +02:00
aMannus e7c793df9b Fixed comment too 2022-08-11 08:57:18 +02:00
aMannus ac70d92b31 Changed maps/compasses location in UI 2022-08-11 08:55:29 +02:00
aMannus 67edf574f2 Rename maps/compasses 2022-08-11 08:35:37 +02:00
briaguya 0017168aa4 Merge pull request #1153 from briaguya-ai/mask-select-check-for-open-shop
add check for mask shop being open to mask select
2022-08-11 02:30:44 -04:00
briaguya 388319deac add kak gate check for mask select 2022-08-11 02:01:25 -04:00
briaguya 2af572aa30 add check for mask shop being open to mask select 2022-08-11 01:51:43 -04:00
briaguya b03d23f61f Merge pull request #1152 from briaguya-ai/develop-zhora
zhora -> rando-next
2022-08-11 01:36:05 -04:00