mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-06-06 03:48:15 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,631 Commits 6 Branches 52 Tags
457356d74caf97dc0c08d2ceeb41c8d04c2ff708
Commit Graph

1249 Commits

Author SHA1 Message Date
briaguya 5605542452 start playing with imgui filters 2022-08-17 09:03:27 -04:00
Christopher Leggett 525dcca499 Fixes some Sheik checks I had accidentally set the wrong flag for. 2022-08-17 01:07:28 -04:00
briaguya c933d521c3 Merge pull request #1223 from leggettc18/rando-next-ganonbkhint-fix 
Fix Ganon's Boss Key hints for Keysanity
 2022-08-17 00:09:26 -04:00
briaguya 03151647b1 Merge pull request #1227 from HarbourMasters/develop-zhora 
zhora -> rando-next
 2022-08-16 23:59:11 -04:00
Kenix3 72981221ad Merge pull request #1226 from HarbourMasters/develop-rachael 
rachael -> zhora
 2022-08-16 23:40:06 -04:00
Kenix3 f9621dcc17 Cleans up Window class. 2022-08-16 23:30:20 -04:00
Christopher Leggett b6d6ede520 Fixes color replacement from being saved to the save file. 
This was bad because replacing `%w` with `\x05\x00` was causing
the string to prematurely terminate.
 2022-08-16 23:04:14 -04:00
Christopher Leggett ecaf0fd87a Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into rando-next 2022-08-16 22:12:20 -04:00
Christopher Leggett 5a3ab9bcdc Fixes Ganon's Boss Key hints for keysanity. 2022-08-16 22:12:06 -04:00
David Chavez 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
briaguya 6206cd7db0 add ActorResetFunc for courtyard guards (#1213) 
Co-authored-by: briaguya <briaguya@alice>
 2022-08-16 21:50:52 -04:00
briaguya 01b7fedc35 clean up a few epochs that were missed (#1204) 
Co-authored-by: briaguya <briaguya@alice>
 2022-08-16 21:50:37 -04:00
briaguya 71b1db1fb6 volvagia interpolation fix (#1203) 
Co-authored-by: briaguya <briaguya@alice>
 2022-08-16 21:50:12 -04:00
Christopher Leggett 1184a35480 Fixes OoT rendering and Ice Trap checks. 2022-08-16 21:22:14 -04:00
Christopher Leggett 269a66656a Fixes Zora's River Frog checks. 2022-08-16 20:58:11 -04:00
Christopher Leggett 3bc67ef1eb Fixes chests by allowing for negative getItemIds 2022-08-16 20:28:24 -04: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
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 9916d3cc01 Additional fix for Skull Kid 2022-08-16 00:32:02 -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
Sarge-117 4be473fede Add German translations 
Thanks to Menzelmeister on Discord for translating to German
 2022-08-15 14:02:48 -07: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
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
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