| Age | Commit message (Collapse) | Author |
|---|
|
|
|
|
|
|
|
* Import Models
* Give and Draw for Models
* Logic updates, need to do Evans Song
* Update OnFileCreate
* Fixes
* clang
* Implement Japas Jam Session
* Update naming uniformity
* Rename Logic
* ugh
* Fixes VB, Logic, and removes magic numbers from Starting Items Macro.
* Adds Item Tracker implementation
* Adds Scarecrow song check and makes feedback changes.
* Stop error chime from starting an EDM album.
* Update mm/2s2h/Rando/MiscBehavior/OnFileCreate.cpp
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
* Update mm/2s2h/Rando/Logic/Logic.h
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
* Update mm/2s2h/Rando/Logic/Logic.h
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
* Update mm/2s2h/Enhancements/Songs/SkipScarecrowSong.cpp
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
* Undo Swim change (no idea why i did this)
* Reworked Hook
* Cleanup
* Clean up
Fix bug with SkipScarecrowSong
Fix Zora Ballad logic
Grant Ocarina buttons when not shuffled
Fix VB_PLAY_OCARINA_NOTE boolean
Re-instantiate starting items RI adjustment
Swap Ocarina right and left
---------
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
|
|
* 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>
|
|
* Shuffle Swim + Central Logic
* East Logic
* Great Bay Temple (hopefully)
* North Logic
* Pirates Logic (Hopefully)
* South Logic
* West Logic
* Fix Termina Field Logic
* Fix Great Bay Temple Logic
* Feedback Changes
* Split Southern Swamp North
* Update Swamp and GBC logic
* missed one
* Feedback Updates
* fix syntax
* Split Marine Lab Exterior from GBC
* replace Bronze Scale wording in Menu.
* Additional logic pass for swim ability
* Mimic Deku hop failure event when touching water
Separate Woodfall owl statue platform into own region
* Import Model
* Add to 2ship.o2r
* Add Model Selector
* Update Model
* Clean remove model for replacement
* Import new model extract from Dana
* Testing
* pathing change
* Pushing for someone to look at the model crash issue.
* Enable DrawAbilityItem to take in multiple items when more get added. This is ready to go.
* Feedback Changes
* clang
* Revert "clang"
This reverts commit e09482f8b83c39f4678a9c349ed9061f2e002251.
* Undo clang for once lol
* Do not skip pushing Mikau if no swim ability
* How did I mess that up
* Fix changes
* clang bullsh*t
---------
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
|
|
* grass fade in proof of concept
* finish rest of models
|
|
* wip grass models
* grass csmc
* fix issue with objGrass
* cleanup includes
* fix interpolation
|
|
|
|
|
|
- Fix trapped stray fairy drawing when it shouldn't
- Fix CSMC chests changing textures as you open them
- Fix toilet hand taking trade item
- Fix progressive magic not filling magic meter
- Fix un-obtainable shop items not rendering
- Fix trade item rotation not working while in active trade
- Fix trade item rotation when slot was empty
- Fix not being able to transform on clock tower rooftop
- Fix collider hidden stray fairies going back to vanilla draw
|
|
|
|
* Changes for new LUS resources
* fix factory issues and bump modules
* add build version, custom assets folder, and fix extraction
* add missing custom assets
* fix build .h
* libzip in the workflows
* apt-deps
* Fixes to importers to work with upstream Resource Manager.
Also remove duplicated structs.
* Bump LUS
* bump LUS
* Bump LUS
* bump lus
* point back to louist103/mm
---------
Co-authored-by: Adam Bird <archez39@me.com>
|
