| Age | Commit message (Collapse) | Author |
|---|
|
* bump lus to port-maintenance
* clang
* remove redundant cast
* clang again
* update lus commit
|
|
(#1709)
* Port Extraction Flow, ImGui scaling, file perms
* Remove obsolete F1 menu message
|
|
|
|
|
|
- Moved to cheats menu (removed from controller menu)
- Added BtnSelector UIWidget
- On controller menu pressed inputs will now darken to indicate they are pressed
- Simplified Movement speed cheat, combined swim & walk speed and just made it one modifier instead of two
|
|
SoH. (#1344)
* Reorganized the Menu "Reset","Quit 2S2H , and "Closed Menu" buttons
Place in the same order as it is in SoH "Quit, Reset, and Close Menu" on
the right.
* Ported "SohModals" from SoH and Renamed it to "BenModals
* When the "Quit" Button is pressed it will pop up a message asking the
Player "Are you sure you want to quit 2S2H?". with two buttons
"Quit" and "Cancel" like how it is done in SoH.
* Cleaned up unneeded "includes" in "BenModals.h" and "BenModals.cpp"
Removed "extern "C" PlayState* gPlayState;" from "BenModals.cpp"
it wasn't used for anything.
---------
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
|
|
* Ported Audio Options from SoH Audio Editor
*Moved "Mute Low HP Alarm" to Audio Editor -> Audio Options
Changed Cvar
From: "gEnhancements.Sfx.LowHpAlarm"
To: "gAudioEditor.LowHpAlarm"
*Moved "Mute Carpenter Sounds" to Audio Editor -> Audio Options
Changed Cvar
From: "gEnhancements.Sfx.MuteCarpenterSfx"
To: "gAudioEditor.MuteCarpenterSfx"
*Moved "Mute Crying Goron Child" to Audio Editor -> Audio Options
Changed Cvar
From: "gEnhancements.Sfx.ChildGoronCry"
To: "gAudioEditor.ChildGoronCry"
*Added "Disable Tatle Call Audio"
*Added "Disable Enemy Proximity Music"
*Added "Randomize All Music and Sound Effects on New Scene"
*Added "Randomize All Music and Sound Effects on Randomizer Generation"
*Added "Display Sequence Name on Overlay" and "Overlay Duration" Slider
*Added "Link's Voice Pitch Multiplier" Slider
* *Ported "AddSearchWidget" Functionally
Enabled for Audio Editor -> Audio Options
* Cleaned up some code I missed and ran clang format.
* Renamed "OnScene" Hook to "OnSceneChange"
* Made it so "Link's Voice Pitch Multiplier" slider only effects Link's voice.
* Forgot the "AudioHook.cpp" file its needed for the
"Display Sequence Name on Overlay" option.
* Moved the "Sfx" folder to the "Audio" folder.
* Removed extra line breaks between sections in "RegisterAudioWidgets()".
* Renamed "OnGenerationCompletion" hook to "OnRandoSeedGeneration"
* Changed "gAudioEditor.*" to use "CVAR_AUDIO("*") in "AudioEditor.cpp"
* Added "AddAudioSearchWidget" function
Changed all "BenGui::mBenMenu->AddSearchWidget lines to use
"AddAudioSearchWidget".
* Changed the "OnSeqPlayerInit" hook parameters type to use the "s32" Macro.
* Update BenMenu/BenGui include paths: Replaced "../../" with "2s2h/".
* Ran Clang Format.
* Added "DisableEnemyProximityMusic.cpp"
Added "VB_PLAY_ENEMY_PROXIMITY_MUSIC" enum to "GIVanillaBehavior" in
"GameInteractor.h"
"Audio_UpdateEnemyBgmVolume" is now wrapped in a "GameInteractor_Should"
* Added "DisableTatlCallAudio.cpp"
Added "VB_PLAY_TATL_CALL_AUDIO" enum to "GIVanillaBehavior" in
"GameInteractor.h"
"Audio_PlaySfx(NA_SE_VO_NAVY_CALL)" is now wrapped in a "GameInteractor_Should"
* Added "LinksVoicePitchMultiplier.cpp"
Added "Enable Link's Voice Pitch Multiplier" checkbox to Audio Editor
The "Link's Voice Pitch Multiplier" slider is now disabled when
"Enable Link's Voice Pitch Multiplier" is not enabled.
Added "VB_LINK_VOICE_PITCH_MULTIPLIER" enum to "GIVanillaBehavior" in
"GameInteractor.h"
"AudioSfx_PlaySfx" in the file "z_actor.c" in function "Player_PlaySfx"
is now wrapped in a "GameInteractor_Should".
* Removed "OnSceneChange" Hook.
Removed "GameInteractor_ExecuteOnSceneChange".
Removed "GameInteractor_ExecuteOnSceneChange(play->sceneId);" from
"z_play_2SH.cpp:OTRPlay_SpawnScene" function
Renamed "AudioEditorRegisterOnSceneChangeHook" to
AudioEditorRegisterOnRoomInitHook".
* Made Changes requested by Eblo to "LinksVoicePitchMultiplier.cpp" and
"z_actor.c"
* WIP Randomize On New Scene
|
|
* Bump LUS and OTRExporter, add null audio backend
* Missed an include change
* And again
* Thanks macOS
* Another one
* Bump LUS again, fixing SDL audio backend bug
* Sync LUS bump changes to merged PRs
* Bump LUS again
* Update CMakeLists.txt includes
|
|
|
|
* Port advanced resolution editor from SoH
Port N64 Mode from SoH
Port increased menu resolution from SoH
* Port the rest of UIWidgets from SoH
Apply clang format to UIWidgets.hpp
* Fix the Show Horizontal Resolution Field option
* Remove redundant assignment
* Remove redundant reset button, fix flag checkboxes
* Remove unused InsertHelpHoverText
|
|
* Add vector support to comboboxes
* Move vectors out of header
* Format
* Use variant
---------
Co-authored-by: balloondude2 <55861555+balloondude2@users.noreply.github.com>
|
|
* LUS update
* Commit backend refactor
* Cleanup tinyxml includes
* Add LUS again
* Rebase LUS
* LUS bump
* Point to LUS main
* Fix metal
* Bump LUS to test
* Chagnes for removed cvar dropped file
|
|
* MenuEntries now uses unordered_map for storage, and vector for draw order.
AddMenuEntry is now used for main menu entries (settings, enhancements, etc).
MenuInit (based off of ShipInit) added to be able to register update and init functions (init can handle widgets, new sidebars in existing menu entries, or entirely new menu entries).
Fixed top search modification to headerWidth to restore proper scrollbar functionality.
Advanced resolution options now use MenuInit to handle update and init (options still hidden in push because of framebuffer issues).
* Don't need `protected:` in BenMenu.h anymore.
* Fix header define typo.
* Fix search aggregation (was only checking first column).
* Harden index OOB for header and sidebar indices.
* Fix fullscreen checkbox.
Make slider clamping opt-out.
* Fix merge issues and change rando registration to MenuInit.
* Bit of header cleanup.
* Resolve merge errors.
* Fix LUS ref
* clang
|
|
* Cleanup
* Format
* Fixes
* Update macports-deps.txt
* Fix mac
* Update macports-deps.txt
Co-authored-by: Archez <Archez@users.noreply.github.com>
* Move includes around
---------
Co-authored-by: Archez <Archez@users.noreply.github.com>
|
|
|
|
* 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>
|
|
* 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>
|
|
|
|
* Fix crashing with modern menu and UIWidgets when null is passed for tooltips
* move to shiputils
|
|
|
|
|
|
|
|
* Start the framework.
* Start header bar.
* Header buttons now toggle. Sections show accordingly.
Basic audio section done. Needs subdividing for sane widget widths.
* Add fonts and multiple sizes.
Add graphics settings to menu.
* Finalized fonts, more sizes.
* Modularized the menu structure. Has an errant EndChild somewhere.
* Finished first step modularization.
Parameterized menu height.
* Some adaptive menu size.
* Moved all enhancements over and organized.
Tried to add button option for sidebar entries.
* Finished Enhancements Menu.
Sidebar window button still broken (can't reference window variables properly, not drawing in the right place).
* Developer Tools header started.
Menu now pops out with a checkbox in Developer Tools.
Menu sizing works for smaller game sizes.
Popout docking disabled.
Port bool added for disallowing popout regardless of cvar.
* Better auto-sizing. Columns collapse to 1 below 800 window width, and scroll.
* Move inside of HudEditorWindow::DrawElement to DrawContents, and call DrawContents from DrawElement.
* Menu resizability complete.
Menu popout complete.
Menu popout position/size is retained when popped in.
Apply HUD editor changes, draw contents in menu if window is closed.
All child sizes properly calculated.
SidebarEntry drawing separated into its own custom element.
* Split header entries into separate widget.
Header now dynamically sized and shows scrollbar when necessary.
* Modify EventLog to be drawable with the DrawContents setup.
Prevent menu from covering other windows (always in back).
* Add reset, close menu, and quit buttons to the header.
* Fix reset and quit button placement.
* Swap Actor Viewer, Collision Viewer, Save Editor to DrawContents concept.
Change reset icon to FA_ICON_UNDO (single arrow) and quit icon to FA_ICON_POWER_OFF.
Add button to close menu button tooltip, add parentheses to button for reset tooltip.
* Custom InputEditorWindow to work with menu.
Fix LUS references in Menu.cpp for Window backend changes.
Implement gamepad navigation and forced cursor visibility checkboxes.
Toggle cursor visibility according to menu status and forced visibility CVar.
* clang-format
* Swap std for fmt (runner build error).
Ensure cursor visibility is restored if started in full screen with the menu open.
* Oops, still had #include <format>
* Swap to LUS GetMenu() functionality.
Add option to hide "F1 to open enhancements menu" text at startup if menus aren't open.
* Remove last vestiges of pre-LUS-menu functionality.
* cleanup
* Adapt to GuiElement, GuiWindow changes on the menu support PR.
* LUS PR bump.
Adapt to cursor visibility changes in LUS.
Adapt to menu toggle changes in LUS.
Fix input editor not hiding in menu when popped out.
* Add new enhancements and cheats to Modern Menu from rebase.
* clang
* Apply Graphics Menu Lag Fix to Menu structure.
* Remove unnecessary window children to simplify controller navigation.
* clang
* Add `UpdateWindowBackendObjects()` call to backend combobox.
* Rebase to latest develop. Remove redundant window backend stuff that exists now in BenMenuBar.
* Search Enhancement (#2)
* 90% complete, Commit for review.
* Updated remaining Menu Entries, Reverted Backends and other Window Buttons for now.
Motion Blur copied to Search Menu.
* Did I mention I dislike this clang thing? lol
* Updating MotionBlur options and reverting soem things.
* Integrates .disabled and .disabledTooltip to the constructors. Allows for multiple qualifications to be checked against for disabling widgets and for setting the tooltip accordingly.
* Updated Disabled Reasoning
* Better Disabled State registration system
* Clean up from testing
* Expand WidgetOptions to be able to handle string and float values. bool and uint32_t are handled through int32_t.
Numerous renames.
Added several data structures to allow for dynamic updating of CVars for DisableOptions, as well as dynamic evaluation of status with enumerated conditions (less than, greater than, equal to).
Added menuThemeIndex variable to store state of menu theme selection instead of having all the individual calls to CVarGetInteger for it. Updated once per frame.
* Changed color vector to map with enum as key and UIWidget::Colors as the value.
More renames.
Moved float slider values into case block.
* Add Color_RGB8 and Color_RGBA8 to CVarVariant in preparation for adding color widgets to menu item system.
Not happy it required comparison operator overrides, but it is what it is.
* Changed disable conditions to lambdas.
* Convert Stats and Collision Viewer to menu item system.
Swap out DisableOption vector for activeDisables and a lambda function for evaluating disabled and hidden. Set the precedent to still use the DisableInfo system.
* Add DisableOption for both camera settings being off.
Put Debug Camera in Free Look column, disable common widgets for both cameras, hide widgets specific to either if off.
* Moved more widgets to MenuItem system. Some need proper initialization routines because of Ship::Context references.
* Convert menu items to nested vector setup.
Remove MenuItem enum.
Add menu item location display to search results.
* Partial removal of SidebarEntryIndex enum.
* Finish removing SidebarEntryIndex.
Rework drawing code to handle the change back to direct vector access.
Add tooltips to search.
* Fix Graphics enhancements section title.
* Copy added menu items to modern menu system.
* clang
* Add some documentation for the menu system components.
* Revert change to std::map
* `size_t` because GCC has to be happy
* Fixed HUD Editor Widescreen mode not displaying the sliders properly.
Changed all windows to full-section-width display.
* Revert changes to MotionBlur.cpp
* Add non-CVar variants of checkbox, combobox, and the sliders.
Fix motion blur functionality with new non-CVar widgets.
* Add non-CVar variants of checkbox, combobox, and the sliders.
Fix motion blur functionality with those non-CVar widgets.
Add size and labelPosition to widgetOptions, implemented on button and checkbox/combobox/sliders.
Change window popout buttons to inline size type.
* Rename SearchMenu.h to SearchableMenuItems.h and move to BenGui folder.
* Forgot to change the include XD
* Change `modifierFunc` to `preFunc`, updated documentation for that and including `postFunc`.
* Modify code to require variable for non-CVar widget initialization when necessary. Check for `valuePointer` being nullptr, and preventing widget drawing with a debug assert and error log entry.
Remove all `has_variant` calls and wrap entire widget type switch in `SearchMenuGetItem` with a try/catch on `std::bad_variant_access` with another error log and debug assert.
* More review changes.
* Implement `isPercentage`, `format`, and `showButtons` for sliders.
Pull values of those over from menubar.
Add documentation on `widgetOptions` for those and others added for previous review changes.
Move Fast Magic Arrow and Instant Fin Recall to Gameplay section.
* Modify header and sidebar "buttons" to match theming of regular buttons.
* Add precision clamping to SliderFloat value. At least 1.0 seems to be consistent at "100%".
Change IR slider to be percentage.
* Mention weirdness with SDL and pad menu button in controller nav tooltip.
* Move Menu files to 2s2h/BenGui.
* Add Warp Points to Developer Tools.
Make "Press F1" prompt show only when a menu isn't registered.
* clang
* Make search input take focus when search menu is open.
* Forgot include.
* Global search (#3)
* Restore Sidebar search entry, but lock it behind a checkbox in Settings. Dynamically adds or removes the sidebar entry, and header search is toggled inversely.
* Make menu toggle its visibility when using the button in the menu to close. Couldn't handle Alt+F4 without a hook I didn't want to add.
Remove unneeded commented code.
---------
Co-authored-by: Caladius <Caladius@users.noreply.github.com>
Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
|
