mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-06-30 03:59:06 -04:00
Code Issues Packages Projects Releases Wiki Activity
3,897 Commits 6 Branches 52 Tags
255ea2da26cf99bf78145b4f2fa73fedc5f2c6d8
Commit Graph

3897 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Philip Dubé 31cbeb929b Fix bean merchant check not being listed in tracker when bean merchant only shuffled (#6557) 2026-05-29 02:51:15 +00:00
Philip Dubé d09cd4ffcd Fix sword scaling (#6558) 
Don't apply transforms when scale 1.0, adjust translation to be gradual
 2026-05-29 02:50:02 +00:00
Pepe20129 a57cdc6f77 Update Hell Mode Preset (#6570) 2026-05-29 02:39:56 +00:00
Philip Dubé 5bccc8a340 avoid ganon's castle blue warp dropping Link in lava (#6647) 2026-05-29 02:24:54 +00:00
aMannus dc4b27d65a Fix gossip stone check (#6648) 2026-05-29 02:14:17 +00:00
Philip Dubé 0dcd52e5c7 Fix warp shuffle without warp hint text (#6551) 
Issue was needing to hook on RSK_SHUFFLE_WARP_SONGS, but cleaned up code
 2026-05-27 18:28:43 +00:00
Chris e5ad4e6f11 Fix ending audio shuffle (#6608) 2026-05-27 15:58:17 +00:00
Unreference e3ee258a92 fix(actors): Restore vanilla default for Kokiri Forest quest state hook (#6614) 2026-05-27 14:02:32 +00:00
Jameriquiah 30dcd7946f add fps custom equips (#6543) 2026-05-25 03:31:29 +00:00
Chris b728e671bf Fix blank text on carpet salesman (#6605) 2026-05-25 03:30:31 +00:00
xxAtrain223 2845baad6c Identify checks for Merchants and Scrubs (#6641) 
Identify checks for merchants and deku scrubs to show their prices and non-mysterious checks in the check tracker.
 2026-05-24 22:49:00 +00:00
Pepe20129 1785a70f22 Clean OTRGlobals 2 (#6636) 
The main effect of this PR is completely decoupling OTRGlobals.h from any non-std header making it so that the "everything is being rebuilt because I changed a header that at some point gets included in OTRGlobals" problem doesn't happen anymore.
 2026-05-23 20:32:51 +00:00
A Green Spoon 772fe2bb92 add grotto butterflies (#6619) 2026-05-18 06:44:35 +00:00
Chris 37db034815 Use singular on message for 1 token (#6567) 2026-05-09 22:25:09 +00:00
Pepper0ni 5b4d8edf51 fix bad merge with the suns song fairy in spirit (#6590) 2026-05-04 02:02:21 +00:00
Jameriquiah 1a46d2ec96 hyrule field typo fix (#6574) 2026-04-29 09:37:20 -07:00
Pepper0ni a6ceda989e Fix KF to LW sign region (#6571) 2026-04-28 20:16:49 +00:00
Pepper0ni 4b90ae48c7 Add missing hint logic, cleanup ganon's tower and mido logic, change LA rock name (#6565) 2026-04-26 14:39:01 +00:00
Pepper0ni ea76550fc7 Fix owl talk logic to include kokiri (#6564) 2026-04-25 15:30:27 +00:00
Philip Dubé ccfa31a245 Fix drag&drop not updating excluded locations (#6559) 2026-04-23 22:48:12 +00:00
Philip Dubé 806398a65b Fix OGC great fairy reward in vanilla with skip misc interactions when fish is not obtainable (#6556) 
Item_CheckObtainability should only be called with MOD_NONE GI

For RG_DOUBLE_DEFENSE that became ITEM_FISH. Nonsense ensued

To reproduce issue, create debug save & go straight to OGC great fairy with only magic/ocarina/lullaby
 2026-04-23 12:34:26 +00:00
Philip Dubé eeca7626d8 rocksanity (#5015) 
Co-authored-by: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
 2026-04-22 14:50:14 +00:00
Philip Dubé f3d60e0ddd use bool over s8 (#6547) 2026-04-22 13:36:18 +00:00
Philip Dubé 92ba43d675 fix seed generation regression (#6549) 
seedString is some unused variable, correct variable is seed
 2026-04-22 03:11:07 +00:00
Philip Dubé 18bf4b315f RC_HF_OCARINA_OF_TIME_ITEM gated on RSK_OOT_HINT (#6546) 
forgot to push in hint refactor
 2026-04-21 23:07:59 +00:00
Pepper0ni 3221d8a988 Fix bean fairies + start with beans generation (#6548) 2026-04-21 23:04:37 +00:00
Philip Dubé 5d8c3c8883 Refactor hints (#6540) 
small hint logic cleanup
share code for bridge requirements
refactor DistributeAndPlaceHints
 2026-04-21 16:31:41 +00:00
Philip Dubé 69681e608f Fix swimvoid in grottos to just respawn in grotto (#6529) 2026-04-21 16:02:33 +00:00
Philip Dubé 719bb87eda add hint text for sun song fairies in spirit temple (#6544) 2026-04-21 15:30:33 +00:00
Philip Dubé fa875596f2 pool_functions cleanup (#6536) 
remove 3drando/rando_main
 2026-04-21 15:29:36 +00:00
Philip Dubé 94a5311cba port text.hpp to custom-message as text.cpp/text.h (#6541) 
remove unused logic, leaving Text pretty bare bones
 2026-04-20 18:37:05 +00:00
Philip Dubé 461cc0930f don't use 3drando/random.hpp outside 3drando (#6537) 2026-04-20 17:18:48 +00:00
Philip Dubé aa5379a8e0 remove 3drando/custom_messages (#6538) 2026-04-20 17:18:25 +00:00
Reppan bf37645d72 Fix mirror shield color editor (#6542) 
Oversight on my end that customequipment.cpp unloaded and reloaded assets abit to aggressive.

Adds a guard to make sure to only unload if custom asset is used and to not unload then reload vanilla asset.

Have tested it with fados customequipment and confirmed that mirrorshield is working as intended.
 2026-04-20 17:18:08 +00:00
Philip Dubé 3b65eaa4ef Fix cutscene skips causing credits to spawn player in Lake Hylia (#6534) 
SkipBlueWarp was intercepting credits. Disable during GAMEMODE_END_CREDITS
 2026-04-19 20:50:11 +00:00
Philip Dubé c7ef690bc2 func_$hex renaming from upstream (#6498) 2026-04-19 18:56:01 +00:00
Chris 3be7eff02c Arrow cycle should check for sufficient magic (#6532) 2026-04-19 15:04:13 +00:00
Philip Dubé 39dcc0a73c Triforce Hunt: drain queue before credits (#6519) 2026-04-18 21:21:29 +00:00
ProverbialPennance 80de5cc179 example flake - add missing deps, pin clang14 (#6531) 
`Python3`, used for several CMake targets.
`Zenity`, a still used runtime dependency.
`xorg.libX11` -> `libx11`, packageset deprecated.
`imagemagick`, included as per @IQubic's research.
`clang_14`, clang-formatter used by decomp, thus also used by HM64
 2026-04-18 13:07:10 +00:00
Philip Dubé f5e113c5aa fix Roc's translation (#6525) 
feel like I've done this a few times now..

Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>
 2026-04-18 13:05:57 +00:00
rannek06 52a08daf04 Fix Hint translation (#6507) 
Fix the inversion of french and german articles in the hints, also adds or correct a few articles in french.

---------

Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>
 2026-04-17 13:31:39 +00:00
Reppan 4587ca6dbe Horseback archery settings (#6517) 2026-04-17 13:22:57 +00:00
Philip Dubé 256ab01630 Fishing: don't say default 6/7 when minimum reduced by enhancement (#6523) 2026-04-17 04:31:02 +00:00
Philip Dubé 072838613a Fix kak bazaar items having articles (#6522) 
IsShop didn't include SCENE_TEST01, but that's used as placeholder for kak bazaar vs market bazaar
 2026-04-17 03:53:24 +00:00
Philip Dubé aedae12e63 Hookify DropsDontDie, NoFishDespawn, NoBugsDespawn (#6513) 2026-04-17 03:50:17 +00:00
Chris 9c321862ca Fix Rate Limited Success Chime (#6512) 2026-04-17 01:30:28 +00:00
A Green Spoon 412b60a02f Fix Duplicate Reticles in Anchor (#6520) 2026-04-16 23:50:55 +00:00
Philip Dubé 1876435e98 Fix skulltula hints ending text too soon (#6516) 2026-04-16 15:59:14 +00:00
Philip Dubé 27d35e5a92 Fix logic issues noticed while rebasing doorsanity (#6510) 
These shouldn't generally matter right now
 2026-04-15 15:23:33 +00:00
Sophia Caspe 12dddc5e8e Dungeon Rewards Own Dungeon + Light Medallion Handling Refactor (#6500) 
Co-authored-by: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
 2026-04-15 13:44:52 +00:00