4e2707aefc
Merge branch 'develop-zhora' of github.com:HarbourMasters/Shipwright into get-item-rework
2022-08-19 18:51:00 -04:00
0971b9aa78
only toggle menu with controller when controller nav enabled ( #1043 )
2022-08-19 15:46:11 +02:00
9bc6aac81e
MacOS OTR ( #973 )
2022-08-18 19:40:41 +02:00
ad3efccb88
Merge pull request #1241 from GaryOderNichts/fix/wiiu-stick-input
...
Fix Wii U stick input
2022-08-17 17:54:33 -04:00
f4c1332159
Fix Wii U stick input
2022-08-17 17:27:33 +02:00
72981221ad
Merge pull request #1226 from HarbourMasters/develop-rachael
...
rachael -> zhora
2022-08-16 23:40:06 -04:00
6723f4c7c2
Archive.createArchive error now passes in the error to SPDLOG.
2022-08-16 23:30:20 -04:00
f9621dcc17
Cleans up Window class.
2022-08-16 23:30:20 -04:00
10ce3c88fb
Remove TestApp from LUS
2022-08-16 23:30:20 -04:00
ea92a2e123
Makes data in OverlayCommand private.
2022-08-16 22:45:33 -04:00
b43eb2d0bd
Renames Camera Stick to Right Stick
2022-08-16 22:45:33 -04:00
d09172d74d
LUS Cleanup: Fixes SDL axis handling. ( #1220 )
...
* Fixes SDL axis handling.
* Removes sensitivities from LUS
Should be a game specific feature.
* Updates Wii U Controllers to remove sensitivity
Also loads legacy controller profiles.
* Fixes memory leak in gfx_dxgi_get_key_name
Also fixes issue where wchars would be returned in dxgi when getting a key name.
2022-08-16 21:53:45 -04:00
6b0338a37d
[zret] Port some documentation changes ( #1164 )
...
* zret: Documentation pass on scene/room commands #1226
* Update OTR scene
* zret: Document the lens system #1079
* zret: Misc. doc/cleanup 4 #1093
* zret: Fix misc 8 #1150
* zret: Document Distortions from z_camera and z_view #1102
2022-08-16 21:53:28 -04:00
6206cd7db0
add ActorResetFunc for courtyard guards ( #1213 )
...
Co-authored-by: briaguya <briaguya@alice>
2022-08-16 21:50:52 -04:00
01b7fedc35
clean up a few epochs that were missed ( #1204 )
...
Co-authored-by: briaguya <briaguya@alice>
2022-08-16 21:50:37 -04:00
71b1db1fb6
volvagia interpolation fix ( #1203 )
...
Co-authored-by: briaguya <briaguya@alice>
2022-08-16 21:50:12 -04:00
b4614acf70
Update Enhancement Presets with new options ( #1114 )
2022-08-16 22:18:44 +02:00
cd37a56161
Rando: Fix being able to get Sun's Song check multiple times ( #1185 )
2022-08-16 22:16:44 +02:00
eb632ccb50
Adjustable push speed ( #1190 )
2022-08-16 22:09:11 +02:00
0f2e7db8e0
Fix Ice Traps on Windows and Mac ( #1216 )
2022-08-16 21:49:52 +02:00
a3d0962054
Fix ocarina right stick controls ( #1211 )
2022-08-16 13:47:41 +02:00
46a421f933
Add window to customize specific controls ( #1122 )
2022-08-16 09:43:09 +02:00
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
b46c7a0607
[cmake] Use SDL2, GLEW and GLFW from vcpkg (Windows) ( #1194 )
2022-08-16 09:29:45 +02:00
a5ab319231
Merge branch 'get-item-rework' of github.com:leggettc18/Shipwright into get-item-rework
2022-08-16 00:35:09 -04:00
9916d3cc01
Additional fix for Skull Kid
2022-08-16 00:32:02 -04:00
270c364f1a
Merge pull request #2 from garrettjoecox/get-item-rework-help1
...
Replace Randomizer_GetRandomizedItemId with Randomizer_GetRandomizedI…
2022-08-16 00:31:40 -04:00
38363fb015
Merge branch 'get-item-rework-help1' of github.com:garrettjoecox/Shipwright into pr/garrettjoecox/2
2022-08-16 00:12:44 -04:00
f874d83432
Add a few missing cases
2022-08-15 22:59:42 -05:00
9fcd39290c
Merge branch 'get-item-rework-help1' of github.com:garrettjoecox/Shipwright into pr/garrettjoecox/2
2022-08-15 23:28:34 -04:00
5d01a71797
Fixes Anju to set player->getItemEntry.
2022-08-15 23:28:08 -04:00
64965ee926
Use GiveItemEntryFromActorWithFixedRange in item00
2022-08-15 22:22:47 -05:00
d06b17f871
Merge branch 'get-item-rework-help1' of github.com:garrettjoecox/Shipwright into pr/garrettjoecox/2
2022-08-15 23:10:58 -04:00
d0d567697b
Fix logical errors and migrate most of the rest of the rando checks to GiveItemEntryFromActor
2022-08-15 22:10:31 -05:00
881529c7bf
Sets z_en_box.c to set player->getItemEntry
2022-08-15 23:08:31 -04:00
f8b55ea78c
Fixes ocarina game skull kids to set player->getItemEntry
2022-08-15 22:46:52 -04:00
ee9ea3f2bd
add 3drando license ( #1206 )
...
Co-authored-by: briaguya <briaguya@alice>
2022-08-15 21:17:58 -04:00
a31256d956
controller menu cleanup ( #1166 )
2022-08-15 23:02:45 +02:00
170b297a7a
Introduce some new methods and migrate most actors to them
2022-08-15 14:33:29 -05:00
06b1074e2a
Replace Randomizer_GetRandomizedItemId with Randomizer_GetRandomizedItem and Randomizer_GetItemIdFromKnownCheck with Randomizer_GetItemFromKnownCheck
2022-08-15 12:10:35 -05:00
6b4f300eda
Makes sure we aren't using getItemEntry when not randoed.
2022-08-15 02:17:06 -04:00
9c59624d64
Makes freestanding items set player->getItemEntry.
...
This prevents freestanding items from setting the global modIndex.
This is part of a larger transition that needs to happen to switch
to setting getItemEntries for all of the rando items. This prevents
some things that set getItemId of GI_MAX from granting a Fire Medallion
when the global modIndex is MOD_RANDOMIZER.
2022-08-15 02:08:32 -04:00
7a9160ed78
Clarify how to build and run on Mac ( #1195 )
2022-08-14 23:21:16 -04:00
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
fabe051d3d
Fix lost woods leading music in rando ( #1155 )
2022-08-14 23:04:40 -04:00
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
d575a3dda6
Fixed rotation of freestanding key checks in rando ( #1135 )
2022-08-14 23:01:30 -04:00
37dd045bd2
Rando: Fix bomb/bombchu shops ( #1134 )
...
* Fix bomb shops in rando
* Addressed review comments
2022-08-14 23:01:00 -04:00
651e0ddad4
Fixed 2 incorrect needs_save instances ( #1115 )
2022-08-14 22:59:12 -04:00
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
Christopher Leggett