Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Arrow Cycle C-Right Fix #927

Merged
merged 1 commit into from
Jan 7, 2025

Conversation

mckinlee
Copy link
Contributor

@mckinlee mckinlee commented Jan 7, 2025

Fix for issue #925

Build Artifacts

@garrettjoecox garrettjoecox merged commit 5d514ef into HarbourMasters:develop Jan 7, 2025
5 checks passed
Malkierian pushed a commit to Malkierian/2ship2harkinian that referenced this pull request Jan 23, 2025
* Allow Better SoDT to work on Night of the Final Day (HarbourMasters#913)

* Allow Better SoDT to work on Night of Final Day

* -1 newline

* lol oops

* change SoDT VB name to be more descriptive

* see if this fixes clang-format

* Inline vanilla conditional with GI Should call

* clang-format

* *long exacerbated sigh*

* [Enhancement] Skip owl interactions (HarbourMasters#920)

* Add enhancement to skip owl interactions

* Use should hook for the owl shrine conversation

* Tweak persistent bunny hood to only hide in first person for deku (HarbourMasters#924)

* Minigame options for Archery & H&D (HarbourMasters#923)

* [Timesaver] Faster Swamp Boat (HarbourMasters#918)

* vroom vroom

* fix some oversights

* feedback update

Co-Authored-By: Garrett Cox <[email protected]>

---------

Co-authored-by: Garrett Cox <[email protected]>

* Skip Monkey Encounter (HarbourMasters#921)

* go away monkies

* feedback update

Co-Authored-By: Garrett Cox <[email protected]>

---------

Co-authored-by: Garrett Cox <[email protected]>

* [Enhancement] Cycle Arrows (HarbourMasters#901)

* initial implementation

* update tooltip

* clang format

* Fix linux?

* how bout now?

* pain

* ...

* linux fix

Co-Authored-By: sitton76 <[email protected]>

* clang format

* add sfx, requirements, cooldown, etc.

* clang format

* bug fix and remove unneeded logic

* bug fix for the bug fix lol

* add auto cycling when out of magic and visual/sfx indicators

* forgot about clang format as usual

* forgot about that while refactoring

* le sigh

* Feedback Changes and Refactor

Co-Authored-By: Archez <[email protected]>

* remove VB_MAGIC_ARROW_CONSUME

* add more restrictions

* Update mm/2s2h/Enhancements/Equipment/ArrowCycle.cpp

Co-authored-by: Garrett Cox <[email protected]>

---------

Co-authored-by: sitton76 <[email protected]>
Co-authored-by: Archez <[email protected]>
Co-authored-by: Garrett Cox <[email protected]>

* Set Sample rate to 32 Khz (HarbourMasters#916)

* Set Sample rate to 32 Khz

* format

* review

* Update mm/2s2h/BenPort.cpp

---------

Co-authored-by: Garrett Cox <[email protected]>

* Refactor the monkey skip to fix some issues (HarbourMasters#926)

* fix c-right (HarbourMasters#927)

* Allow reset when in any game state (HarbourMasters#929)

* Cleanup so things around the save manager (HarbourMasters#930)

* Proper fix to masks showing in first person, and apply it to hyrule warriors enhancement (HarbourMasters#931)

* Add EasyFrameAdvance cheat (HarbourMasters#932)

* Add enums for sram and save file magic values (HarbourMasters#933)

* Add simulated input lag option and a blurb about the bindings window (HarbourMasters#934)

* [Enhancement]: Add File Slot 3 (HarbourMasters#900)

* [Enhancement]: File Slot 3

* Log out save file imports and reset file select state

* Prevent Faster Song Playback During Cutscenes (HarbourMasters#936)

* Prevent Faster Song Playback During Cutscenes

* Fix toto balad edge case

* Port difficulty options from SoH (HarbourMasters#938)

* Add default value to Right Stick Invert Y (HarbourMasters#943)

* Fix ocarina inputs being dropped at the start of playback (HarbourMasters#941)

* Fix ocarina inputs being dropped at the start of playback

* Port dropped ocarina inputs patch from Recomp

* Goron Rolling Enhancements (HarbourMasters#942)

* Goron rolling enhancements

* Clang pls

* CLANG!?

* OK clang you wanna talk about this?

* Add infinite deku hop (HarbourMasters#940)

* [Cosmetic Editor] Implements Initial Cosmetic Editor (HarbourMasters#886)

* Initial Cosmetic Editor Commit

* Adds Reset All and Randomize All Options

* Cleanup Work

* Prefixed sModifiedColor

* Replace button modifications with pattern similar to the others.

* Cleanup, forgot some entries

* update funcs to pass element id

* drop with from override funcs

* update include paths

* add minimap and rename items to hud

---------

Co-authored-by: Archez <[email protected]>

* Convert End of Cycle enhancements to ShipInit (HarbourMasters#945)

* convert end of cycle hooks to ship init

* fix sot cs ammo drops

* remove unneeded stuff

* Fix twinmold giant scale factor not clearing on reset (HarbourMasters#954)

* Ensure Constant Distance restoration only affects sidehops & backflips (HarbourMasters#953)

* Add restoration for pause buffer input window (HarbourMasters#951)

* Fix snowhead snowball being placed out of bounds (HarbourMasters#950)

* Fix interpolation on chu revive animation (HarbourMasters#959)

* Fix Persistent Bunny Hood losing color with other masks (HarbourMasters#961)

* Fix persistent bunny hood losing color with other masks

* add fix to prevent applying persistent bunnyhood to kafei

---------

Co-authored-by: zodiac-ill <[email protected]>
Co-authored-by: Eblo <[email protected]>
Co-authored-by: mckinlee <[email protected]>
Co-authored-by: sitton76 <[email protected]>
Co-authored-by: Archez <[email protected]>
Co-authored-by: Alejandro Asenjo Nitti <[email protected]>
Co-authored-by: aMannus <[email protected]>
Co-authored-by: Caladius <[email protected]>
Co-authored-by: Archez <[email protected]>
Co-authored-by: balloondude2 <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants