summaryrefslogtreecommitdiff
path: root/mm/2s2h/ShipUtils.cpp
AgeCommit message (Collapse)Author
12 daysbump lus again (#1805)Jameriquiah
* bump lus again * woops
2026-07-21Bump LUS to port-maintenance (#1801)Jameriquiah
* bump lus to port-maintenance * clang * remove redundant cast * clang again * update lus commit
2026-07-08Expose rando inf flags in save editor (#1768)Garrett Cox
* Expose rando inf flags in save editor * Remove RANDO_INF_OBTAINED_SOUL_OF_ENEMY_ODOLWA
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-03-10Add Flippers Icon (#1586)ItsHeckinPat
2026-01-18Check Tracker Improvements (#1368)Caladius
2026-01-16UX pass on item tracker overhaul (#1460)Garrett Cox
2026-01-10Add crash handler ext (#1449)Garrett Cox
2026-01-10Tweaks to how starting items works and is stored and interacted with (#1448)Garrett Cox
* Tweaks to how starting items works and is stored and interacted with * More tweaks to clock shuffle initialization
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-11Add option to skip the soaring cutscene when warping (#1383)Jordan Longstaff
* Add option to skip the soaring cutscene when warping * Make hook functions static * Move entrances array to ShipUtils
2025-11-23[Enhancement] Item Tracker Rework (#1333)Caladius
* WIP * Items and Masks drawn * clean up * Multi Window support, clean up, and rework functionality. * Named Item Windows * Eliminate item existing more than once in a window * Add better window option handling and new requests * Add Opacity * Rewrote texture finding, added helpers, added songs and quest items. * Implement Bottles, Tokens, adjustments to options * Adds Dungeon Items * clean up dungeon items * Code Clean up * Add Set All button and dockable window option * Start of Rando (needs work) * implement rando items. needs heavy review. * add missing break * Fix wallet and tingle map icons * Fix issue with windows appearing when empty, and cleaned up UI * Add clock town stray * Requested clean up and fixes. * Update item names * Remove enum segmentation * Window Pointer * Pushing Key Colors, not too happy with the colors but I dont think I can get do better. * clang * Fix Stray Fairy Names * Fixes Item Upgrade Names * Adds Saving and Loading Layouts. * Fix Map/Compass names * Update for new save location * Update mm/2s2h/Enhancements/Trackers/ItemTracker/ItemTrackerSettings.cpp Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update mm/2s2h/Enhancements/Trackers/ItemTracker/ItemTrackerSettings.cpp Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update mm/2s2h/Enhancements/Trackers/ItemTracker/ItemTrackerSettings.cpp Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> --------- 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-26Remove boost dependency (#1298)Eblo
* Remove boost dependency * Convert check pools to vectors * Convert checks and region collections to ordered
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-18Remove Special Characters from seed Gen (#1291)Caladius
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[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-05-18[Rando] Shuffle Grass v2 (#1155)balloondude2
* Initial Commit for Grasssanity * Migrate to Whole Numbers for consistency and fix Linux/macOS crash. * baguette * Implemented Romani Ranch grass checks. * Some Grottos, ABC Enums * Randomize poisoned + cleared swamp grass. * Added more Termina Field Grottos * Fix peahat grass location * Address Grottos sharing Coors * Snowhead region (wip) * Trimmed out regrowing grass and reenumerated. * Add Snowhead Region * Add Lone Peak Shrine * Add Ikana Region * Finish Ikana grottos * Revert ActorViewer * re-add line end * Add missing grass from Smiffics Strim * Thrown Grass actors now drop their appropriate RC's * remove comment * Revert ActorViewer * ugh * Add missing Grass... again * Logic cleanup * Update using Archez suggestions * Fixing grass... finally * Initial Commit for Grasssanity * Migrate to Whole Numbers for consistency and fix Linux/macOS crash. * baguette * Implemented Romani Ranch grass checks. * Some Grottos, ABC Enums * Randomize poisoned + cleared swamp grass. * Trimmed out regrowing grass and reenumerated. * Added more Termina Field Grottos * Fix peahat grass location * Address Grottos sharing Coors * Snowhead region (wip) * Add Snowhead Region * Add Lone Peak Shrine * Add Ikana Region * Finish Ikana grottos * Revert ActorViewer * re-add line end * Add missing grass from Smiffics Strim * Thrown Grass actors now drop their appropriate RC's * remove comment * Revert ActorViewer * ugh * Add missing Grass... again * Logic cleanup * Update using Archez suggestions * Fixing grass... finally * Dev Rebase * Use Entrance Builder where applicable. * Clang * remove unneeded Ternary, thanks Archez * split regions and build * prevent rando drops when not shuffled * clang format * fix include --------- Co-authored-by: Caladius <Caladius@users.noreply.github.com> Co-authored-by: sitton76 <58642183+sitton76@users.noreply.github.com> Co-authored-by: Caladius <clatini88@gmail.com>
2025-05-18LUS update (#1142)louist103
* LUS update * Commit backend refactor * Cleanup tinyxml includes * Add LUS again * Rebase LUS * LUS bump * Point to LUS main * Fix metal * Bump LUS to test * Chagnes for removed cvar dropped file
2025-04-06Cleanup includes (#1072)louist103
* Cleanup * Format * Fixes * Update macports-deps.txt * Fix mac * Update macports-deps.txt Co-authored-by: Archez <Archez@users.noreply.github.com> * Move includes around --------- Co-authored-by: Archez <Archez@users.noreply.github.com>
2025-03-22Change vector to array (#1086)louist103
2025-03-08Implement snowball drop shuffle (#1034)Garrett Cox
Co-authored-by: Caladius <Caladius@users.noreply.github.com>
2025-03-08Item Tracker: Gold Skulltulas (#1027)Joshua Sanchez
* Add Gold Skulltulas to item tracker * Clang pass on ItemTracker.cpp * WIP: Add tint to Gold Skulltula icons * Import Magic Arrow texture into ShipUtils to serve as aura/glow for use in 2ship UI * Remove Debug color pickers from Item Tracker UI * Remove dynamic color picking from Skulltula aura tinting * Draw Skulltula with Magic Arrow aura and additional text to Skullula Tracker UI Items
2025-01-13Add additional item tracker entries (#171)Archez
* Add additional item tracker entries * fix aspect ratio for some check tracker icons
2025-01-07Fix item message iconsGarrett Cox
2025-01-03Implement Display Overlay (#127)Caladius
* Implement Display Overlay * remove comment * Migrator config * Update Modern Menu
2025-01-03Shuffles Barrels, Crates & Missed Freestanding Rupees (#125)Caladius
* Great Bay Temple Barrels * Great Bay Temple - Barrels and Crates * New Icons + Pirate Fortress * More shuffles/fixes * Stone Tower Temple + Inverted * Undo Debugging Tools. * Missed Freestanding Rupees in Snowhead Icicle room.
2025-01-02Merge branch 'develop' of ↵Garrett Cox
garrettjoecox.github.com:HarbourMasters/2ship2harkinian into develop-rando
2024-12-31Implements Check Tracker Icons (#113)Caladius
* Added Chest Icon to tracker * Adds Pot Icons and cleans up code.
2024-12-21Check Tracker Update (#76)Caladius
* Fix Hp > HP * Adds 'Click-to-Skip' check functionality * Unify Logic and Non Logic tracker configs * increase icon size to 16 and implement Total Checks * Updates from comments
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-11-27Iterate on check trackerGarrett Cox
2024-11-22Merge branch 'develop' of ↵Garrett Cox
garrettjoecox.github.com:HarbourMasters/2ship2harkinian into develop-rando
2024-11-13Fix crashing with modern menu and UIWidgets with no tooltips (#851)Archez
* Fix crashing with modern menu and UIWidgets when null is passed for tooltips * move to shiputils
2024-11-03PoC glitchless playthrough implementationGarrett Cox
2024-11-02Implement simple notifications system (#816)Garrett Cox
* Implement simple notifications system * Remove demoWindow call * Fix initializer order
2024-10-25Merge branch 'notifications' of ↵Garrett Cox
garrettjoecox.github.com:garrettjoecox/2ship2harkinian into develop-rando
2024-10-25Implement simple notifications systemGarrett Cox
2024-09-27Run clang formatGarrett Cox
2024-09-27Add boost (#15)Garrett Cox
2024-09-13[Enhancement] Actor Nametags (#746)Archez
* add new GI hooks * move collision viewer to draw hook * actor viewer tweaks; prevent crash when actors are killed * add ShipUtils * add actor name tags * add debug name tags to actor viewer * fixes * headers? * cleanup actor viewer * Add more options for actor name tags * headers * headers * ditch fmt::join cause linux package managers use old spdlog/fmt * just a little more cleanup
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-05 05:16:58 +0000