mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-05-24 07:11:27 -04:00
Code Issues Packages Projects Releases Wiki Activity
2,609 Commits 6 Branches 52 Tags
e6db2e5d37bc556eedf4504e0165ec5e5aaa6233
Commit Graph

2609 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Garrett Cox e6db2e5d37 Merge branch 'develop' of garrettjoecox.github.com:HarbourMasters/Shipwright into let-it-snow 2024-11-24 09:50:40 -06:00
aMannus 7d3b9e8211 Rocs Feather - LetItSnow Edition - No Save Edition - Limited Edition (#4577) 
* Rocs Feather Take 2

* Tooltip
 2024-11-24 08:18:01 -06:00
lilDavid f1dc432589 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
 2024-11-22 21:03:37 -06:00
Archez 8926d8f784 Fix array out of bounds in entrance init (#4566) 2024-11-22 16:23:15 -07:00
Pepper0ni 5520c185bf Limit retries of the randomiser quest menu seed generation (#4564) 2024-11-22 16:22:39 -07:00
Pepper0ni 9c99a1e515 Fix the "Greg as Reward" option in logic (#4565) 2024-11-22 16:22:27 -07:00
Pepper0ni eda97653d6 Save timesplits colour to cvar and reload it on init. (#4572) 
* save timesplits colour to cvar and reload it

* fix mac and match cosmetics with the color conversion

* more stupid other platform fixes
 2024-11-22 10:28:10 -07:00
Pepe20129 0f48970576 Shiny enemies (#4570) 2024-11-21 16:08:49 -06:00
Pepper0ni f0e5b9c22b learning how to VB (#4563) 2024-11-19 18:46:44 -07:00
Philip Dubé 01719283b3 typo: incorrect variable assignment (#4560) 2024-11-19 16:29:15 -07:00
Pepper0ni 3e313bd063 Enhacment presets no longer reimport randomiser settings (#4561) 
* Enhacment presets no longer reimport randomiser settings

* make the change only apply to the Randomiser button instead
 2024-11-19 16:22:54 -07:00
Caladius d459043644 Boulder Shuffle - Shuffles all Boulders randomly (#4554) 2024-11-19 17:22:07 -06:00
Archez 53b72a2507 Update PR artifacts actions and exclude soh.otr (#4558) 
* update pr artifacts actions and exclude soh.otr

* remove deprecated save-always for windows cache
 2024-11-19 18:18:18 -05:00
Malkierian 3f2d8ddc01 Fix infinite freeze in rando on GS pickup. (#4555) 2024-11-19 15:40:23 -07:00
Malkierian 4850041943 Fix Gift from Sages not showing in tracker (it's a valid shuffle now!). (#4556) 
Bit of tracker code cleanup.
 2024-11-19 15:39:42 -07:00
Malkierian 5dd3b39a83 Fix Plando Window Crash on new installs (#4557) 
* Add check for Randomizer folder existing, and creating it if not, to plando window.

* Changed seed list population to just bail if the Randomizer folder doesn't exist.
Added button disabling to prevent crashes loading or saving empty structures.
 2024-11-19 15:39:30 -07:00
Pepe20129 9bed5af33b OTRGlobals cleanup (#4251) 
* Remove unused headers

* Move all "ResourceMgr_" functions to a new file

* Don't transitively include SaveManager

* Move cvar prefixes to a new header

* Add missing includes

* Update OTRGlobals.cpp

* Fix build

* Address review

* Fix some of the errors

* Update gameplaystats.h

* Update z_en_in.c

* Hopefully fix the linux issues

* Fix Linux issues for real this time, I checked

* Update ResourceManagerHelpers.cpp

* Update z_obj_mure2.c

* Post-merge fixes

* Fix build (hopefully)

* Post-merge fixes

* Update z_file_nameset_PAL.c

* cleanup some unnecessary headers (#7)

---------

Co-authored-by: Archez <Archez@users.noreply.github.com>
 2024-11-19 09:44:44 -07:00
Caladius 70f3dfa8c5 Built-in Plandomizer Editor (#4532) 
* Add Plandomizer Editor Window

* UI, Ice Trap Editor, Hint Editor

* Drop down for previous seeds, wip hash display.

* Clean Up, Hash Icon Editor

* Updates based on suggestions

* Replace Tint with Color

* Add Boss Soul Icon

* Corrected App Folder Directory and updated from suggesstions.

* Add Hints to Junk Pool

* Utilize RandomElement for hints

* Hint update for pep

* apply patch

* Fix Sorting issue on Linux

* Skeleton Key, Shop Items, Milk, Fishing Pole, Ocarina Buttons, Loser Rupee fixed

* Fix stretched note icons.

* Remove Triforce, add Triforce Pieces. Centered Song Notes.

* Update soh/soh/Enhancements/randomizer/Plandomizer.cpp

Co-authored-by: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>

* Update hint_list.cpp

One spelling, removed 1 hint.

* Update Plandomizer.cpp

---------

Co-authored-by: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
Co-authored-by: Malkierian <malkierian@live.com>
 2024-11-17 12:44:54 -07:00
Caladius d9d831f241 Holiday Fever (#4551) 
* Holiday Fever

* Swap to Int32 for safety net
 2024-11-15 21:12:58 -06:00
Garrett Cox 79ede37262 Merge pull request #4546 from garrettjoecox/let-it-snow 
Fix christmas tree messages
 2024-11-13 21:43:43 -06:00
Garrett Cox bfd54abada Fix christmas tree messages 2024-11-13 14:19:11 -06:00
Malkierian 53e2fe4974 Refine mixed pool options to be more dynamic. (#4545) 2024-11-13 08:49:10 -07:00
Malkierian 6230901f29 Fix duplicate use of CVar for invert shield aiming. (#4544) 2024-11-12 22:02:22 -07:00
Jordan Longstaff 1eff613aa6 Fix skipping twisted hallway cutscenes (#4536) 2024-11-12 13:09:08 -07:00
aMannus c8e460cebe Heal goron necks (#4540) 2024-11-12 12:58:41 -07:00
Garrett Cox ed9692c84f Merge pull request #4539 from garrettjoecox/let-it-snow 
Update let-it-snow with develop and fix ornament messages
 2024-11-12 10:19:56 -06:00
Garrett Cox a6fbadc04e Fix issues with vanilla item queue when skipping things, resolves #4537 (#4538) 2024-11-12 10:18:57 -06:00
Garrett Cox 2ee5e5c428 Merge branch 'develop' of garrettjoecox.github.com:HarbourMasters/Shipwright into let-it-snow 2024-11-12 09:38:41 -06:00
Garrett Cox ee186f6c22 Fix issue with ornament get item messages 2024-11-12 09:33:25 -06:00
Pepe20129 ffc132a01b Clean __osMalloc.c (#4351) 
* Remove #ifs

* Add `NODE_IS_VALID`

* Fix current macros

* `NODE_GET_NEXT` & `NODE_GET_PREV`

* Add macros

* Use macros and general cleanup

* Fix build (hopefully)

* Address review
 2024-11-11 17:46:25 -07:00
Archez f12a2bbbb7 Port over decomp updates for vis* and reimplement vismono fb (#4533) 
* Port over decomp updates for vis*

* move vismono framebuffer handling to file
 2024-11-09 12:51:31 -05:00
Pepper0ni 2603b97366 Rewrite MQ spirit logic (#4534) 
* rewrite MQ spirit logic

* fix oversights
 2024-11-09 09:40:00 -07:00
Pepe20129 c8815a26f7 Improve ganon tower logic (#4526) 
* Improve ganon tower logic

* Fix build and address review

* Update locacc_ganons_castle.cpp

* Update locacc_ganons_castle.cpp

* Update locacc_ganons_castle.cpp

* Update logic.cpp

* Update randomizerTypes.h

---------

Co-authored-by: Malkierian <malkierian@gmail.com>
Co-authored-by: Malkierian <malkierian@live.com>
 2024-11-09 09:34:05 -07:00
Jordan Longstaff 068cceff36 Update SFX symbols from decomp (#4531) 2024-11-08 20:36:57 -07:00
Archez 4eeb01905d pull in decomp updates for z_play (#4522) 2024-11-07 09:52:21 -07:00
Pepper0ni 1d9d273a57 Rewrite MQ Water Temple Logic (#4520) 
* Rewrite Storage Temple Logic

* fix a boss room oversight

* Fix some random errors

* cleanups
 2024-11-07 09:51:29 -07:00
Garrett Cox d07cbe8395 Adjustments to change age cheat and time travel enhancement (#4512) 2024-11-06 19:38:57 -07:00
Jordan Longstaff a919b6a5a0 Fix skipping Adult Ruto one-point cutscene (#4519) 
* Fix skipping Adult Ruto one-point cutscene

* Kill Ruto's actor instead of leaving her to swim up

* Change to Story cutscene

* Change to extern function
 2024-11-06 19:38:44 -07:00
Archez dabd0c25bd Move collision viewer draw to hook and fix empty nametags (#4523) 2024-11-05 21:50:59 -05:00
Malkierian 894d3c00d3 Change ENTR_BOMBCHU_SHOP_0 to ENTR_BOMBCHU_SHOP_1 in entrance.cpp to fix interior shuffle crash. (#4521) 2024-11-04 20:16:27 -07:00
Archez d8f8b6e6b9 Fix Bluewarp handling with entrance rando (#4517) 
* force bluewarp skips on when entrance rando is enabled

* Fix second visits and other issues with lingering bluewarp state
 2024-11-04 20:07:21 -07:00
Garrett Cox 20ac33d380 Fix #4506, Mido crash in intro cutscene with Open Forest (#4511) 2024-11-02 10:50:48 -07:00
Garrett Cox 5c98cdacde Add ganon dating sim PoC (#4510) 2024-11-02 11:38:17 -05:00
Garrett Cox 8d4adb0f50 Fix build issue (#4504) 2024-11-01 10:46:28 -05:00
Pepper0ni 0d17e72dca Rewrite MQ Shadow Temple logic (#4502) 2024-11-01 08:15:27 -07:00
Garrett Cox 563061beda Add holiday menu and various examples 2024-11-01 09:35:41 -05:00
Garrett Cox 0425539fee Let it snow 2024-11-01 09:35:41 -05:00
Archez ec1f03e8a2 Pass for some warning fixes (#4501) 2024-10-31 07:42:27 -07:00
Archez 98fa5663b4 Hookify more Entrance Rando handling (#4500) 
* Hookify more entrance rando handling

* fix bad enums
 2024-10-31 00:27:20 -04:00
Malkierian 6e024ed15d Entrance Enum and Name Refactor (#4484) 
* Rename entrance enums for clearer location by name.
Change entrance name strings to be clearer for single-entrance tracking.

* Rename grotto macros to remove "RANDO", and move them to `randomizerTypes.h` for use elsewhere.

* Add entrance enums to rando's entrance.cpp.
Rename a couple RandomizerRegions for consistency.

* Swap entrance ids to enum values in rando's entrance.cpp.
Few more renames for clarity and consistency.

* Adapt entrance tracker to utilize new names and only display original source and substituted destination.
Few more renames for consistency.

* Missed a space in the tracker output.

* Restore pre-digit names of some enums, name great fairies more consistently.
 2024-10-30 19:44:34 -07:00