nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity
3,635 Commits 8 Branches 0 Tags
7b1820298d1d112e2effc0363906cff2c660c907
Commit Graph

3635 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Patrick12115
7b1820298d Block Syncing Items and Flags when playing Archi (#31) 2025-11-30 14:38:29 -07:00
Malkierian
aa119ce8f9 Convert all menu code to new menu, convert Holiday structure to ShipInit and MenuInit, and disable custom rainbows. 2025-11-23 09:34:17 -07:00
Malkierian
08fd5ff5cd Clean up rebase errors. 2025-11-21 12:08:22 -07:00
lilacLunatic
d48461f965 [Holiday] Custom rainbows (#4698) 
* [Holiday] Custom rainbows

* Update soh/soh/Enhancements/Holiday/LL.h

Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
 2025-11-21 11:27:08 -07:00
Garrett Cox
d37a68c7cc Various cleanup 2025-11-21 11:26:11 -07:00
Archez
06aefb30f7 let-it-snow: Snow Golems (Skeleton override) (#4695) 
* Add Snow Golems (Skeleton override)

* update snowball to use new snowball DL
 2025-11-21 11:16:42 -07:00
Garrett Cox
045de62c95 Add custom collectible thing 2025-11-21 11:02:43 -07:00
Caladius
8bb5d1f1b7 Ornament Exchange (#4582) 2025-11-21 11:01:05 -07:00
Malkierian
ffa470f0ec Restore VB from rebase. 2025-11-21 11:00:50 -07:00
aMannus
bccf43fc93 Rocs Feather - LetItSnow Edition - No Save Edition - Limited Edition (#4577) 
* Rocs Feather Take 2

* Tooltip
 2025-11-21 11:00:26 -07:00
lilDavid
e01889e36e Holiday Modding Event - Bomb Arrows (#4573) 
* Bomb Arrows: Turn arrows into bomb arrows

* Bomb Arrows: Drain bombs when fired

* Bomb Arrows: Equip Over Bow

* Bomb Arrows: Item icons and ammo counts

* Bomb Arrows: Save files

* Bomb Arrows: Fix equip and ammo display bugs

* Bomb Arrows: Interactions with multi-arrows

* Bomb Arrows: Fix fuse graphics
 2025-11-21 10:58:00 -07:00
Pepe20129
6c19413f45 Shiny enemies (#4570) 2025-11-21 10:57:33 -07:00
Caladius
ea163f12b9 Boulder Shuffle - Shuffles all Boulders randomly (#4554) 2025-11-21 10:56:47 -07:00
Caladius
99585ff270 Holiday Fever (#4551) 
* Holiday Fever

* Swap to Int32 for safety net
 2025-11-21 10:56:47 -07:00
Garrett Cox
2ff9fcc8fa Fix christmas tree messages 2025-11-21 10:54:32 -07:00
Malkierian
2e8fc8873d Restore VB from merge 2025-11-21 10:52:00 -07:00
Garrett Cox
10f8768bca Add ganon dating sim PoC (#4510) 2025-11-21 10:50:52 -07:00
Garrett Cox
0488f359ed Fix build issue (#4504) 2025-11-21 10:44:52 -07:00
Garrett Cox
1607ad82c0 Add holiday menu and various examples 2025-11-21 10:44:52 -07:00
Malkierian
bb497e3125 Initial re-application of let-it-snow. 2025-11-21 10:07:19 -07:00
Garrett
3050d9484f Merge branch 'develop' of github.com:HarbourMasters/Shipwright into aManchipelago 2025-11-16 08:12:13 -06:00
Garrett Cox
eca9eac0cf Use OE for storing client ID, remove remaining game state touch point in network thread (#5969) 2025-11-16 08:10:07 -06:00
Malkierian
05233487f8 Don't try to register the Anchor widgets when not built with networking enabled. (#5964) 2025-11-14 14:28:49 -07:00
Malkierian
16909c47cd Merge pull request #5963 from HarbourMasters/develop-copper 
Copper -> Dev fix (#5962)
 2025-11-14 12:46:51 -07:00
Malkierian
daeb3a84c7 Can't use CVars before the CVar system is initialized. (#5962) 2025-11-14 12:45:48 -07:00
Malkierian
623a7e4f7b Merge pull request #5961 from Malkierian/develop-copper 
Copper -> Develop 11/14
 2025-11-14 12:29:38 -07:00
Garrett Cox
060878fb2e Anchor (#4910) 
This is far and away the proudest thing I have been apart of in the Zelda community. Thank you to everyone who either directly or indirectly contributed to this effort. If I forgot to co-author you and you were involved, know that I simply forgot but still appreciated your help! Also thank you to the literal tens of thousands of people who have played Anchor, providing feedback and bug reports. Super thrilled to finally have this merged into the main Ship of Harkinian experience.

Co-authored-by: mattman107 <65982675+mattman107@users.noreply.github.com>
Co-authored-by: David Chavez <david@dcvz.io>
Co-authored-by: MelonSpeedruns <melonspeedruns@outlook.com>
Co-authored-by: aMannus <mannusmenting@gmail.com>
Co-authored-by: Malkierian <malkierian@gmail.com>
Co-authored-by: Caladius <Caladius@users.noreply.github.com>
Co-authored-by: Patrick12115 <115201185+Patrick12115@users.noreply.github.com>
Co-authored-by: PurpleHato <47987542+PurpleHato@users.noreply.github.com>
Co-authored-by: balloondude2 <55861555+balloondude2@users.noreply.github.com>
Co-authored-by: lilacLunatic <8488221+lilacLunatic@users.noreply.github.com>
Co-authored-by: Felix Lee <flee135@users.noreply.github.com>
Co-authored-by: Sirius902 <10891979+Sirius902@users.noreply.github.com>
 2025-11-14 11:04:09 -07:00
Jordan Longstaff
cd1d619c9f Modularize permanent loss mod hooks (#5948) 
* Modularize permanent loss mod hooks

* Make RegisterBonkDamage static

* Remove a couple of errant includes

* Fix more errant includes
 2025-11-14 09:30:04 -07:00
Philip Dubé
6ccdfc6051 Fix: ground jump for haunted wasteland GS is hard (#5843) 
* Fix: ground jump for haunted wasteland GS is hard, & can't be done with hammer

Pulled this logic from zootr where sword is assumed, was not able to execute myself

* Pepper0ni took a stab at this, wasn't able to do it, but didn't feel it wasn't doable

* AGreenSpoon figured it out with BGS/hammer
 2025-11-13 19:24:40 -07:00
Malkierian
1e1a47c263 Load metadata without LoadFile() on startup (#5817) 
* Load metadata without `LoadFile` on startup.
Implement file type entry.

* Fix non-Windows?

* clang
 2025-11-13 19:05:51 -07:00
Jordan Longstaff
14fb9e60d8 Autosave no longer works after save file is deleted (#5959) 2025-11-13 15:31:57 -07:00
Jordan Longstaff
dadc2e5218 "Assignable Tunic and Boots" setting now allows shields also (#5953) 2025-11-13 14:29:48 -07:00
Pepper0ni
c005248129 Refactor zoras river logic (#5907) 
* refactor zoras river

* Update soh/soh/Enhancements/randomizer/location_access/overworld/zoras_river.cpp

Co-authored-by: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>

* Update soh/soh/Enhancements/randomizer/location_access/overworld/zoras_river.cpp

Co-authored-by: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>

* Update soh/soh/Enhancements/randomizer/location_access/overworld/zoras_river.cpp

Co-authored-by: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>

* Update soh/soh/Enhancements/randomizer/location_access/overworld/zoras_river.cpp

Co-authored-by: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>

* Update soh/soh/Enhancements/randomizer/location_access/overworld/zoras_river.cpp

Co-authored-by: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>

* Update soh/soh/Enhancements/randomizer/location_access/overworld/zoras_river.cpp

Co-authored-by: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>

* Update soh/soh/Enhancements/randomizer/location_access/overworld/zoras_river.cpp

Co-authored-by: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>

---------

Co-authored-by: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>
 2025-11-13 13:03:55 -07:00
Pepper0ni
75c9c579a4 fix invisible blades (#5957) 2025-11-12 08:11:00 -07:00
Philip Dubé
a31b7d9ae7 refactor shadow logic (#5650) 
* refactor shadow logic

* ground jump / hookshot extension

* with groundjump invisible spikes room can be cleared, collecting silver rupees with backwalked backflips with hover boots

* nb
 2025-11-11 19:32:36 -07:00
Pepper0ni
25be804841 Refactor BotW logic (#5649) 
* Update well logic for doorsanity

Co-authored-by: Demur Rumed <junkmute@hotmail.com>

* clang

* Apply suggestions from code review

Co-authored-by: Philip Dubé <serprex@users.noreply.github.com>

* Add adult + irons + hook to getting to west ledge

* Update soh/soh/Enhancements/randomizer/location_access/dungeons/bottom_of_the_well.cpp

Co-authored-by: Philip Dubé <serprex@users.noreply.github.com>

* post merge fixes

* post merge fixes

* renames and ground jumps

* MQ updates

* address reviews

* Update soh/soh/Enhancements/randomizer/location_access/dungeons/bottom_of_the_well.cpp

Co-authored-by: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>

* Update soh/soh/Enhancements/randomizer/location_access/dungeons/bottom_of_the_well.cpp

Co-authored-by: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>

* Update soh/soh/Enhancements/randomizer/location_access/dungeons/bottom_of_the_well.cpp

Co-authored-by: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>

---------

Co-authored-by: Demur Rumed <junkmute@hotmail.com>
Co-authored-by: Philip Dubé <serprex@users.noreply.github.com>
Co-authored-by: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>
 2025-11-11 19:32:25 -07:00
Malkierian
5629d033c2 Forgot to get CVar value with the default specified in OTRGlobals to feed into InitLogging. (#5952) 2025-11-11 10:03:14 -07:00
Garrett Cox
36cd3a27e2 Fix menu path reassignment (#5949) 2025-11-10 13:18:26 -06:00
Garrett Cox
754d79a86e Tweaks to ENABLE_REMOTE_CONTROL usage & sail hooks (#5928) 2025-11-10 10:33:28 -07:00
Jordan Longstaff
33929534f5 Modularize boss defeat timestamp hook (#5886) 
* Modularize boss defeat timestamp hook

* Remove unneeded includes

* Move hook into GameplayStats folder

* Delete duplicated hook file
 2025-11-10 10:29:53 -07:00
Philip Dubé
3eade8133e Fix GF entrance tracker & generation issues with cratesanity (#5934) 2025-11-09 19:16:33 -07:00
Jordan Longstaff
c0848ccba8 Modularize custom skeleton hooks (#5931) 2025-11-09 18:27:52 -07:00
Jordan Longstaff
a3e540ebfe Modularize Mirrored World mode hook (#5930) 
* Modularize Mirrored World mode hook

* Remove IS_RANDO from registration conditions

Co-authored-by: Philip Dubé <serprex@users.noreply.github.com>

---------

Co-authored-by: Philip Dubé <serprex@users.noreply.github.com>
 2025-11-09 18:27:45 -07:00
Malkierian
6b83070343 Logging bump (#5938) 
* Bump LUS, call `InitLogging` with both values at `trace`.
Set up proper conditional default log level in Dev Tools.

* Update LUS ref.
 2025-11-09 18:27:19 -07:00
Jordan Longstaff
7ff93a3960 Dampe's Hut open all night when Dampe is out (#5937) 2025-11-09 18:27:09 -07:00
Pepper0ni
3d525d7eb1 Fix excluded locations getting bombchus when bombchu bag is off (#5943) 
* Fix bombchus being consistently added to excluded locations

* change to be a random junk item
 2025-11-09 08:58:18 -07:00
Garrett Cox
5249cd89df Stop creating timesplits file on init, and gitignore it (#5933) 2025-11-08 15:51:24 -06:00
Garrett Cox
8073f96856 Various hooks to support anchor (#5929) 2025-11-08 15:51:09 -06:00
Garrett Cox
66a9c7a218 Add merge strategy for preset sections (#5935) 2025-11-08 15:50:41 -06:00
Garrett Cox
0e162cbb7c Fix skybox being manipulated outside of appropriate scenes, other tweaks to disable 2d backgrounds impl (#5925) 2025-11-08 15:49:35 -06:00