mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-06-10 05:03:29 -04:00
Code Issues Packages Projects Releases Wiki Activity
3,886 Commits 6 Branches 52 Tags
35a2ce4bfed2e3a0614c7f05e7eada6956db735a
Commit Graph

3886 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Philip Dubé 35a2ce4bfe Merge pull request #6715 from serprex/ackbar 
merge ackbar to develop
 2026-06-10 01:23:01 +00:00
Demur Rumed 17f5983771 Merge remote-tracking branch 'origin/develop' into develop-ackbar 2026-06-09 22:57:16 +00:00
Philip Dubé d901223ade Crop input viewer images (#6695) 
Addresses complaint that it's hard to stash in corner without getting black box
 2026-06-09 20:34:57 +00:00
lepideble 88a5b3ff48 Add an option to limit the location of triforce pieces (#6710) 2026-06-09 20:30:35 +00:00
Pepe20129 e93ea5b919 Enemy rando cleanup 3 (#6518) 
* Fix bari's biris not respecting the seeded option
* Randomize Peehat Larvas
* Refactor `IsEnemyAllowedToSpawn`
* Fix the issue where some enemies spawn above the ceiling
* Partially fix twisted hallway issue
* Prevent Baris from spawning Baris
 2026-06-09 19:52:25 +00:00
Philip Dubé 5875ed880a Fix Malformed Preset Filenames (#6712) 
Sanitize preset names for filesystem safety, log errors without crashing

Co-authored-by: Unreference <87878910+unreference@users.noreply.github.com>
 2026-06-09 19:51:15 +00:00
Philip Dubé 8649085862 add option gating shields / tunics in shop behind finding one first (#6700) 2026-06-09 19:45:04 +00:00
Philip Dubé eaad45879a remove unused code from option.cpp (#6690) 2026-06-09 16:19:06 +00:00
Philip Dubé 3e1318edc0 uncomment code in z_camera.c (#6709) 
pointed out by Evangelia, cause of discrepancy in crawlspace glitch
* [Console](https://www.youtube.com/watch?v=2_tFHeEvXI0)
* [SoH](https://www.youtube.com/watch?v=-u3TzbdUr3c)
 2026-06-09 16:17:22 +00:00
A Green Spoon 47e386197d Fix random seed string gen (#6697) 2026-06-09 01:59:02 +00:00
Chris 43777996a8 Fix Ocarina Time Travel Registration (#6698) 2026-06-09 00:11:25 +00:00
Pepe20129 b424e4d57e Sort some files into their correct folder (#6689) 2026-06-08 16:26:24 +00:00
Reppan 228f9fecea [Modding] Add Adult Mask DL for mod compability (#6642) 2026-06-08 00:42:03 +00:00
Philip Dubé b6151c131a Allow all 8 items in shop to be randomized in No Logic (#6688) 2026-06-07 06:13:09 +00:00
Jordan Longstaff 38e12a33c4 Child Link cycles arrow types (#6686) 2026-06-07 04:35:28 +00:00
Pepper0ni 8215b97cb8 Add MQ water lock fix, force it in rando (#6575) 2026-06-07 01:35:43 +00:00
Pepper0ni 91769a0e3e boss key hint typo (#6583) 2026-06-07 01:35:07 +00:00
louist103 dd2e952cf5 Don't use shared pointers for the CS helpers (#6685) 2026-06-07 00:51:47 +00:00
Chris 8bc72638c3 Add 2nd water control switch and sync floating key (#6568) 2026-06-06 21:38:56 +00:00
Pepper0ni 8a14cd1096 Move to port-maintainance LUS branch to fix crash on close (#6629) 2026-06-06 21:30:55 +00:00
Jordan Longstaff d4d88de827 Change trial barrier cutscene skip to Story (#6592) 2026-06-06 20:26:53 +00:00
Pepe20129 10e429d8f7 Don't Spoil Ice Trap (#6597) 2026-06-06 20:23:11 +00:00
Aaron Gamache db60f64f8e Compile with -ffp-contract=off on arm64 macOS (#6584) 2026-06-06 20:01:54 +00:00
Qshadow f45d65381f Add Windows ARM64 build support (#6635) 2026-06-06 20:01:40 +00:00
Shishu the Dragon ef014a35e6 Enhancement to disable heat haze (#6663) 2026-06-06 19:56:31 +00:00
Pepe20129 2d962bbb8c Split up mods.cpp (#6677) 2026-06-06 03:47:41 +00:00
Matt Jakubowski 8a0315a2df Fix Crowd Control Wolfos despawning when scene switch 0 is set (#6591) 
Crowd Control passed actor params 0 for EN_WF, so EnWf_Init treated
switchFlag 0 and killed the actor when scene switch 0 was set. Match
vanilla EnEncount1 Wolfos spawns: (0xFF << 8) | 0x00

Also prevent crowd control effects from triggering when link is not in controllable state
 2026-06-05 06:18:26 +00:00
Philip Dubé b61db77020 more hardening of code in Network/ (#6650) 
also unique_ptr
 2026-06-05 06:16:11 +00:00
Pepe20129 90823fad5a Identify clean up (#6673) 
Can't move `IdentifyShopItem` as it's used all over the place.
 2026-06-04 02:35:43 +00:00
A Green Spoon 1f16987215 extend NTSC10 spawn to NTSC11 (#6675) 2026-06-04 02:35:10 +00:00
A Green Spoon 1ee0f5a654 Fix anchor get item crash (#6678) 
* remove Roc's GID and prevent OOB from prior versions

* change OOB gi to stone of agony
 2026-06-04 02:34:50 +00:00
Pepper0ni ec27775e81 Fix Logic issues in DMC > Fire Temple and DMC wall PoH (#6679) 
* DMC logic: wall poh needs climb

Include jumpslash as unintuitive jump
Leave one note about getting there with hovers or acrobatics

* Handle fire temple boulders properly, add some new cases to skip climb with the wall

---------

Co-authored-by: Demur Rumed <159546+serprex@users.noreply.github.com>
 2026-06-04 02:33:26 +00:00
A Green Spoon abcb3ad94b adult-only crate (#6674) 2026-06-03 03:17:30 +00:00
Pepper0ni fe78ae21a6 Properly send Link to the beginning to the dungeon in boss room shuffle (#6676) 2026-06-03 03:12:31 +00:00
Philip Dubé 80d3114f79 Fix logic placing item on saving carpenters when carpenters start free (#6661) 
Set flag on savefile, fill location when freed, don't junk check when card shuffled

Also fix other misc issues in fill logic
 2026-05-31 13:46:37 +00:00
Philip Dubé 1de22d816c OTRGlobals.h: include stdint.h (#6656) 
standardize on stdint.h over cstdint
 2026-05-30 14:29:39 +00:00
Pepper0ni 004adaae14 Update LUS to build in GCC 16 (#6601) 2026-05-30 13:38:58 +00:00
Philip Dubé a3ab0e2bdf Eradicate rand (#6553) 
Random seed: always generate 10 digits

Reduce max seed size, this is getting hashed so it's not valuable to have so many characters
 2026-05-29 21:50:19 +00:00
Philip Dubé b8a3998c51 Fix master sword timing info (#6552) 
General fix: don't reset timestamp if already set,
this is particularly important for retrieving master sword vs ganon

Also fix master sword timing not being set when shuffled
 2026-05-29 02:51:57 +00:00
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