mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-06-05 11:37:04 -04:00
Code Issues Packages Projects Releases Wiki Activity
3,831 Commits 6 Branches 52 Tags
8a0315a2df8aa3ccf62bb532697f2153c599859e
Commit Graph

3831 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Jameriquiah 30dcd7946f add fps custom equips (#6543) 2026-05-25 03:31:29 +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
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
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
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é 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
Philip Dubé c7ef690bc2 func_$hex renaming from upstream (#6498) 2026-04-19 18:56:01 +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é aedae12e63 Hookify DropsDontDie, NoFishDespawn, NoBugsDespawn (#6513) 2026-04-17 03:50:17 +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
Philip Dubé 17a8f460e0 Merge pull request #6504 from HarbourMasters/develop-ackbar 
merge develop-ackbar 9.2.3 to develop
 2026-04-14 16:48:19 +00:00
Philip Dubé cb71e22a79 9.2.3 Ackbar Delta (#6503) 9.2.3 2026-04-13 23:48:22 -07:00
Philip Dubé feb489cab0 Fix shopsanity soft lock (#6502) 
GetForCurrentLanguage() defaults to MF_FORMATTED, appending MESSAGE_END (\x02) to output string

Revert using hint name for items in shops. Other merchants return GetHintMessage directly
 2026-04-14 06:41:37 +00:00
Philip Dubé 4cae72463e Merge pull request #6497 from serprex/develop922 
merge develop-ackbar 9.2.2 to develop
 2026-04-14 02:31:35 +00:00
Demur Rumed a60d46141b Merge remote-tracking branch 'origin/develop-ackbar' into develop922 2026-04-14 01:10:10 +00:00
Philip Dubé adb1e46ba9 fix bad args handling in extractor (#6501) 9.2.2 2026-04-14 01:00:16 +00:00
Philip Dubé 13ebc31ec7 9.2.2 Ackbar Charlie (#6494) 2026-04-13 14:12:37 +00:00
Jerom Venneker ca38dba192 Add missing Hint clarities back (#6477) 2026-04-13 03:39:30 +00:00
Philip Dubé 25eb09180d Revise Arrow Cycling (#6490) 
1. simplify UI, flashing buttons are unnecessary
2. change arrow without drawing a new arrow
 2026-04-12 23:03:46 +00:00
Philip Dubé d855742c2f Avoid over-allocating with texture interpolation (#6489) 
Also remove interpolation with all zeroes & fix one interpolation direction
 2026-04-12 18:51:04 +00:00
Philip Dubé 8513fd8800 fix cosmetic/audio randomizing options being seeded when they shouldn't be (#6481) 2026-04-12 18:25:05 +00:00
Philip Dubé 568813a2a4 Remove tooltip text referencing Let It Snow chests (#6488) 
Was not preserved in chest revamp
 2026-04-12 18:24:53 +00:00
Philip Dubé 7b7b799fad Make Lake Hylia water level switch in rando 10x faster (#6492) 
35 seconds was an eternity
 2026-04-12 18:24:14 +00:00
Philip Dubé 88099e6ebe Fix generation failure for Ganon's Castle MQ Fire Trial (#6487) 2026-04-12 13:27:06 +00:00
Jordan Longstaff 68cd04175d Update ccache-action version to 1.2.22 (#6482) 2026-04-11 14:55:20 +00:00
Jordan Longstaff b2f0cae9ec Added slider for Rupee Diving Game's time limit (#6476) 2026-04-10 23:51:38 +00:00