mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-06-09 04:49:41 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,234 Commits 6 Branches 52 Tags
133cbcd6c8a5ba1630cbff7397159bb6ba57cfcb
Commit Graph

1234 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Christopher Leggett 1ef08a7325 Merge get-item-rework and update new checks. 2022-08-16 01:11:51 -04:00
Christopher Leggett cc31479772 Merge branch 'get-item-rework' into get-item-rework-rando-next 2022-08-16 00:43:17 -04:00
Christopher Leggett a5ab319231 Merge branch 'get-item-rework' of github.com:leggettc18/Shipwright into get-item-rework 2022-08-16 00:35:09 -04:00
Christopher Leggett 9916d3cc01 Additional fix for Skull Kid 2022-08-16 00:32:02 -04:00
Christopher Leggett 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
Christopher Leggett 38363fb015 Merge branch 'get-item-rework-help1' of github.com:garrettjoecox/Shipwright into pr/garrettjoecox/2 2022-08-16 00:12:44 -04:00
Garrett Cox f874d83432 Add a few missing cases 2022-08-15 22:59:42 -05:00
Christopher Leggett 9fcd39290c Merge branch 'get-item-rework-help1' of github.com:garrettjoecox/Shipwright into pr/garrettjoecox/2 2022-08-15 23:28:34 -04:00
Christopher Leggett 5d01a71797 Fixes Anju to set player->getItemEntry. 2022-08-15 23:28:08 -04:00
Garrett Cox 64965ee926 Use GiveItemEntryFromActorWithFixedRange in item00 2022-08-15 22:22:47 -05:00
Christopher Leggett d06b17f871 Merge branch 'get-item-rework-help1' of github.com:garrettjoecox/Shipwright into pr/garrettjoecox/2 2022-08-15 23:10:58 -04:00
Garrett Cox d0d567697b Fix logical errors and migrate most of the rest of the rando checks to GiveItemEntryFromActor 2022-08-15 22:10:31 -05:00
Christopher Leggett 881529c7bf Sets z_en_box.c to set player->getItemEntry 2022-08-15 23:08:31 -04:00
Christopher Leggett f8b55ea78c Fixes ocarina game skull kids to set player->getItemEntry 2022-08-15 22:46:52 -04:00
briaguya ee9ea3f2bd add 3drando license (#1206) 
Co-authored-by: briaguya <briaguya@alice>
 2022-08-15 21:17:58 -04:00
Christopher Leggett eccdab292d Merge pull request #3 from garrettjoecox/get-item-rework-rando-next-fanfare-fix 
Move check for gRandoQuestItemFanfares into MOD_NONE block within Audio_PlayFanfare_Rando
 2022-08-15 18:36:23 -04:00
briaguya a31256d956 controller menu cleanup (#1166) 2022-08-15 23:02:45 +02:00
Garrett Cox 170b297a7a Introduce some new methods and migrate most actors to them 2022-08-15 14:33:29 -05:00
Garrett Cox 806019d0cb Move check for gRandoQuestItemFanfares into MOD_NONE block within Audio_PlayFanfare_Rando 2022-08-15 12:48:57 -05:00
Garrett Cox 06b1074e2a Replace Randomizer_GetRandomizedItemId with Randomizer_GetRandomizedItem and Randomizer_GetItemIdFromKnownCheck with Randomizer_GetItemFromKnownCheck 2022-08-15 12:10:35 -05:00
Christopher Leggett bff5406e69 Merge branch 'get-item-rework' into get-item-rework-rando-next 2022-08-15 02:36:29 -04:00
Christopher Leggett 6b4f300eda Makes sure we aren't using getItemEntry when not randoed. 2022-08-15 02:17:06 -04:00
Christopher Leggett 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
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
Christopher Leggett a57d935996 Fixes a few more freestanding items that weren't covered. 2022-08-14 22:10:40 -04:00
Christopher Leggett c7388c39d8 Prevents Skulltulas from affecting other nearby checks. 2022-08-14 21:56:12 -04:00
Christopher Leggett 5d293ff4d1 Merge branch 'get-item-rework' into get-item-rework-rando-next 2022-08-14 21:30:12 -04:00
Christopher Leggett f4a051fb90 Should re-fix freestanding ice traps 2022-08-14 21:28:54 -04:00
Christopher Leggett 0e2530cd49 Fixes Ruto's Letter. 
It was accidentally getting classified as a rando item.
 2022-08-14 20:43:59 -04:00
Christopher Leggett 7e0e8c63af Fixes issues with approaching bottleable items. 2022-08-14 20:43:45 -04:00
Christopher Leggett 76f25c18c0 Fixes Ruto's Letter. 
It was accidentally getting classified as a rando item.
 2022-08-14 20:15:33 -04:00
Christopher Leggett 202805531f Fixes issues with approaching bottleable items. 2022-08-14 18:40:48 -04:00
Christopher Leggett d541ea3b39 Another Skulltula Ice Trap fix. 2022-08-14 18:25:09 -04:00
Christopher Leggett ca54853f11 Merge pull request #1 from aMannus/tokensanity-code-cleanup 
Tokensanity code cleanup
 2022-08-14 17:35:07 -04:00
aMannus 8842d1ec0d Fixed newline end of file 2022-08-14 23:12:00 +02:00
aMannus 5f1c365a0c Eliminated copy pasta 2022-08-14 23:11:11 +02:00