summaryrefslogtreecommitdiff
path: root/mm/src/code
AgeCommit message (Collapse)Author
2025-02-23Add fileCompletedAtGarrett Cox
2025-02-21Execute saveLoad hook for non-fileselect loads and reset shipSaveInfo (#233)Archez
* Execute save load hook for non-fileselect scenarios and reset shipSaveInfo * avoid debug hook execute
2025-02-14Merge branch 'develop' of github.com:HarbourMasters/2ship2harkinian into ↵Garrett Cox
develop-rando
2025-02-14Only handle sword beam collision for enemies (#993)Eblo
Ensure EnClearTag light ray effects are blue when Fierce Deity
2025-02-13Rando: Add Checks for Milk Bar NPC Shop (#217)Joshua Sanchez
* Rando: Add Checks for Mr Barten's Milk Bar Shop Prompts (Milk/Chateau) * Rando: Add custom behavior for Mr Barten to support randomizing his shop options * Refactor: Alphabetically list Milk Bar npc shop checks * Refactor: Alphabetically list Milk Bar npc shop checks in Types.h * Refactor: Clean up references to Milk Bar purchase checks * Engine: Pass callback and script pointers as VB_EXEC_MSG_EVENT hook parameters * Add dialogue state tracking to EnTab ActorBehavior * Override default script and callback behavior in EnTab ActorBehavior * Clang-format on EnTab and remove extraneous LUSLOGs * Last pass on clang-format for #217 * Remove unused reference to EnTab actor script that was crashing builds on Linux/Mac * Add QueueNonCheckItem to MiscBehavior.h/cpp Allows actors to queue up Give Item events which go through the same flow as the Rando Save check queue. Should only be used for non-key items. * Swap EnTab behavior to granting RI Refills and remove all vanilla bottle checks * EnTab clang-format pass * Update mm/2s2h/Rando/ActorBehavior/EnTab.cpp Co-authored-by: Garrett Cox <garrettjcox@gmail.com> * Revert "Add QueueNonCheckItem to MiscBehavior.h/cpp" This reverts commit 4c274dbf907235b8518a9359c5b941d8e7c1f831. * Rando EnTab: Add RO_SHUFFLE_SHOPS check to SHOULD conditionals * Update EnTab rando shop shuffle behavior to give vanilla refill behavior with delayed bottle check * Remove now-unused MsgScript** parameter in VB_EXEC_MSG_EVENT This was introduced in an earlier commit for #217 but is no longer a necessary addition to the engine as a result of 5a4f0424b. * Remove unused LUSLOG that was breaking builds on Linux/Mac --------- Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
2025-02-13Add some access featuresGarrett Cox
2025-02-11Add interpolation fixes to console logo and file chose skybox (#992)Archez
2025-02-10Fix more variations of the vanilla magic bugGarrett Cox
2025-02-06Merge branch 'develop' of ↵Garrett Cox
garrettjoecox.github.com:HarbourMasters/2ship2harkinian into develop-rando
2025-02-04Add safe crash handling for remote hookshot hookslide in great bay temple (#978)Archez
2025-02-01Merge branch 'develop' of ↵Garrett Cox
garrettjoecox.github.com:HarbourMasters/2ship2harkinian into develop-rando
2025-01-29Fix sizing of gGoldSkulltulaCounterIconTex load (#975)Garrett Cox
2025-01-28More one point skipsGarrett Cox
2025-01-27Merge branch 'develop' of ↵Garrett Cox
garrettjoecox.github.com:HarbourMasters/2ship2harkinian into develop-rando
2025-01-27Add crash protection for action swap (#965)Archez
* Add crash protection for action swap * rename hess crash to console crash fix apply soft reset handler to owl warp cursor apply soft reset handler to hess crash
2025-01-26Improve better song of double time experience (#963)Archez
* Add ability to override current hud editor element mode * Add gfx setup to 3ds clock to ensure it always renders properly * Add check for hud override on text-based clock * Add hooks for before/after drawing clock * Improve better song of double time experience * DPad input repeated on hold and show A on HUD
2025-01-16Merge branch 'develop' of ↵Garrett Cox
garrettjoecox.github.com:HarbourMasters/2ship2harkinian into develop-rando
2025-01-14[Cosmetic Editor] Implements Initial Cosmetic Editor (#886)Caladius
* 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>
2025-01-12Create new glitchless logic variant, and move old one to 'French Vanilla'Garrett Cox
2025-01-09Merge branch 'develop' of ↵Garrett Cox
garrettjoecox.github.com:HarbourMasters/2ship2harkinian into develop-rando
2025-01-09[Enhancement]: Add File Slot 3 (#900)Archez
* [Enhancement]: File Slot 3 * Log out save file imports and reset file select state
2025-01-08Merge branch 'develop' of ↵Garrett Cox
garrettjoecox.github.com:HarbourMasters/2ship2harkinian into develop-rando
2025-01-08Change HALF_SAVE_BUFFER_SIZE to SAVE_BUFFER_SIZE_HALFGarrett Cox
2025-01-08Add enums for sram and save file magic values (#933)Archez
2025-01-08Add EasyFrameAdvance cheat (#932)Garrett Cox
2025-01-08Cleanup so things around the save manager (#930)Archez
2025-01-06Merge branch 'develop' of ↵Garrett Cox
garrettjoecox.github.com:HarbourMasters/2ship2harkinian into develop-rando
2025-01-06[Enhancement] Cycle Arrows (#901)mckinlee
* initial implementation * update tooltip * clang format * Fix linux? * how bout now? * pain * ... * linux fix Co-Authored-By: sitton76 <58642183+sitton76@users.noreply.github.com> * clang format * add sfx, requirements, cooldown, etc. * clang format * bug fix and remove unneeded logic * bug fix for the bug fix lol * add auto cycling when out of magic and visual/sfx indicators * forgot about clang format as usual * forgot about that while refactoring * le sigh * Feedback Changes and Refactor Co-Authored-By: Archez <Archez@users.noreply.github.com> * remove VB_MAGIC_ARROW_CONSUME * add more restrictions * Update mm/2s2h/Enhancements/Equipment/ArrowCycle.cpp Co-authored-by: Garrett Cox <garrettjcox@gmail.com> --------- Co-authored-by: sitton76 <58642183+sitton76@users.noreply.github.com> Co-authored-by: Archez <Archez@users.noreply.github.com> Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
2025-01-05Merge branch 'develop' of ↵Garrett Cox
garrettjoecox.github.com:garrettjoecox/2ship2harkinian into develop-rando
2025-01-03Implement Display Overlay (#127)Caladius
* Implement Display Overlay * remove comment * Migrator config * Update Modern Menu
2025-01-03Allow Better SoDT to work on Night of the Final Day (#913)zodiac-ill
* Allow Better SoDT to work on Night of Final Day * -1 newline * lol oops * change SoDT VB name to be more descriptive * see if this fixes clang-format * Inline vanilla conditional with GI Should call * clang-format * *long exacerbated sigh*
2025-01-02Add additional build info, ensure saves are marked as incompatible across ↵Garrett Cox
versions
2025-01-02Merge branch 'develop' of ↵Garrett Cox
garrettjoecox.github.com:HarbourMasters/2ship2harkinian into develop-rando
2024-12-31Merge remote-tracking branch 'origin/develop-satoko' into merge-satokoAdam Bird
2024-12-30Fix an issue when buying sword, and some issues with the clock town stray fairyGarrett Cox
2024-12-28WeekEventRegHorseState macro -> function (#94)balloondude2
* convert macro to function * cleanup * event log * reorder
2024-12-27Fix bow reticle showing on certain collisions (#907)Archez
* Fix bow reticle showing on certain collisions * better arrow matrix math
2024-12-20Merge remote-tracking branch 'origin/develop-satoko' into merge-develop-satokoArchez
2024-12-18Adds even more interpolation fixes (#894)Archez
* interpolate biggoron ice breath * interpolate fix pause cursor * interpolate goron snow/steam effects * adjust clear tag interpolation * skip interpolation on touching item00 items * interpolate keaton grass disappear * Apply ignore act mtx to current and children paths * Interpolate wider angles for deku link spin and flower dive animations * refactor for pr feedback
2024-12-14Merge branch 'develop' of ↵Garrett Cox
garrettjoecox.github.com:HarbourMasters/2ship2harkinian into develop-rando
2024-12-14Migrate enhancements to ShipInit patternGarrett Cox
2024-12-14Shuffle Shooting Galleries (#65)Eblo
* Shuffle Shooting Galleries, fix progressive bow * Add Shooting Gallery region checks
2024-12-12Tweaks to owl shuffle implementationGarrett Cox
2024-12-12Initial Commit, no LogicCaladius
2024-12-11Add FixEponaStealingSwordGarrett Cox
2024-12-11Add progressive swords and fix some sword related issuesGarrett Cox
2024-12-10Add extended culling handling for special actors (#889)Archez
* Adjust forward cullzone multiplier to apply to scale as well * option 1: apply multiplier to every check value and normalize alpha fade * option 2: hijack projZ value to avoid touching actual logic * create methods for hijacking actor proj values and handle remaining special actors * forward declare structs to not include z64 in header
2024-12-06Merge branch 'develop' of ↵Garrett Cox
garrettjoecox.github.com:HarbourMasters/2ship2harkinian into develop-rando
2024-12-06Add better song of double time enhancement (#876)Garrett Cox
2024-12-05Merge pull request #884 from HarbourMasters/develop-satokoGarrett Cox
`develop-satoko` -> `develop`
generated by cgit v1.2.3 (git 2.25.1) at 2026-10-08 03:34:43 +0000