summaryrefslogtreecommitdiff
path: root/mm/src
AgeCommit message (Collapse)Author
31 hoursFix remaining '2' on file select code (#1843)Garrett Cox
3 daysAdjust palette hack for maps (#1835)Garrett Cox
4 daysFix deku baba stick interp issue (#1832)Garrett Cox
4 daysAdd new file setup screen, for selecting preset, rando/vanilla and seed (#1829)Garrett Cox
5 daysShuffle keaton grass and some more missed grass (#1822)Garrett Cox
8 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
8 daysOption to auto advance text to credits (#1821)Garrett Cox
11 daysPort LERP interpolation improvements from ship (#1812)Philip Dubé
13 daysBeehive shuffle (#1773)Garrett Cox
2026-07-21unregister 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-21XML Skeleton Support (#1796)Jameriquiah
* xml skeleton support * new include to please macos build * build xml limbs as lod and force vanilla draw path allows soh skeletons to be loaded in 2ship * disable lod when custom models are used
2026-07-07Merge pull request #1779 from HarbourMasters/develop-keiichiGarrett Cox
keiichi -> develop
2026-07-03New Features: No random drops + No heart/healing drops (#1547)anthony-barricelli
* no random drops * no heart/fairy drops * add item spawns to prevent soft locks * remove redundancies, use collectible vb behavior for hearts * feedback -- move vb check
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-25wiiu: Fix audioGaryOderNichts
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-25[Enhancement] Port Extraction Flow, ImGui scaling, file perm check from SoH ↵Eblo
(#1709) * Port Extraction Flow, ImGui scaling, file perms * Remove obsolete F1 menu message
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-21[Enhancement] Color Pictograph (#1484)balloondude2
* mostly works * mvp * don't think I need the align * clean up * now we have png * whoops * remove unused code Co-authored-by: Garrett Cox <garrettjcox@gmail.com> * Remove unneeded code Co-authored-by: Garrett Cox <garrettjcox@gmail.com> * move buffer off of save context * load png when the camera is used * clean up * clang format * Pass in pointer * Changed to pointer(FIX FOR LINUX) (#8) --------- Co-authored-by: Garrett Cox <garrettjcox@gmail.com> Co-authored-by: sitton76 <58642183+sitton76@users.noreply.github.com>
2026-05-19Merge pull request #1702 from HarbourMasters/develop-keiichiEblo
develop-keiichi->develop
2026-05-19Disable SFX replacement (#1679)Eblo
* Disable SFX replacement * Comment out dead code instead
2026-05-18Execute moon crash hooks during edge case (#1691)Jordan Longstaff
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-04-11Alt Toggle for Custom animation (#1624)Jameriquiah
* Add explicit alt prefix checking to animation loading Co-Authored-By: PurpleHato <47987542+PurpleHato@users.noreply.github.com> * forgot comment Co-Authored-By: PurpleHato <47987542+PurpleHato@users.noreply.github.com> --------- Co-authored-by: PurpleHato <47987542+PurpleHato@users.noreply.github.com>
2026-03-30Fix Button Env Color (#1603)mckinlee
2026-03-30[Enhancement] Extra Powder Kegs (#1600)mckinlee
* extra powder kegs * feedback * feedback 2 * feedback 3
2026-03-19[Rando] Tycoon's Wallet (#1597)mckinlee
* big boy wallet * cleaner 4 digit support * feedback * #1605 explains this change --------- Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
2026-03-19[Enhancement] Custom Ocarina Controls (#1598)OtherBlue
* custom ocarina controls implemented * clang format * added blocking for vanilla inputs I forgot
2026-03-19[Enhancement] Song Items (#1566)mckinlee
* equip songs * feedback
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-10Basic surround sound support. (#1516)tortugaveloz
* Update LUS and add surround sound support. * Fix loading to load surround when configured that way. * Update mm/src/code/z_sram_NES.c Co-authored-by: inspectredc <78732756+inspectredc@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update LUS. --------- Co-authored-by: inspectredc <78732756+inspectredc@users.noreply.github.com> Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
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-03-10prevent ocarina end on sun song if faster playback is on (#1542)anthony-barricelli
2026-02-27Merge branch 'develop-keiichi' of github.com:HarbourMasters/2ship2harkinian ↵Garrett
into develop
2026-02-25fix (#1578)mckinlee
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>
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-05 06:07:43 +0000