mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-06-08 04:27:03 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,924 Commits 6 Branches 52 Tags
acac97ed16e01b26e6d9103335af2bdc6d570d96
Commit Graph

1924 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
aMannus acac97ed16 Switch tunics and kokiri colors to be red by default 2023-11-27 21:52:43 +01:00
aMannus 48643c6aea Merge branch 'develop-macready' into christmas-tree 2023-11-27 12:51:44 +01:00
aMannus 17df3733c9 Fix Christmas Ornament final camera shot 2023-11-27 12:51:12 +01:00
Malkierian 3cf9d655a7 Disable Fix Vine Fall when Climb Everything is enabled (#3439) 
* Disable Fix Vine Fall when Climb Everything is enabled.

* Remove option disabling.
 2023-11-26 11:34:54 -05:00
Caladius 523eeed956 Merge pull request #11 from garrettjoecox/test-christmas 
Add festive hats & a few debug tools
 2023-11-25 19:54:41 -05:00
Garrett Cox 8476896ebf Add festive hats 2023-11-24 12:14:22 -06:00
inspectredc 95f27ace2e Fix kokiri sword unequipping when using switch age cheat/enhancements (#3415) 
* test fix for ks unequip

* remove unnecessary brackets
 2023-11-24 09:40:42 -05:00
Salt d50ad4779d Fix #3417 Symlinks to Directories in Mods Dir Aren't Traversed (#3418) 2023-11-24 09:40:30 -05:00
Adam Bird f2df029efa fix: skybox crash for mask shop (#3427) 2023-11-24 09:38:45 -05:00
Garrett Cox bdb201201e Fix audio cutoff issues (#3428) 2023-11-24 09:38:13 -05:00
Adam Bird f4e4545180 Re-implement King Dodongo's Lava texture effects (#3434) 
* fix alt backgrounds not always loading

* include gfx lookup with the original unload

* Add hook for alt toggle

* handle cpu modified texture for kd lava

* malloc array instead of illegal initialize
 2023-11-23 09:07:30 -05:00
MelonSpeedruns d2adf55da3 removed patch file 2023-11-17 10:18:42 -05:00
MelonSpeedruns ba2d136d63 Merge branch 'ChristmasWork' into test-christmas 2023-11-17 10:18:00 -05:00
MelonSpeedruns bf5e4a6fa6 Cucco Lady hat 2023-11-17 10:17:15 -05:00
Caladius 4d77e5c2c3 Merge pull request #9 from aMannus/christmas-tree 
Merge develop, big cleanup, change checks for non-triforce hunt, add more Dana kak models
 2023-11-16 17:21:53 -05:00
aMannus c829dfb4ec Big cleanup, change checks for non-triforce hunt, add more Dana kak models 2023-11-16 21:37:41 +01:00
aMannus 5abd7e4957 Merge branch 'ChristmasWork' into christmas-tree 2023-11-16 20:18:42 +01:00
aMannus 1f5d81a8bf Merge branch 'develop' into christmas-tree 2023-11-16 20:18:10 +01:00
Caladius 6ba73171da Big boi commit, v2 Dana overlay DLs, un-unaliving Kak NPCs and moving them to better locations. Added Melons Wonder Item for the star and cleaned up their code for it. among other changes... 2023-11-16 13:55:37 -05:00
briaguya 0ddb0711ad Version bump to MacReady Charlie (#3406) 8.0.2 2023-11-15 23:22:09 -05:00
briaguya 3234256b03 bump lus (#3405) 2023-11-15 22:45:09 -05:00
inspectredc d8a7a6c764 Use Correct Player Boot Enums in CC (#3403) 2023-11-15 20:38:21 -05:00
Caladius f71cc5f1e1 Merge pull request #8 from aMannus/christmas-tree 
Christmas Decorations base actor
 2023-11-15 12:36:09 -05:00
aMannus ebaac0b063 Christmas Decorations base actor 2023-11-15 18:33:00 +01:00
Garrett Cox 2075213544 Merge pull request #3399 from HarbourMasters/develop-macready 
macready -> dev
 2023-11-14 22:24:48 -06:00
Garrett Cox 2dfbbc63e3 Version bump to MacReady Bravo (#3398) 8.0.1 2023-11-14 21:14:47 -05:00
Garrett Cox 044d32a46f Add gFixEyesOpenWhileSleeping (#3365) 2023-11-14 20:47:07 -05:00
Malkierian afe032ea21 [Feature/fix] Save to temp file first (#3376) 
* Add temp file flow to `SaveManager::SaveFileThreaded`.
Add "Save finish" info log message.

* Fix WiiU/Switch
 2023-11-14 20:46:50 -05:00
Josh Bodner fb45b66903 Fix magic being zeroed out when using fast file select (#3389) 
* Move to frame counter init to a place that fast file select also touches

* Undo removing old fix

* Reset on gameover
 2023-11-14 17:08:45 -05:00
Malkierian ba987c49e2 SaveManager cleanup (#3386) 
* Move threadpool initialization and `OnExitGame` registration from `SaveManager::Init` to SM's constructor.
Comment on `Init` to mention it's not an initializer for `SaveManager`.
Added check for `SaveManager::SaveSection` to prevent firing a save worker if the game is already exited from a reset.

* Removed `IsSaveLoaded` check in favor of another `ThreadPoolWait()` at the start of `SaveManager::Init()`.
 2023-11-14 16:46:38 -05:00
AltoXorg bd0672767a Use substr method to determine file extension (#3390) 
See https://github.com/HarbourMasters/OTRExporter/pull/12
 2023-11-14 16:37:54 -05:00
Adam Bird e66eb8756d Fix: Prevent patching custom models (#3367) 
* fix prevent patching custom models

* prevent patching chests textures for custom chest models

* add tooltip for cosmetic editor about custom models

* chest texture handling for alt toggles
 2023-11-14 16:37:03 -05:00
Garrett Cox bf31f2b330 Stop hardcoding skeleton type to flex (#3397) 2023-11-14 16:36:05 -05:00
Malkierian 4e9040d761 [Feature] Remove performDelayedSave functionality from Autosave (#3387) 
* Removes delayed save functionality, making autosave work everywhere except Ganon and Chamber of Sages scenes.

* Change AutoSave comment to remove the scenarios we no longer block autosave in.

* handle temp B on saving outside of kaleido

---------

Co-authored-by: Adam Bird <archez39@me.com>
 2023-11-14 16:35:19 -05:00
Malkierian 304016ddd2 [Feature Fix] Tunics stolen by like likes now removed from the item buttons (#3375) 
* Extends `Assignable Boots and Tunics` functionality to check for and remove Goron and Zora tunics from item buttons when like likes steal them.

* Comment documentation.
 2023-11-14 00:12:08 -05:00
briaguya fe9c0fa4f7 bump lus (#3394) 2023-11-14 00:10:56 -05:00
Malkierian 384403edb5 Rename all instances of Desert Wasteland to Haunted Wasteland. (#3372) 2023-11-13 23:45:52 -05:00
Malkierian 60687aff0d Move everything in RandomizerCheckTracker::LoadFile() except the block to load the "trackerData" section to a new OnLoadGame hook function to fix crashes on transferred saves. (#3368) 2023-11-13 23:45:41 -05:00
Ralphie Morell cf88b3d2bf Fix edge case of MS shuffle (#3364) 2023-11-13 23:45:15 -05:00
PurpleHato dd6271ecae ADD: No HUD Heart animation (#3348) 
* ADD: No HUD Heart Animation

I've seen this requested multiple times for modding purposes for the case of using "lifebars" instead of hearts

* TWEAK: Move it under the the mods

* REM: Whitespace

* REM: Whitespace2

* Tweak: Cvar Oppsie
 2023-11-13 18:13:46 -05:00
Malkierian 78ffb41cd2 Moved the check for !seqInfo.canBeUsedAsReplacement in InitializeShufflePool to exclude them before modifying either shuffle pool. (#3370) 2023-11-13 18:11:29 -05:00
Caladius dbd96ddf29 Merge branch 'develop' into ChristmasWork 2023-11-08 15:17:33 -05:00
Caladius 1bf2d98ece Merge pull request #6 from aMannus/christmas-tree 
Finished tree
 2023-11-08 10:03:23 -05:00
aMannus 7064ac9ac0 Add star to tree 2023-11-07 09:37:02 +01:00
Adam Bird 30ab8e9ed7 version bump to MacReady Alfa (#3363) 8.0.0 2023-11-06 20:55:50 -05:00
Adam Bird b6a3ed93a2 bump lus (#3361) 2023-11-06 20:05:18 -05:00
Pepe20129 1d3e7d4be9 Add MS shuffle to the hell mode preset (#3360) 2023-11-06 16:48:20 -06:00
Adam Bird 959b307b9e Fix: Repair working directory on Mac and use app directory for extractor search paths (#3359) 
* fix otr regen on mac release

* linux args
 2023-11-06 16:46:48 -06:00
Adam Bird 460b3d02f5 [OTR Archive] Move shared scenes out of nonmq/mq folders (#3191) 
* share common scenes between mq and nonmq

* move shared scenes under shared folder and bring back thieves hideout mq handling

* update headers for shared scenes

* bump submodules

* remove mq handling for mirror world song patch

* only have unique dungeons be nomq/mq variants

* bump submodules
 2023-11-06 16:44:49 -06:00
aMannus 10990bb616 Update tree model 2023-11-06 19:59:53 +01:00