summaryrefslogtreecommitdiff
path: root/mm/src/overlays
AgeCommit message (Collapse)Author
2 daysFix deku baba stick interp issue (#1832)Garrett Cox
2 daysAdd new file setup screen, for selecting preset, rando/vanilla and seed (#1829)Garrett Cox
3 daysShuffle keaton grass and some more missed grass (#1822)Garrett Cox
6 days[Rando] Shuffle Wonder Items (#1785)Eblo
* Shuffle Wonder Items * Add swordsman school gong Rupee * Add Termina Field wall items * Remove unneeded hardcoded actor position * Make EnItem00 wonder items invisible
9 daysPort LERP interpolation improvements from ship (#1812)Philip Dubé
11 daysBeehive shuffle (#1773)Garrett Cox
12 daysunregister kafei skeleton on actor deletion (#1800)Jameriquiah
* unregister kafei skeleton on actor deletion Co-Authored-By: djevangelia <263709373+djevangelia@users.noreply.github.com> * add missing include --------- Co-authored-by: djevangelia <263709373+djevangelia@users.noreply.github.com>
2026-07-07Merge pull request #1779 from HarbourMasters/develop-keiichiGarrett Cox
keiichi -> develop
2026-06-30Add restoration to re-bottle soil patch bugs (#1756)Eblo
2026-06-30[Enhancement] Port fast bottles from SoH (#1755)Eblo
* Add enhancement to skip bottle pickup messages * Add enhancement to speed up bottle animations
2026-06-22Add enhancement to remove explosives limit (#1733)Eblo
2026-06-11Fix GC US assets conflicting with N64 US HD assets (#1726)GhostlyDark
* GC US: Fix copyright text * GC US: Fix File Select text
2026-05-31Disable interpolation on falling rocks (#1712)Eblo
* Disable interpolation on falling rocks * clang format
2026-05-21Skip Misc Interactions: Couple's Mask cutscene (#1659)Jordan Longstaff
* Skip Couple's Mask cutscene * A bit of rearrangement * Fix VB documentation * A couple more adjustments * Rename VB flag * Add non-rando condition * Use existing VB for GI give item event * Open dialogue message before giving Couple's Mask * Shift Kafei over a bit to avoid clipping * Adjust condition to avoid triggering too soon if Link arrives after 4:30 * Reformat * Update VB comment * Simplify rando check Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Move notebook event-queuing text ID to constexpr --------- Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
2026-05-21Merge pull request #1697 from mckinlee/bomb-arrow-cycle-consumption-fixmckinlee
[Fix] Don't Consume Bombs During Arrow Cycle
2026-05-21Merge pull request #1696 from mckinlee/songitemssoftlockmckinlee
[Fix] Song Items Softlock
2026-05-19Merge pull request #1702 from HarbourMasters/develop-keiichiEblo
develop-keiichi->develop
2026-05-10[Enhancement] Infinite Epona Carrots (#1675)mckinlee
* vroom vroom * move that...
2026-05-07[Enhancement] Bomb Arrows (#1496)mckinlee
* shoot and go boom * add bomb model to arrow tip * simplify bomb draw and effects * add bomb arrows to arrow cycling * use ObjectExtension and simplify arrow cycle handling * overhaul * feedback/fixes * clean up diff * feedback 2 and a fix --------- Co-authored-by: Jameriquiah <42100286+Jameriquiah@users.noreply.github.com> Co-authored-by: Jameriquiah <jordynhardyman12@gmail.com>
2026-05-07Skip Misc Interactions: Sakon's Hideout conveyor belt cutscene (#1663)Jordan Longstaff
2026-04-26Skip Misc Interactions: Sakon's hideout door opens (#1650)Jordan Longstaff
2026-04-26Skip Misc Interactions: Kafei running to town (#1649)Jordan Longstaff
* Skip Misc Interactions: Kafei running to town * Correct documented VB_KAFEI_RUN_TO_TOWN condition
2026-04-26Port SoH Cosmetics Editor UI (#1633)Jameriquiah
* port soh cosmetics editor ui * fix wrong hearts color * fix rainbow * cosmetics editor refactor * formatting
2026-03-30[Enhancement] Extra Powder Kegs (#1600)mckinlee
* extra powder kegs * feedback * feedback 2 * feedback 3
2026-03-19Deku Butler animation fix (#1442)OtherBlue
* first implementation (hardcoded) * proper implementation with toggle * first implementation (hardcoded) * develop rebase * moved implementation to enhancement file * fix unintentional lus change hope this works * VB update
2026-03-19reset rail skb (#1602)balloondude2
2026-03-10Better owl warp menu (#1572)Jordan Longstaff
* Better owl warp menu * Fix Pause Owl Warp * Run clang-format * Revert location of SHIP_HANDLE_OWL_CURSOR_INF_LOOP macro * Remove unneeded extern * Rename VB flag * Clearer block size constant * Add validation to next cursor point * Format
2026-03-10always show feathers (#1594)mckinlee
2026-03-10Picto-box on C-up (#1558)OtherBlue
* add option to open picto-box on C-up * clanggggg * addressing feedback
2026-02-27Merge branch 'develop-keiichi' of github.com:HarbourMasters/2ship2harkinian ↵Garrett
into develop
2026-02-22Simplify hearts & magic cosmetics and expand where they are shown (#1562)Garrett Cox
2026-02-22Replace our Z-Targeting fix with recomp's (#1560)Garrett Cox
Full credit to danielryb for submitting this to recomp Co-authored-by: danielryb <59661841+danielryb@users.noreply.github.com>
2026-02-09Unsheathe Sword Without Slashing (#1505)kaeporagaebora
* Add unsheath without slashing option * Run clang-format * Run clang-format * Typo fix * Converted to hook format * Run clang format * Update UnsheatheWithoutSlashing file * Update UnsheatheWithoutSlashing file * Update UnsheatheWithoutSlashing file
2026-02-09cosmetics editor trail colors (#1491)Jameriquiah
* trail colors * sticks and deku spin * organization
2026-02-09Port bomb billboard and grotto rotation from SoH (#1502)Eblo
2026-01-24WIP Tweaks to fix compatibility with 0th/4th day glitches (#1462)Garrett Cox
2026-01-20Texture scrolling interpolation, Take 2 (#1332)Eblo
* Scrolling texture interpolation Co-authored-by: Nicholas Estelami <NEstelami@users.noreply.github.com> * Interpolate remaining GIs * Clean up gDPSetTileSizeInterp --------- Co-authored-by: Nicholas Estelami <NEstelami@users.noreply.github.com>
2026-01-20fix soft lock (#1479)mckinlee
2026-01-20[Enhancement] Curiousity Shop Sell Refills (#1465)mckinlee
* poc * no RC's * standalone version * clean up * linux build fix?
2026-01-18Merge pull request #1469 from HarbourMasters/develop-mionGarrett Cox
develop-mion -> develop
2026-01-18Tree Shuffle (#1346)Caladius
Co-authored-by: Garrett <garrettjcox@gmail.com>
2026-01-17Add more controller binding options (#1466)Garrett Cox
2026-01-16Add EnOt reset function (#1457)develop-mionEblo
2026-01-16Refactor junk cycling and trap models (#1452)Garrett Cox
2026-01-09Unequip Items/Masks from C-Buttons (#1429)OtherBlue
* v0.1 * works on all items and all buttons * mask support * clang format my worst enemy * update keeping VB's alphabetical * addressing feedback improved code flow in general and undid unnecessary edit to dpad equips * claaang formaaat * fix GameInteractor_Should calls * Update GameInteractor_VanillaBehavior.h * allow unequipping magic arrows from bow item * cleanup
2026-01-09[Rando] Shuffle Ocarina Buttons (#1303)Caladius
* 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>
2026-01-05[Rando] Clock Shuffle + Logic (#1275)mckinlee
* 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>
2025-12-30Merge remote-tracking branch 'upstream/develop-mion' into ↵Eblo
merge-develop-mion-into-develop
2025-12-30Only apply fast push to skateblock, not pull (#1418)Eblo
2025-12-18Add hook file for Pause Save (#1399)Jordan Longstaff
* Add hook file for Pause Save * Correct CVar default * Add missing include
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 08:02:37 +0000