| Age | Commit message (Collapse) | Author |
|
|
|
* bump lus to port-maintenance
* clang
* remove redundant cast
* clang again
* update lus commit
|
|
* Expose rando inf flags in save editor
* Remove RANDO_INF_OBTAINED_SOUL_OF_ENEMY_ODOLWA
|
|
* Format strings before printing
* clang-format
|
|
* big boy wallet
* cleaner 4 digit support
* feedback
* #1605 explains this change
---------
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
|
|
|
|
* Add Clocks as Items feature
* refactor
* some clean up
* forgot to clangify
* use proper randoinf flags and some fixes
* proper skipsotcutscene fix
* Animated Clock Item (Thank you Caladius!)
* Close attempt at animating the clock, not perfect but a good start.
* Git gud Clock
* fix clock item get crash
Co-Authored-By: Caladius <Caladius@users.noreply.github.com>
* some enhancements
* logic refactor, minor changes, and new enhancements
* huge rework
* clang
* fix a oops; any day, not current day
* housekeeping and starting items menu support
* splits up some milkroad regions and fixes a audio bug
* i suck at merging
* feedback update
* scarecrow dance fix
* add clocks to new item tracker
* day 2 bean patches
* add time logic to enemy drops and simplify day 2 bean macro
* rebrand to "Shuffle Time"
* more eblo feedback
* some more feedback
* rename feedback
* pauseSaveEntrance fix
* fix take 2
* Time Shuffle cleanup
Fix pause save Time Shuffle bug
Fix event queue daytelop bug
Finish merge commit header include
Clean up with shouldRegister
Co-authored-by: mckinlee <mckinlee@ymail.com>
---------
Co-authored-by: Caladius <Caladius@users.noreply.github.com>
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
|
|
* slight redesign
* feedback update
* another feedback update
* feedback update
|
|
* 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
|
|
|
|
|