| Age | Commit message (Collapse) | Author |
|---|
|
* Implement Triforce Hunt (needs Glitchless Seed Gen help)
* Fix Credits Warping
* Clean up logging
* Fix Seed Gen
* Remove test code.
* Add Triforce Piece to item tracker
* Allow for multiple models, pushing up because I dislike it and can't figure out a better way.
* Majora Soul for Reward (needs work). Completed Triforce text
* Clang
* clean up comment
* Remove SPDLOG
* Updates based on Feedback
* Cleanup
* Cleanup again
* Fix Ship Utils
* Fix Tracker drawing
* Feedback updates
* clang because why not
* Update to use ENTRANCE mapping. Thanks BalloonDude
* Expand shuffle maximum and handle instances where a seed may not generate.
* Undo menu text.
* Fix Item Tracker... again and feedback changes.
* Update define location to StaticData.h and update majora syntax
* cleanup
* Remove TriforceHunt.cpp again...
* clean up
* FOR REAL THIS TIME
* Update ratio of required/max if the seed needs to adjust how many are in the pool due to generator issues.
* clang
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Save editor enhancements
Add tooltips to weekeventreg, owlActivation, and eventInf
Color code weekeventreg
Add toggle for Chateau Romani infinite magic
All shield to be removed
* Disable clang format for flagTable
* Preserve numerical tooltip
* Add color legend, update flagtable
* Retain bitmask
Co-authored-by: balloondude2 <55861555+balloondude2@users.noreply.github.com>
---------
Co-authored-by: balloondude2 <55861555+balloondude2@users.noreply.github.com>
|
|
* Add vector support to comboboxes
* Move vectors out of header
* Format
* Use variant
---------
Co-authored-by: balloondude2 <55861555+balloondude2@users.noreply.github.com>
|
|
* Implement custom sequences and the audio editor.
* Fix implicit function declaration `AudioEditor_GetReplacementSeq`
* Fix mac again.
* String and header cleanup
* Oops
* WIP ZIP Sound fonts
* The game opens and audio seems to play correctly. Needs extensive testing.
* Name sequences
* Cleanup the SF importer a little.
* XML Sequences good
* Fix mac
* Destructor
* Bump submodule
* Thread safe queue
* Add WAV decoder
* sequenceMap->mSequenceMap and a string fix
* Streamed sequence importer
* Add s16 sample processing.
* Fix drwave define
* Fix STB
* Reorder the loading to enable custom sound fonts
* New streamed solution
* Bump exporter
* Generate 1 minute long looping sequence.
* Very long sample support (113 minutes or so)
* MP3 Decoding
* Don't byteswap the crc from XML.
* WIP OGG
* add windows cmake stuff (broken) and fixes to OGG
* Just throw more cores at the problem
* Dynamically allocate fontMap
* Re-add OOB read fix from old branch
* FLAC decoder, threads for the other compressed formats
* Remove thread from class
* timings
* cleanup conflicts
* update submodules
* update submodules
* update submodules
* loop or not to loop
* named audio XML
* Update submodules
* format
* format again cause git didnt see it for some reason
* move drlib to submodule
* Update apt-deps.txt
* Fix for new cmake
* fix game interactor
* Update macports-deps.txt
* PR fixes and fix OTRExporter for mac
* format
* format
* ifdef intrin header
* Docs
* use macro for preview
* Small fixes
* format
* fix 2nd day clock town
* Update exporter
* Fix duplicate global in stubs.c
* restore editor to use cvars again sadge
* Format
* warn if more than 255 sequences
* use main seq player to avoid an overflow
* fix the wrong seq playing in the editor again
* 16 bit seqIds
* fix shop crash
* format
* cleanups
* Delete audio collection
* Add entry to modern menu
* Cleanup the audio collection
* fix clock town randomization
* format
* format again
* some fixes for custom audio (#1)
* how I would sort the sequences (#2)
clang
one more
forgot to revert
Co-authored-by: mckinlee <mckinlee@ymail.com>
* Adjustments to ocarina song types
* stereo
* format
* Loop point support
* Part of a PR review
* Remove drlib submodule
* Clarify change
* Format
* Add tag
* switch to find_package
* bump ZAPDTR
* Milk bar day/night fix
* x86 SIMD for aMixImpl
* format
* NEON
* format
* remove | 0x900 causing a crash
* Asan fixes
* add missing define for MSVC
* Clock town fixes
Co-authored-by: mckinlee <mckinlee@ymail.com>
* format
* Fix underscore logic in audio collection
* Use torch sample XML format
* fix font map size and format
* quick fix
* Update exporter
* Opus
* actions packages
* fix it again?
* Fix a few missed 16 bit masks
* Remove unused stubs
* Revert "Fix a few missed 16 bit masks"
This reverts commit 7143c4ff92d23157a79a10b4ee62e93e35acb23e.
* Opus decoding
* Fixes for linux and other things
* free opus data
* format
* Update FindOpusFile.cmake
* bria's fix?
* Update BenMenuBar.cpp
* Update BenMenuBar.cpp
* Split ocarina tabs
* better error handling
* Remove unused vectors
* move audio editor to enhancements
* Fix mac again?
* Final cleanups
* Format
* extern C
* Allow custom fanfares to be used in songs
* format
* WIP sf editor support
* Format
* Jacks fixes
* Bump submodule
* Archez's fixes
* Format
---------
Co-authored-by: mckinlee <mckinlee@ymail.com>
Co-authored-by: Archez <archez39@me.com>
|
|
garrettjoecox.github.com:HarbourMasters/2ship2harkinian into develop-rando
|
|
* Bump LUS and OTRExporter pt.3
* Remove outdated controller disclaimer
|
|
|
|
|
|
garrettjoecox.github.com:HarbourMasters/2ship2harkinian into develop-rando
|
|
|
|
garrettjoecox.github.com:HarbourMasters/2ship2harkinian into develop-rando
|
|
* 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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Update Check Tracker and add Rando Tab to Save Editor
* Hide Collected Option
* clangified9000
* Fix Expanding/Collapsing
|
|
garrettjoecox.github.com:HarbourMasters/2ship2harkinian into develop-rando
|
|
* label weekeventreg by hex mask instead of index
* update other flagArrays
* consistency
* display hex and dec
* capitals
* oops
* oops 2
|
|
* Fix crashing with modern menu and UIWidgets when null is passed for tooltips
* move to shiputils
|
|
* Set lightning off when changing save time
* various typo fixes
|
|
garrettjoecox.github.com:HarbourMasters/2ship2harkinian into develop-rando
|
|
|
|
* Implement simple notifications system
* Remove demoWindow call
* Fix initializer order
|
|
* add option to invert st in save editor
* only allow inverting in stone tower scenes
* change tooltip to disabledTooltip
Co-authored-by: Archez <Archez@users.noreply.github.com>
---------
Co-authored-by: Archez <Archez@users.noreply.github.com>
|
|
|
|
garrettjoecox.github.com:garrettjoecox/2ship2harkinian into develop-rando
|
|
|
|
|
|
|
|
|
|
garrettjoecox.github.com:HarbourMasters/2ship2harkinian into develop-rando
|
|
|
|
* 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>
|
|
|
|
|
|
|
