summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2026-01-16Add EnOt reset function (#1457)develop-mionEblo
2026-01-05Bump for Mion Charlie (#1434)3.0.2Eblo
2026-01-04Exclude Triforce from plentiful items, add error handling (#1433)Eblo
* Exclude Triforce from plentiful, add error handling * Add max check because unsigned
2026-01-04Fix softlock from repeating Kafei's Mask check (#1432)Eblo
2025-12-30Fix mismatched Deku Search Balls labels (#1416)Eblo
2025-12-30Only apply fast push to skateblock, not pull (#1418)Eblo
2025-12-30Snowhead corrections attempt 2 (#1415)sitton76
* Migrated changes made in other PR * CAN_BE_ZORA, not (CAN_BE_ZORA && CAN_USE_SWORD)
2025-12-18Fix OOB in AudioSeq_ResetReverb (#1397)Eblo
2025-12-18Fix cow softlock when cows are not shuffled (#1396)Eblo
* Fix cow softlock when cows are not shuffled * Make the cow hooks themselves conditional
2025-12-13Swordsman pots need human sword (#1394)Eblo
2025-12-11Bugfix: Don't skip Dotour's entry into Bomber's Notebook (#1387)Jordan Longstaff
* Bugfix: Don't skip Dotour's entry into Bomber's Notebook * Oops, forgot to flip condition for setting should * Or, to be less confusing, rename function to match * Move comment explaining skip logic
2025-12-09Skip Woodfall Clear cutscene on repeats (#1377)Eblo
* Skip Woodfall Clear cutscene on repeats * Forgot a flag
2025-11-30Implement Dinolfos, Boss03 reset funcs (#1371)Eblo
Re-implement Boss07 reset func
2025-11-20Reset Invadepoh state (#1350)Eblo
* Reset sInvasionState in z_en_invadepoh.c * Reset reward state as well * Reset more static variables * oh clang * oh clang again
2025-11-20[Rando] Revise enemy drop logic (#1347)Eblo
* Revise enemy drop logic * Exclude pot and Freezard drop RCs * Use macro for south->upper connection * Address flowers region TODO
2025-11-17Revise Octo and region logic in Southern Swamp (#1340)Eblo
2025-11-17LUS bump to make trace available to debug+release (#1334)Eblo
2025-11-15Merge pull request #1323 from Caladius/develop-mion-triforce-fixEblo
Update Triforce from u8 to u16
2025-11-06Update to u16Caladius
2025-11-04bump to mion bravo (#1318)3.0.1balloondude2
2025-11-03Address logging issues (#1317)Eblo
* Address logging issues * Default log levels for debug and release
2025-11-03Fix UB in Item_DropCollectible hook usage (#1314)Eblo
* Fix UB in Item_DropCollectible hook usage * Clang format * Again
2025-11-03Restrict Ossan draw hook to Bomb Shop Owner (#1316)Eblo
2025-11-03Fix lens actors not showing (#1315)Eblo
2025-10-30Bump for Mion Alfa (#1312)3.0.0Eblo
2025-10-30[Rando] Implement Traps (#1287)Caladius
* 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>
2025-10-29Retire French Vanilla logic setting (#1311)Eblo
2025-10-29[Rando] Swim logic revisions (#1300)Eblo
* Account for swim for Astral Observatory chest * Goron can't climb that ledge * More swim logic revisions
2025-10-29Cleanup heap (#1305)louist103
* Small cleanup to heaps.c * Remove stdio.h * _aligned_free * Fix mac * Format
2025-10-29Add frogs to the item tracker (#1307)Eblo
2025-10-29[Rando] Enemy Drop Shuffle (#1282)Caladius
* Implement most of the Enemy Drops * Fix Glitchless Generation * Fix duplicate Logic Checks * Add Slime Items and fix Linux Floating Point. * Add Comment for Enemy Drops RC Sets * Adds Leever and fixes Position Check issue. * Adds GBC for Logic check * Add Hiploop * Adds Skullfish (Enemy only drops items inside GBT) * Feedback Updates * Updates * Update to Switch for Actor Selection * More Enemy Locations * Fix Mini Baba and remove actors that dont drop items * Update mm/2s2h/Rando/Logic/Logic.h Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update mm/2s2h/Rando/ActorBehavior/EnemyDrops.cpp Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update mm/2s2h/Rando/ActorBehavior/EnemyDrops.cpp Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update mm/2s2h/Rando/Logic/Regions/Miscellaneous.cpp Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Add case for ACTOR_BOSS_05 in Logic.h * Update mm/2s2h/Rando/Types.h Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update mm/2s2h/Rando/ActorBehavior/EnemyDrops.cpp Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Clang format actor position * Need swim for Bio Deku Baba * Define RC_ENEMY_DROP_BIO_DEKU_BABA in checks * GitHub spacing how dare you * Update mm/2s2h/Rando/StaticData/Checks.cpp Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update mm/2s2h/Rando/Types.h Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update mm/2s2h/Rando/ActorBehavior/EnemyDrops.cpp Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update mm/2s2h/Rando/Logic/Regions/Miscellaneous.cpp Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update mm/2s2h/Rando/Logic/Regions/Miscellaneous.cpp Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update mm/2s2h/Rando/StaticData/Checks.cpp Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update mm/2s2h/Rando/Types.h Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update mm/2s2h/Rando/ActorBehavior/EnemyDrops.cpp Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update mm/2s2h/Rando/Logic/Regions/Miscellaneous.cpp Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update mm/2s2h/Rando/ActorBehavior/EnemyDrops.cpp Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update mm/2s2h/Rando/Logic/Regions/Miscellaneous.cpp Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update mm/2s2h/Rando/StaticData/Checks.cpp Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update mm/2s2h/Rando/Types.h Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Apply suggestion from @Eblo --------- Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
2025-10-29Bump LUS and OTRExporter, add null audio backend (#1289)Eblo
* 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
2025-10-27Port fix for soil patch Skulltula sounds (#1280)Eblo
* Port fix for soil patch Skulltula sounds * Apply Skulltula sounds fix to Skull Kid paintings
2025-10-26Fix errant merge conflict resolution (#1306)Eblo
2025-10-26Remove boost dependency (#1298)Eblo
* Remove boost dependency * Convert check pools to vectors * Convert checks and region collections to ordered
2025-10-26[Enhancement] Right Stick Ocarina (#1293)mckinlee
* right stick ocarina playback option * fix: formatting * long live GameInteractor_RightStickOcarina --------- Co-authored-by: Felix Dietrich <felixdietrich@gmail.com>
2025-10-26Use builtin extractor on linux (#1180)louist103
* Use builtin extractor on linux * Format
2025-10-18[Rando] Starting Items Rework (Cleaner Edition) (#1295)Caladius
* WIP * Reworked Starting Items * Clean up * Clean up 2 * default macro for cvar * Spoiler and Save File handling * Fix spoiler drop --------- Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
2025-10-18Do not force sequence player when using telescope (#1288)Eblo
2025-10-18[Enhancement] Add Moon Crash Cutscene Skip to Story Cutscenes time savers (#970)Joshua Sanchez
* Feat: Add Moon Crash Cutscene Skip to Misc Interactions time savers * Remove smelly unused defines in Skip Moon Crash impl Co-authored-by: Garrett Cox <garrettjcox@gmail.com> * Settings: Switch Moon Crash cutscene skip to check for SkipStoryCutscenes * Use entrance macro in Moon Crash Cutscene Skip logic * Refactor: Clean up redundant cutscene index set in Moon Crash cutscene skip * Refactor: Use latest libultraship bridge * Refactor: Move SkipMoonCrash to Story Cutscene skips folder --------- Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
2025-10-18Remove Special Characters from seed Gen (#1291)Caladius
2025-10-18Ok fine, dont shuffle swim.. see if i care! (#1292)Caladius
* Ok fine, dont shuffle swim.. see if i care! * Revert Temp Fix and update OnFileCreate * Fix syntax
2025-10-18Move `readableCheckNames` on tracker to StaticData::CheckNames, and ↵Malkierian
initialize from InitOTR. (#1296)
2025-10-15Fix search autofocus bug, increase vibrancy (#1290)Eblo
2025-10-15[Rando] Implement Triforce Hunt (#1071)Caladius
* 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
2025-10-15[Rando] Shuffle Swim (#1087)Caladius
* 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>
2025-10-15Use Item_Give in Rosa Sisters skip (#1265)Eblo
Change Rosa Sisters skip to Misc. Interaction
2025-10-15[Enhancement] Time Splits (#1266)Caladius
* Adds support for Timesplits * clanged * Fix Popout Crash * wip file saving; fixes Bow and Red Potion splits * Add Active Row Highlighting * Fix D-Pad Bottle Collection * Cleanup and Add Boss Splits. * Add names to Boss Icons * clang v2 * Linker fix * Move time formatting to ShipUtils (this also cleaned up DisplayOverlay). * clang v3 * Adds Saving/Loading splits from file. * Update inventory range to exclude heart piece. * Update column name to not be abbreviated * Adds Magic Meters and Double Defense * clang cuz ya boi alwayz fogetz * Fix Fairy Splits with CS Skip Enabled * Move songColorMap to ShipUtils along with the function to get the color. Fixed Song Icon sizing. * Adds default Window size and allows resizing. * Allow scrolling of splits list * Adds Entrance Splits and cleans up the UI. Adds new splitType to the object so I added a small solution to handle older files that may not have it for testing. * UI Update and Entrance Filters. * Adds split list to the options window to fill out the space. * Fix ID mismatching. * Add Split Comparing Functionality * clang * Compare Split text display corrections * Adds auto scrolling to follow Active Splt if list is bigger than the window. Also locks the Header Row when visible to always be visible at the top instead of scrolling with the list. * Adds Tooltips for options * Fix time coloring for splits with no previous data. * Fix crash and ID mismatch * Feedback Updates * Extern is needed since my definition is in the cpp file it seems.
2025-10-15Use correct macro for Secret Shrine freestandings (#1286)Eblo
Also can be Zora
2025-10-15Add authentic patch to Smithy chimney fire (#1285)Eblo
* Add authentic patch to Smithy chimney fire * Fix wrong comment
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-02 23:25:27 +0000