github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-20 05:13:39 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions
2544 commits 4 branches 44 tags 177 MiB
Commit graph

2544 commits

This branch
This branch
All branches
Author SHA1 Message Date
Pepper0ni
7f4bd3e98c
 		Fix any dungeon location pool and fire boss door logic (#4480) 
* fix any dungeon location pool and fire boss door logic

* Make GetDungeonLocations consistent

* add All to name
 2024-10-25 17:51:50 -07:00
Pepper0ni
6ca55aadbd
 		Rewrite MQ Ganon's castle logic (#4469) 
* rewrite ganon MQ logic

* typo fix

* remove excess brackets to avoid compiler errors
 2024-10-25 17:51:07 -07:00
Pepe20129
a91243ec01
 		Fix msvc internal compiler errors on mq logic (#4478) 2024-10-25 20:19:01 +09:00
Malkierian
89fe9c1ccb
 		Fix Phantom Ganon fast death time saver crash. (#4476) 2024-10-24 21:55:17 -07:00
Pepper0ni
8638810b9d
 		Fix bean buy and warp song text crashes (#4470) 2024-10-23 17:34:44 -07:00
Malkierian
2ffd62a5b1
 		Fix scrubs behaving as if shuffled despite not being. (#4468) 
Convert shop tracking to checking for shuffled.
Change "Hide right-side shop item checks" to "Hide unshuffled shop item checks" on the check tracker.
 2024-10-23 08:35:25 -07:00
Caladius
75a0979bc7
 		Built-in Time Splits [v2.1] (#4455) 
* Adds 2 new Hooks, OnTimeStamp and OnPlayerHealthChange.

* Re-add Timesplit code

* Committing custom Assets

* Commit Asset definitions

* Adding Windows

* Fix Modal Window and others

* Time Splits v2 new Hooks etc.

* Fixing Time Displays

* Adding Big Poe split

* Update Options Tab

* List Preview and Removing Split Entries

* Allow Split Table to resize

* Fix Window Color and Adding Non Items to Split List

* Correct Song Image Skew
 2024-10-22 10:17:30 -07:00
Malkierian
8c304d54b2
 		Fix wallet display for More Info with non-rando saves. (#4467) 2024-10-22 10:10:50 -07:00
Malkierian
dee885622e
 		Add InjectItemCounts to the migrator. (#4466) 2024-10-22 09:46:50 -07:00
Pepper0ni
a005075bd2
 		Fix Settings Loading Issues (#4465) 2024-10-22 08:50:05 -07:00
Pepper0ni
dd9253808b
 		Rewrite forest MQ logic, add swim to lake logic (#4464) 
* rewrite forest logic, add swim to lake logic

* fix small oops

* oops
 2024-10-21 19:18:50 -07:00
Jordan Longstaff
3a4bd1164a
 		Add freeze timer hook for Gold Skulltula collection (#4445) 
* Add freeze timer hook for Gold Skulltula collection

* Remove unused player references

* Replace magic number text IDs

* Separate hook for freezing player on token collection

* Revert one unintended change
 2024-10-21 19:18:34 -07:00
Malkierian
17d8487730
 		Modify all (4) instances of Flags_GetRandomizerInf() returns that were u8 to s32 to avoid value overflow. (#4463) 2024-10-21 14:55:46 -07:00
Garrett Cox
92c791b7c0 Add simple notifications system 2024-10-21 13:20:33 +00:00
Malkierian
4663bd152a
 		VBify poe collector giving for rando. (#4458) 
* VBify poe collector giving for rando.

* Forgot an include.

* Further refinement so all the action happens in the handler. Virtual full restoration of vanilla code flow.

* Restored 1000 point messages before rando item give.

* Cleanup redundant GI Should call.
 2024-10-20 23:49:32 -07:00
Jordan Longstaff
b2e99b8ff5
 		Zora's River waterfall opens instantly (#4454) 
* Zora's River waterfall opens instantly

* VB cleanup

* Move it all to VB hook

* Fix build errors

* Null safety
 2024-10-20 23:36:47 -07:00
Garrett Cox
df6763257b Refactor network usage and adapt Sail/CC to changes 2024-10-21 01:30:32 +00:00
Garrett Cox
29d7c54250 Move CrowdControl/Sail files 2024-10-21 01:30:32 +00:00
Malkierian
6d1d57d19a
 		Restores check color functionality. (#4451) 2024-10-20 01:03:47 -07:00
Pepper0ni
323c67b47c
 		Change CanUse to include an assert, fix some bad uses of CanUse (#4444) 2024-10-20 01:03:09 -07:00
Pepper0ni
81db6e3996
 		refix loach check (#4448) 2024-10-20 01:00:54 -07:00
Jordan Longstaff
c644f9f4be
 		Restore plus/minus buttons on King Zora slider (#4449) 2024-10-20 01:00:46 -07:00
Pepper0ni
ba38d985b3
 		Rewrite MQ fire logic and fix MQ deku logic (#4443) 
* commit to merge

* rewrite fire and fix deku
 2024-10-20 01:00:39 -07:00
Garrett Cox
cbd35d0ef5
 		Tweaks to cmake globbing/source_grouping (#4439) 2024-10-18 09:35:07 -07:00
Malkierian
a7cb7da9fc
 		Change SoH Input Editor CVar to CVAR_WINDOW and remove definition for LUS's input editor CVar from the cmake. (#4438) 2024-10-17 22:06:43 -07:00
Malkierian
7e78abf01c
 		Restore tooltip to skip text, add tooltips to slow text speed and match text speed. (#4437) 2024-10-17 22:03:13 -07:00
Archez
f1841a20f3
 		add gfx debugger support (#4345) 
Co-authored-by: Malkierian <malkierian@gmail.com>
 2024-10-17 19:05:31 -07:00
Patrick12115
ed32a2820c
 		Ageless Item Fixes (#3908) 
* Fixes Mirror Shield and MS sheath

* Added Hookshot Tip&Chain and more edge cases

* Update presets.h

* Revert "Update presets.h"

This reverts commit 95d952ba23.

* More fixes

Bow showing up for slingshot gallery minigame is now fixed, as well as a rouge instance shrinking links hand when I didn't mean for it to

* CVar stuffs

* Fixes

* Fix more sheath stuff and bgs hand

* Add the P
 2024-10-17 18:42:14 -07:00
Malkierian
5a23da4ce0
 		Make ConfigUpdaterV2 use CVarClearBlock instead of manually scanning. (#4435) 2024-10-17 18:41:38 -07:00
Malkierian
dba74f8805
 		Disable Lens Effect On Unequip (#4432) 
* Add logic to turn off lens effect when replacing it on a button with another item, but not swapping.

* Swap to real fix for dpad equips bug, c/o Rozelette.
 2024-10-17 14:36:53 -07:00
Pepe20129
b5c6545d6f
 		z_player documentation 2024-10-11 (#4407) 
* Add names to start of typedefs

* Idle stuff

* 2 functions

* Player state flags

* Name functions + misc

* ActionChange => ActionHandler

* Some player unks

* More player unks

* Header misc

* Misc

* More misc

* Player Actions

* Missed comments

* Move ship specific stuff

* Fix build

* CsCmdActorAction to CsCmdActorCue

* Fix build
 2024-10-17 11:55:31 -07:00
Malkierian
3c5d9faba3
 		Blair Config Migrator V3 (#4148) 
* Config migrator to handle CVar macros/sections, as well as a few other changes since MacReady.

* One more round of cleanup.

* Move config migrators above SetupGuiElements to allow for migrated window variables to register before windows use them to determine visibility.

* One more.

* Adapt DpadEquips, NavOnL, and PauseAnyCursor CVars to accommodate Pablo moving them to enhancements.
 2024-10-16 21:58:31 -07:00
Malkierian
b7bbb1bb8a
 		Make starting_inventory.cpp add the Master Sword based on RSK_STARTING_MASTER_SWORD. (#4431) 2024-10-16 21:54:55 -07:00
Malkierian
469797478e
 		Force global rando context's Logic child to release its parent Context reference. (#4429) 2024-10-16 20:52:36 -07:00
Jordan Longstaff
52d1a98f41
 		Add "All" button for item count messages (#4430) 2024-10-16 20:52:23 -07:00
Jordan Longstaff
c1295f33fe
 		Unify "No forced dialog" settings in combo box (#4425) 
* Unify "No forced dialog" settings in combo box

* Rename options
 2024-10-16 19:45:51 -07:00
Malkierian
e178df3e0c
 		Change SkipIntro to check any entrance shuffle rather than just overworld spawns. (#4428) 2024-10-16 16:39:35 -07:00
Malkierian
262ec4817b
 		Re-sync deku stick cheat CVar name. (#4427) 2024-10-16 15:54:55 -07:00
Jordan Longstaff
b3ce27efed
 		Add separate speed option for slower text (#4424) 2024-10-16 15:32:56 -07:00
Jordan Longstaff
dcd26b2de8
 		Segregate count-injected item get messages by type (#4422) 
* Segregate count-injected item get messages by type

* Move item count messages submenu up next to Items submenu

* Rectify presets

* Oops - deleted a comma by mistake
 2024-10-16 14:18:24 -07:00
Pepper0ni
43b04a32cd
 		rewrite MQ deku tree logic (#4418) 2024-10-16 14:16:58 -07:00
Jordan Longstaff
da79e5e015
 		Fix fast speed skipping quick text markers (#4416) 2024-10-15 20:50:10 -07:00
Malkierian
45af1028af
 		Fix options and sliders to prevent index out of range issues. (#4421) 2024-10-15 17:59:20 -07:00
Jordan Longstaff
960c9c4fd1
 		Fix heart piece injection messages to cover all counts (#4417) 2024-10-15 17:03:36 -07:00
MegaMech
90c07bb3ec
 		Update BUILDING.md (#4415) 2024-10-15 10:05:31 -07:00
Malkierian
eb7f12560b
 		MVP to get shops hooked up to the queue. (#4412) 2024-10-15 08:31:16 -07:00
Garrett Cox
eafe15ddf2
 		Fix bean salesman bug (#4410) 2024-10-14 19:11:33 -07:00
Pepper0ni
4dbb86e980
 		fix some bean salesman oversights (#4405) 2024-10-14 16:02:46 -07:00
Pepper0ni
a9df9cbce4
 		Rewrite Bottom of the Well Logic (#4398) 
* rewrite MQ botw and add some helper functions

* small fixes

* got bored, rewrote vanilla botw
 2024-10-14 16:01:37 -07:00
Yomitht
86ad99f3c8
 		More Mweep (#4192) 
* More Mweep

Adjusted the "King Zora Speed" timesaver enhancement to allow for slowing the animation down.

* [Fixed] Crashing when applying preset settings

Adjusted presets.h to expect a float instead of an integer for the "MweepSpeed" timesaver enhancement setting.

* Cleaning some things up

Deleted an unnecessary line, and switched the "King Zora Speed" option back to multiplier display instead of a percentage.

* Update SohMenuBar.cpp

Switched back to multiplier display

---------

Co-authored-by: Malkierian <malkierian@gmail.com>
 2024-10-14 16:01:18 -07:00