| 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
|
|
|
|
* Port multiple warp points from SoH
* Populate placeholder name if blank
|
|
|
|
* port soh cosmetics editor ui
* fix wrong hearts color
* fix rainbow
* cosmetics editor refactor
* formatting
|
|
* 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>
|
|
|
|
|
|
|
|
|
|
* Tweaks to how starting items works and is stored and interacted with
* More tweaks to clock shuffle initialization
|
|
* 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>
|
|
* port dl viewer
* feedback + redesign
* feedback update
---------
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
|
|
* port message viewer
* clean up UI and add raw message inspector
* Word Wrapping (#11)
* feedback update
---------
Co-authored-by: Caladius <Caladius@users.noreply.github.com>
|
|
* slight redesign
* feedback update
* another feedback update
* feedback update
|
|
* Add setting for minimum Skulltula tokens
* Display max for tokens and fairies in item tracker
* Not relevant to this PR. Why did develop succeed?
* Use spdlog format
* Remove redundant ternary
* clang format
* Minor edit
* Address feedback
|
|
* Fix debug save options & expose boot to warp point
* Update mm/2s2h/DeveloperTools/WarpPoint.cpp
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
* Update mm/2s2h/DeveloperTools/WarpPoint.cpp
* Apply suggestion from @Eblo
---------
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
|
|
* Replace ActorExtension with ObjectExtension
* We only need cassert here, not all of LUS
* Expose ObjectExtension_Free to C++
* Remove unneeded vector include
|
|
* Initial Trap Implementation with 1 Trap Example.
* New TrapTypes and Per Trap Custom Messages
* Spruce up Menu and add placeholders for toggling traps
* Reordering and clean up
* Seeded Trap Models
* Trap Type Opt-in
* Add Jinx Trap
* Add Enemy (Like Like) Trap
* Fix Shop Item draws and convert for Progressive
* Placeholder for Custom Model
* Implemented time trap[Please Squash this] (#13)
* Implemented time trap
* Finished comment because im braindead today
* Forgot to fix indentation(whoops)
* Changed things not mess with the games code, added some more Time Trap messages
* Removed a include I forgot to yoink from the base code.
* Removed header define for VerifyTimeSkip
* Clangit
* Missed some leftovers from a merge conflict.
* Clang format throwing a fit over a empty line
* Added Timeskip CVar placeholder
* Fixed issue where game crashes past midnight
* Added Moonfall skipping prevention messures.
* Added fallback loop to handle the remaining cycles in the event of a overflow.
* Cleaner implementation
* Keep it simple stupid
* changed function name to be more accurate
* Removed outdated comment, used TimeSkipInc for moonfall skip prevention
* Reverted max trap(accidentally pushed it while testing)
* Removed old unused value
* Reduced the iteration by 1 to be closer to where it was at before.
* Will this fix Windows?
* Added TRAP_TIME to trapToCvarMap
* Corrected typo on comment
* Clangit...again
* Added calls to load environment values and adjust the weather.
* Update Time Trap and clean up code
* Add Flash effect to Time Trap
* Added a few more timeTrapMessages
* I hate you clang format
* Fix Trading Post Kick Out Time
* Added map for all locations I can think of that close.
* Clangit yet again
* Removed Inn handling because the edge case related to it closing cannot happen
* Corrected a whoopie I made when I was dealing with a conflict
* Removed pointless condition check that is always true
* Removed duped variable
* Removed unnecessary data from SCENE_8ITEMSHO kickout entry
* Removed now used TRADING_POS_ACTOR_PARAM
---------
Co-authored-by: Caladius <clatini88@gmail.com>
* Comment out Kick Out code for later TODO
* Clean out commented code
* Adds Wallet Trap and updates some tooltips
* More Trap Messages
* Even more trap messages
* moooooore messages
* update for clang
* Feedback changes for Time Trap
* Update Trap functions
* Fix Matrix call
* Trap Model Import (Thanks Zrc)
* rename
* Adjust size
* update name for uniformity
* Update mm/2s2h/Rando/MiscBehavior/Traps.cpp
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
* Update mm/2s2h/Rando/MiscBehavior/Traps.cpp
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
* feedback updates
* Update notifications to remove color codes from trap messages when item skip is on
* VBify Object Dependency
* Fix comma
* fix headers
* Refactor ObjectDependency hook
* Check if item get cutscenes are being skipped
* Use brackets for LUS include
* Header update
---------
Co-authored-by: sitton76 <58642183+sitton76@users.noreply.github.com>
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
|
|
* 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
|
|
* 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>
|
|
* 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
|
|
* [Better Warp] Wrap entrance value for supported count on each scene
* don't be too fancy with macro magic, and rearrange entrance check
|
|
* Clear flags on boot to warp
* fix grotto debug warp
|
|
* 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>
|
|
* shipinit developer tools
* shipinit warppoint and rework menu rendering
|
|
|
|
* 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>
|