3217 Commits

Author SHA1 Message Date
briaguya
09b778c5d7
pin linuxdeploy (#996)
Some checks failed
generate-builds / generate-2ship-otr (push) Has been cancelled
generate-builds / build-macos (push) Has been cancelled
generate-builds / build-linux (push) Has been cancelled
generate-builds / build-windows (push) Has been cancelled
see https://github.com/HarbourMasters/Shipwright/pull/5070
2025-02-16 04:16:35 -06:00
Garrett Cox
3d46f8de5f
Initial implementation of PresetsManager (#989)
Some checks failed
generate-builds / generate-2ship-otr (push) Has been cancelled
generate-builds / build-macos (push) Has been cancelled
generate-builds / build-linux (push) Has been cancelled
generate-builds / build-windows (push) Has been cancelled
2025-02-14 13:02:27 -06:00
Patrick12115
eec2be4122
[Minigame] Bombers Required for Hide-and-Seek (#980)
* Bombers Required

* Changed to Minigames
2025-02-14 11:24:12 -06:00
Eblo
4304508372
Only handle sword beam collision for enemies (#993)
Ensure EnClearTag light ray effects are blue when Fierce Deity
2025-02-14 11:20:00 -06:00
balloondude2
0c0527232c
Add missing flag to keep monkeys from spawning again (#995)
* add missing flag to keep monkeys from spawning again

* account for both types of monkey

* clang format
2025-02-14 11:18:55 -06:00
Archez
e3da5dcfb0
Add interpolation fixes to console logo and file chose skybox (#992)
Some checks failed
generate-builds / generate-2ship-otr (push) Has been cancelled
generate-builds / build-macos (push) Has been cancelled
generate-builds / build-linux (push) Has been cancelled
generate-builds / build-windows (push) Has been cancelled
2025-02-11 09:42:23 -05:00
Archez
365259233d
Fix Zora fin recall when carrying an item (#991)
Some checks failed
generate-builds / generate-2ship-otr (push) Has been cancelled
generate-builds / build-macos (push) Has been cancelled
generate-builds / build-linux (push) Has been cancelled
generate-builds / build-windows (push) Has been cancelled
* Fix Zora fin recall when carrying an item

* simplify hook
2025-02-09 14:08:09 -05:00
Patrick12115
f2038d42db
[TimeSaver] Fast Dampe Flame Digging (#973)
* 1flame1poe

* Simplify and fix

Simplifies code and fixes toggling on the enhancement after a fire is already revealed

* Less calling

* tweak dampe skip hooks to only run when necessary

---------

Co-authored-by: Archez <Archez@users.noreply.github.com>
2025-02-09 13:35:57 -05:00
Garrett Cox
856aa2612b
Add PreventDiveOverWater enhancement (#976)
Some checks failed
generate-builds / generate-2ship-otr (push) Has been cancelled
generate-builds / build-macos (push) Has been cancelled
generate-builds / build-linux (push) Has been cancelled
generate-builds / build-windows (push) Has been cancelled
2025-02-06 13:53:26 -06:00
Lars-Christian Selland
ac1ad42db8
macOS Game Mode Support for 2Ship2Harkinian (#811)
Some checks are pending
generate-builds / generate-2ship-otr (push) Waiting to run
generate-builds / build-macos (push) Blocked by required conditions
generate-builds / build-linux (push) Blocked by required conditions
generate-builds / build-windows (push) Blocked by required conditions
* final commit(hopefully)

* Moving directory creation logic out of LUS

* Update BenPort.cpp

* move Ternary operator one line down to keep to the clang limit

* I have no idea how clang works

* Using ChatGPT to hopefully fix the formatting because I'm tired

* ChatGPT is useless, it's brain time

* Will Putin become the next Miss America?

* I hope this works for slimming down 2s2h(Mac) as well

My builds have gotten double their original size since I started taking care of them and I feel bad about it :(

* Some final pre merge cleanup

Removed the bash script and its references

* Updated to follow Archez's new conventions

* Parity with upstream

* updated git ignore

* update git ignore again

* Re-added the folder creation function

* I should pay more attention to what I am doing

* Update mm/macosx/Info.plist.in

Co-authored-by: Archez <Archez@users.noreply.github.com>

* Update CMakeLists.txt

* desperation

* Revert "desperation"

This reverts commit 6aea78dc92b767bc5073a6e632e3955a2b9ad451.

* Update .gitignore

* does this do the trick?

* Revert "does this do the trick?"

This reverts commit 267fbfb2bbb5a6306f485c30eb335870f90318b3.

* Revert "Parity with upstream"

This reverts commit 6bfdee805e0c8b41b104e1131a7341e14259f82b.

* Update libultraship

* Revert "Update libultraship"

This reverts commit e9e07473bc5216311de92f0aeded00564079f7e7.

---------

Co-authored-by: Archez <Archez@users.noreply.github.com>
2025-02-05 13:53:29 -05:00
Archez
a36b4aa977
Fix button id conflicts on input editor (#985)
Some checks are pending
generate-builds / generate-2ship-otr (push) Waiting to run
generate-builds / build-macos (push) Blocked by required conditions
generate-builds / build-linux (push) Blocked by required conditions
generate-builds / build-windows (push) Blocked by required conditions
* Fix button id conflicts on input editor

* remove id in favor of stick enum
2025-02-04 16:23:21 -05:00
Eblo
d60627e694
Fix persistent mask bugs with Postman and moon (#979)
Some checks are pending
generate-builds / generate-2ship-otr (push) Waiting to run
generate-builds / build-macos (push) Blocked by required conditions
generate-builds / build-linux (push) Blocked by required conditions
generate-builds / build-windows (push) Blocked by required conditions
2025-02-04 11:38:15 -05:00
Archez
85747d38c6
Add safe crash handling for remote hookshot hookslide in great bay temple (#978) 2025-02-04 11:24:12 -05:00
Archez
7896a0f648
Bump LUS and OTRExporter pt.3 (#984)
* Bump LUS and OTRExporter pt.3

* Remove outdated controller disclaimer
2025-02-04 10:28:18 -05:00
Archez
eeed3ad367
Bump LUS pt.2 (#983)
Some checks are pending
generate-builds / generate-2ship-otr (push) Waiting to run
generate-builds / build-macos (push) Blocked by required conditions
generate-builds / build-linux (push) Blocked by required conditions
generate-builds / build-windows (push) Blocked by required conditions
* Bump LUS and stuff pt.2

---------

Co-authored-by: Dario <dariosamo@gmail.com>
2025-02-03 23:06:24 -05:00
Archez
63079f1cf6
Bump LUS and OTRExporter pt.1 (#982) 2025-02-03 22:34:17 -05:00
Archez
cf8f57a2c9
Fix incorrect color usage in Save Editor (#981) 2025-02-03 22:23:20 -05:00
zodiac-ill
f8d6afe5a5
Adjust CVar names for difficulty options (#977)
Some checks failed
generate-builds / generate-2ship-otr (push) Has been cancelled
generate-builds / build-macos (push) Has been cancelled
generate-builds / build-linux (push) Has been cancelled
generate-builds / build-windows (push) Has been cancelled
2025-01-31 13:09:42 -06:00
zodiac-ill
111ade85b6
[Enhancement] Add Gibdo Trade Sequence Options (#917)
* Add Gibdo Trade Sequence Options

* clang-format

* hopefully fixes clang-format?

* actually fix clang-format now

* I accidentally put the file in the wrong place somehow

* clang-format

* Relocate to difficulty options

* feedback

* Let's not relocate EnTalkGibudRequestedItem struct def

* feedback 2
2025-01-31 09:48:04 -06:00
Archez
192118f0b9
[Enhancement] Add Skip Song of Time Cutscenes (#971)
Some checks are pending
generate-builds / generate-2ship-otr (push) Waiting to run
generate-builds / build-macos (push) Blocked by required conditions
generate-builds / build-linux (push) Blocked by required conditions
generate-builds / build-windows (push) Blocked by required conditions
* skip song of time cutscenes

* cleanup better sodt respawn data
2025-01-30 16:33:49 -06:00
Garrett Cox
41ebe7ef78
Fix sizing of gGoldSkulltulaCounterIconTex load (#975)
Some checks are pending
generate-builds / generate-2ship-otr (push) Waiting to run
generate-builds / build-macos (push) Blocked by required conditions
generate-builds / build-linux (push) Blocked by required conditions
generate-builds / build-windows (push) Blocked by required conditions
2025-01-29 18:11:17 -06:00
Archez
26012da233
Add crash protection for action swap (#965)
Some checks failed
generate-builds / generate-2ship-otr (push) Has been cancelled
generate-builds / build-macos (push) Has been cancelled
generate-builds / build-linux (push) Has been cancelled
generate-builds / build-windows (push) Has been cancelled
* Add crash protection for action swap

* rename hess crash to console crash fix
apply soft reset handler to owl warp cursor
apply soft reset handler to hess crash
2025-01-27 17:56:06 -06:00
Caladius
903ba4e058
Marine Lab Fish Speed Up (#962)
* Marine Lab Fish Speed Up

* Update to Modern Menu V2

* Clang
2025-01-27 17:47:40 -06:00
Patrick12115
2aa566a116
[Minigame] Added Setting Beaver Race Rings Amount (#958)
* Added Setting Beaver Race Rings

* Clang it

* Updated for Modern Menu v2
2025-01-27 17:47:05 -06:00
Garrett Cox
810b8e8bb6
Patch incorrect TEXEL1 usage in FD GI (#972) 2025-01-27 17:45:51 -06:00
Sirius902
c247f969a8
Add missing string format specifiers (#967)
Some checks are pending
generate-builds / generate-2ship-otr (push) Waiting to run
generate-builds / build-macos (push) Blocked by required conditions
generate-builds / build-linux (push) Blocked by required conditions
generate-builds / build-windows (push) Blocked by required conditions
2025-01-26 20:59:45 -05:00
Archez
cb94159e63
Improve better song of double time experience (#963)
* Add ability to override current hud editor element mode

* Add gfx setup to 3ds clock to ensure it always renders properly

* Add check for hud override on text-based clock

* Add hooks for before/after drawing clock

* Improve better song of double time experience

* DPad input repeated on hold and show A on HUD
2025-01-26 20:34:09 -05:00
zodiac-ill
be93caa88b
Fix Persistent Mask Crash on Talking to Postman (#969)
Some checks are pending
generate-builds / generate-2ship-otr (push) Waiting to run
generate-builds / build-macos (push) Blocked by required conditions
generate-builds / build-linux (push) Blocked by required conditions
generate-builds / build-windows (push) Blocked by required conditions
* Fix persistent mask crash on talking to postman

* feedback
2025-01-26 17:52:23 -05:00
Garrett Cox
74cccd0489
Tweak infinite deku hops to stop velocity loss while in the air (#956)
Some checks failed
generate-builds / generate-2ship-otr (push) Has been cancelled
generate-builds / build-macos (push) Has been cancelled
generate-builds / build-linux (push) Has been cancelled
generate-builds / build-windows (push) Has been cancelled
2025-01-25 09:34:41 -06:00
Garrett Cox
97ce989ca3
Restore ability to spam B to swim faster from OoT (#955) 2025-01-25 09:32:46 -06:00
Archez
9d5e05b32c
Adds ability to skip the boot logo quickly upon button press (#947) 2025-01-25 09:06:40 -06:00
Archez
8b7513c47b
Remove caching from CVar prefix defines (#966)
Some checks are pending
generate-builds / generate-2ship-otr (push) Waiting to run
generate-builds / build-macos (push) Blocked by required conditions
generate-builds / build-linux (push) Blocked by required conditions
generate-builds / build-windows (push) Blocked by required conditions
2025-01-24 15:04:04 -05:00
balloondude2
972da786a3
Convert express mail to shipinit (#949) 2025-01-24 13:42:36 -05:00
Malkierian
41ea4a6017
Modern menu v2 (#948)
Some checks are pending
generate-builds / generate-2ship-otr (push) Waiting to run
generate-builds / build-macos (push) Blocked by required conditions
generate-builds / build-linux (push) Blocked by required conditions
generate-builds / build-windows (push) Blocked by required conditions
* Axe `SearchableMenuItems.h`, moving things to `Menu.cpp` or `Menu.h` as necessary.
Add `MenuTypes.h` for enums, structs, etc, for easy inclusion.
Change `BenMenu` to `Menu`, and move to `Ship::` namespace rather than `BenGui::`.

* Implement `BenMenu` extension of `Menu`, moving all port-specific code to `BenMenu`.
`MenuTypes.h` and `Menu.h` should now be safe to include in multiple places.
Window backend dropdown removed from menubar (maybe temporarily?).

* Convert widgetInfo and widget draws to utilize UIWidgets Options structs.

* Clean up default widget options.
Add more colors, and add some of them to the menu theme dropdown.
Convert widget options to use new Color enum instead of storing `ImVec4`s internally.

* Fix a couple options type mismatches.
Group option types together in the header.

* Create `AddWidget` widget builder for dev experience clarity.
Convert all existing widgets to the builder flow.

* Unify search results displays.
Restore tooltip functionality.

* Rename `widgetInfo` to `WidgetInfo`.

* WidgetOptions base struct implemented, shared_ptr stored on WidgetInfo.
Move tooltip to WidgetOptions.
WidgetOptions and derived structs now implement the builder flow.
Rename UIWidgets::Color to Colors, Colors to ColorValues.
Re-enable all menu widgets.

* Fully nix the menubar entries.
Add new menubar entry to explain that the settings are in the new menu and give hotkey to open it.

* Address reviews.
Tweak colors.
Add WrappedText to Checkboxes as test case.

* Implement function to add MainMenuEntry remotely.
Implement widget with custom draw function calling.
Partially implement Advanced Resolution, using external widget registration and custom widget functionality.
Add some AR CVars to disableMap for use with IR slider.

* clang

* More reviews, comment AR stuff to keep it from displaying in the menu for now.

* Better header define formatting.
Change FloatSliderOptions builder arguments from int32 to float.

* Fix default menu theme references.
Harden sidebar search insertion and removal against index out of bounds issues.

* Change top search clear to trigger on header or sidebar change regardless of autofocus option.

* Change top bar search background to 20% opacity of menu theme color to increase visibility.

* Fix all unthemed widget default colors.
Missed menu theme CVar change.

* :squint:

* *raises hands as though holding a ball* Colors

---------

Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
2025-01-24 00:01:46 -05:00
Archez
8caeb4b668
Fix Persistent Bunny Hood losing color with other masks (#961)
Some checks failed
generate-builds / generate-2ship-otr (push) Has been cancelled
generate-builds / build-macos (push) Has been cancelled
generate-builds / build-linux (push) Has been cancelled
generate-builds / build-windows (push) Has been cancelled
* Fix persistent bunny hood losing color with other masks

* add fix to prevent applying persistent bunnyhood to kafei
2025-01-20 17:38:51 -05:00
Archez
cd8da0f334
Fix interpolation on chu revive animation (#959)
Some checks are pending
generate-builds / generate-2ship-otr (push) Waiting to run
generate-builds / build-macos (push) Blocked by required conditions
generate-builds / build-linux (push) Blocked by required conditions
generate-builds / build-windows (push) Blocked by required conditions
2025-01-20 13:56:02 -06:00
Archez
5200487643
Fix snowhead snowball being placed out of bounds (#950)
Some checks failed
generate-builds / generate-2ship-otr (push) Has been cancelled
generate-builds / build-macos (push) Has been cancelled
generate-builds / build-linux (push) Has been cancelled
generate-builds / build-windows (push) Has been cancelled
2025-01-16 20:05:14 -06:00
Garrett Cox
65952cb6fe
Add restoration for pause buffer input window (#951) 2025-01-16 19:30:34 -06:00
Garrett Cox
3eb915c1e9
Ensure Constant Distance restoration only affects sidehops & backflips (#953) 2025-01-16 19:30:06 -06:00
Archez
a545621c4a
Fix twinmold giant scale factor not clearing on reset (#954) 2025-01-16 19:22:38 -06:00
balloondude2
a7fbf3003e
Convert End of Cycle enhancements to ShipInit (#945)
Some checks failed
generate-builds / generate-2ship-otr (push) Has been cancelled
generate-builds / build-macos (push) Has been cancelled
generate-builds / build-linux (push) Has been cancelled
generate-builds / build-windows (push) Has been cancelled
* convert end of cycle hooks to ship init

* fix sot cs ammo drops

* remove unneeded stuff
2025-01-14 18:38:51 -05:00
Caladius
7313cc1a49
[Cosmetic Editor] Implements Initial Cosmetic Editor (#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 <archez39@me.com>
2025-01-14 14:19:51 -06:00
Garrett Cox
e37c03a7e0
Add infinite deku hop (#940)
Some checks failed
generate-builds / generate-2ship-otr (push) Has been cancelled
generate-builds / build-macos (push) Has been cancelled
generate-builds / build-linux (push) Has been cancelled
generate-builds / build-windows (push) Has been cancelled
2025-01-12 23:08:18 -06:00
aMannus
8c60b05847
Goron Rolling Enhancements (#942)
* Goron rolling enhancements

* Clang pls

* CLANG!?

* OK clang you wanna talk about this?
2025-01-12 22:49:59 -06:00
Garrett Cox
ba2534bd0c
Fix ocarina inputs being dropped at the start of playback (#941)
* Fix ocarina inputs being dropped at the start of playback

* Port dropped ocarina inputs patch from Recomp
2025-01-12 22:45:33 -06:00
zodiac-ill
15bee7f2bc
Add default value to Right Stick Invert Y (#943) 2025-01-12 22:45:21 -06:00
Garrett Cox
8b5ee5a94a
Port difficulty options from SoH (#938)
Some checks failed
generate-builds / generate-2ship-otr (push) Has been cancelled
generate-builds / build-macos (push) Has been cancelled
generate-builds / build-linux (push) Has been cancelled
generate-builds / build-windows (push) Has been cancelled
2025-01-11 09:51:57 -06:00
zodiac-ill
5c3a0a703e
Prevent Faster Song Playback During Cutscenes (#936)
Some checks are pending
generate-builds / generate-2ship-otr (push) Waiting to run
generate-builds / build-macos (push) Blocked by required conditions
generate-builds / build-linux (push) Blocked by required conditions
generate-builds / build-windows (push) Blocked by required conditions
* Prevent Faster Song Playback During Cutscenes

* Fix toto balad edge case
2025-01-11 00:32:57 -05:00
Archez
b3cdc423ba
[Enhancement]: Add File Slot 3 (#900)
Some checks failed
generate-builds / generate-2ship-otr (push) Has been cancelled
generate-builds / build-macos (push) Has been cancelled
generate-builds / build-linux (push) Has been cancelled
generate-builds / build-windows (push) Has been cancelled
* [Enhancement]: File Slot 3

* Log out save file imports and reset file select state
2025-01-09 16:54:18 -05:00
Garrett Cox
39746e6a25
Add simulated input lag option and a blurb about the bindings window (#934)
Some checks are pending
generate-builds / generate-2ship-otr (push) Waiting to run
generate-builds / build-macos (push) Blocked by required conditions
generate-builds / build-linux (push) Blocked by required conditions
generate-builds / build-windows (push) Blocked by required conditions
2025-01-08 21:12:19 -06:00