Commit Graph

3616 Commits

Author SHA1 Message Date
Malkierian
b6166f41c8 Restore previous state of z_door_warp1.c, and reimplement boss rush blue warp bypass. This also fixes the issue with shadow and spirit medallions not being given in vanilla without cutscene skips on. (#5763)
Ensure shadow and spirit medallions get queued when skipping story cutscenes in vanilla.
2025-08-25 11:59:38 -07:00
Jordan Longstaff
9ff9bebaa2 Fix faulty Nocturne trigger when receiving Fire Medallion (#5761) 2025-08-25 11:59:28 -07:00
Pepe20129
7b4df9bdb2 Boss Rush cleanup (#5652)
* Reduce stuff in the `.h`s & use `COND_HOOK` + variants

* Move some boss rush stuff from `z_file_choose.c`

* clang

* Update BossRush.cpp
2025-08-13 12:08:32 -07:00
Philip Dubé
fadae49977 shipinit bonk damage (#5653)
* shipinit bonk damage

* no initFunc
2025-08-13 09:46:36 -07:00
Pepe20129
ee20f7f762 Fix max count for TH keys (#5670) 2025-08-12 20:39:31 -07:00
nclok1405
ce38e03562 Allow console commands in debug save (#5675) 2025-08-12 20:38:44 -07:00
Eric Hoey
568639dfc0 skip ItemGet for small keys after skeleton key (#5730) 2025-08-12 20:37:08 -07:00
Philip Dubé
9cdffc080b small typo fixes (#5680)
incorrect RR was tripping up my code generator
2025-08-12 20:36:51 -07:00
PurpleHato
c597e1c4ce TWEAK: SoT Time Travel - Allow Swordless (#5716)
* Magic number + more modular

* tweak + switch

* forgot basic oot

* linebreak

* c-lang
2025-08-12 19:57:19 -07:00
Pepe20129
526d221c56 Add timestamps for remaining custom rando items (#5713) 2025-08-12 19:57:02 -07:00
Pepe20129
3e39a94083 Turn song text into a notification (#5712) 2025-08-12 19:56:52 -07:00
Eric Hoey
e104870e6a remove !IS_RANDO check (#5728) 2025-08-12 19:56:07 -07:00
xxAtrain223
353ad944be Removed SHUTTER_BACK_LOCKED and SHUTTER_BOSS from GetDungeonSmallKeyDoors. (#5738) 2025-08-12 19:55:38 -07:00
Malkierian
89c1c97522 Add missing CVar check for tab key processing for alt asset toggle. (#5736) 2025-08-09 11:17:33 -07:00
aMannus
58a564077e Clang format 2025-08-06 23:01:14 +02:00
aMannus
fc80fb5413 Merge pull request #78 from jeromkiller/Harkipellago
Harkipellago
2025-08-06 22:56:13 +02:00
aMannus
f1a074d6ea Fix jabu jabu option 2025-08-06 22:42:20 +02:00
Jerom Venneker
9774826ad2 Attempting to load cert from package 2025-08-06 19:50:23 +02:00
Jerom Venneker
bd90e56a6a Adding cert to packages 2025-08-06 17:04:03 +02:00
Jerom Venneker
48e869b61f Downloading cert store at build time 2025-08-06 14:32:44 +02:00
Pepe20129
6d4c6f8ea6 Rando: Remove ice trap effect from vanilla ice trap chests (#5711) 2025-08-05 20:43:41 -07:00
Pepper0ni
b87f1432fd properly clear location subcatagories when generating a seed (#5707) 2025-08-05 20:43:19 -07:00
Malkierian
429021d434 Add THRescuedAllCarpenters to reset list to prevent seed bleed of bridge. (#5725) 2025-08-05 18:28:19 -07:00
Jerom Venneker
a72660959c Added queueing up song of time check when getting the ocarina of time check when its already been checked remotely 2025-08-04 21:27:17 +02:00
Jerom Venneker
799e2c2d5a Cleared up error messages around failed connections 2025-08-04 18:15:55 +02:00
Jerom Venneker
e204400dbb Changed connection flags to support starting items 2025-08-04 17:59:35 +02:00
aMannus
9b710c7a6b clang format 2025-08-02 10:49:00 +02:00
aMannus
138f2ecd97 Merge branch 'aManchipelago' of https://github.com/aMannus/Shipwright into aManchipelago 2025-08-02 10:47:41 +02:00
aMannus
e12da0f68f Merge pull request #77 from jeromkiller/Harkipellago
Fixed miscolored Archi logo
2025-08-02 10:47:21 +02:00
aMannus
d55a9f4675 Remove leftover doc 2025-08-02 10:45:28 +02:00
Jerom Venneker
0d5ce9caca Fixed miscolored Archi logo 2025-08-01 14:22:13 +02:00
aMannus
00a70eae87 clang format 2025-07-31 10:44:47 +02:00
aMannus
e53d29e12d Revert readme 2025-07-30 23:25:07 +02:00
aMannus
f1ba0fe156 Fix excluded locs, ap icon in notifs, death link while connecting 2025-07-30 20:17:27 +02:00
aMannus
c64c8f6c0f Move connected icon to corner, fix cutoff logo 2025-07-30 19:44:40 +02:00
aMannus
a2e96ac4d1 Merge pull request #75 from jeromkiller/AddArchipelagoClientLib
Fixed item queue issue caused by soft resetting the game
2025-07-30 19:21:22 +02:00
Jerom Venneker
e93dc762b9 Fixed item queue issue caused by soft resetting the game 2025-07-30 18:02:33 +02:00
Malkierian
be77a9be71 Fix Dpad Navigation and Dpad equips on Inventory (#5708)
* Encapsulates ship-specific stuff inside the first state checks in menu draw functions to prevent function bleed.

* clang
2025-07-29 18:47:43 -07:00
aMannus
075bce439b Misc bug fixes 2025-07-29 10:46:22 +02:00
aMannus
761f85037b Fix memory bug 2025-07-28 23:01:56 +02:00
aMannus
72966c46e5 Fix ap parse error 2025-07-28 21:08:05 +02:00
Malkierian
1d20000411 MPQ Support LUS Bump (#5570)
* Adapt to changes to LUS regarding including MPQ support.

* CMake compile definitions are stupid.

* Don't manually close O2RArchive.

* Finish LUS bump, including SoH-side fix for font free crash.
2025-07-28 08:54:31 -07:00
aMannus
9f11e1fcde Add support for a ton more ap options 2025-07-28 12:03:04 +02:00
aMannus
54a3a4704b Merge pull request #74 from jeromkiller/AddArchipelagoClientLib
Merge in jerom's progress
2025-07-25 11:59:56 +02:00
aMannus
a4d0f10444 Merge branch 'develop' into aManchipelago 2025-07-25 11:58:09 +02:00
aMannus
73209fcf2c Merge pull request #5697 from Malkierian/blair-foxtrot-dev
Blair Foxtrot -> Develop
2025-07-25 11:56:33 +02:00
Malkierian
27d88c80b1 Merge branch 'develop-blair' of github.com:Malkierian/Shipwright into blair-foxtrot-dev 2025-07-24 10:04:06 -07:00
Malkierian
7d7072f717 Bump version to 9.0.5 (#5694) 2025-07-23 21:31:13 -07:00
Jordan Longstaff
ccf3d4b6a0 Add playing icon to improve Audio Editor indicator (#5686) 2025-07-23 20:48:01 -07:00
AltoXorg
d06cf6bf10 timesplitdata.json obey app directory (#5693) 2025-07-23 20:45:46 -07:00