develop->develop-rando#3509
Merged
leggettc18 merged 96 commits intoHarbourMasters:develop-randofrom Dec 14, 2023
Merged
Conversation
Co-authored-by: kimimaru4000 <kimimaru@posteo.net>
…rMasters#3309) * Change initialization of `areasSpoiled` to improve utilization and fix crash during max debug file creation. * Renamed `RCAreaFromSceneID` to `DungeonRCAreasBySceneID` for clarification.
* fix mq logic for ganons castle main area * update logic to use logic helpers * add hammer check * grouping
…ormat (HarbourMasters#3337) * Add a `CVarClear` inside the check for a sequence's lock to get rid of old data. * Rework all replacement and lock `CVarSetInteger` calls to call a function which checks for previous format with `CVarGet` to know if it needs clearing before setting either the lock or the sequence * Swapped everything over to a migrator where it loops through the `sequenceMap` and just clears everything from there in "gAudioEditor.ReplacedSequences"
… to regenerate (HarbourMasters#3218) * parse sohver arg and store version file in otr * parse args for soh.otr gen only * pass soh version from built in extractor * update launch scripts, cmake and extract steps to pass soh version * check otr versions and error or ask to regenerate * add wiiu core header for osfatal * review feedback * remove soh dummy version for lus change instead * only configure linux script for linux * change lus commit * rename soh version to port version * fix submodules * bump OTRExporter * clean up error messages for switch/wiiu * strings not char array * typo * init wiiu before otr detection * Add message for mac/linux extraction * remove unneeded exits * change version number types to u16 to fix 32bit devices * bump otrexporter
* vanilla bugfix for wall climbing on edge of polys * rename missed vars * add CVar toggle
…ange of interval options. (HarbourMasters#3335)
… larger) and experimental tag. (HarbourMasters#3037)
…hive), and proper file permissions (write/modify, to prevent things like Program Files or Windows, or other folders we couldn't know about that don't have proper file permissions). Instructs users as to what it discovered and how to fix, then exits. (HarbourMasters#3097)
…ers#3191) * share common scenes between mq and nonmq * move shared scenes under shared folder and bring back thieves hideout mq handling * update headers for shared scenes * bump submodules * remove mq handling for mirror world song patch * only have unique dungeons be nomq/mq variants * bump submodules
…tor search paths (HarbourMasters#3359) * fix otr regen on mac release * linux args
* Document static variables * Document enums and structs * Document some functions * Document more functions * actionParam to itemAction and fix build * Document some local variables and a define * General cleanup * Use PlayerMeleeWeaponAnimation enum when appropiate * Document some function parameters and local variables * Document some of player struct
…d()` in mods.cpp for all the cheats, and added the same full check to others that really didn't need to be running outside of a game (like infinite rupees, magic, health, etc), and clear any triggering CVars. (HarbourMasters#3441) Changed `RegisterSwitchAge()` to clear the CVar instead of setting it to 0.
…3449) * Fix text offset for MQ pal and add text ID asserts * correct lava texture size
* add gseparatearrow check for equip dupe fix * update gseparatearrows tooltip
* Hook into flagset hooks for processing check tracking. Has some manual workarounds (some breaks still need to be found). Remove areaChecks and looping functionality as redundant. * Additional vanilla handling. * Fix tracker not showing MQ checks in MQ non-rando. Fix tracker marking non-MQ variants of dungeon checks (e.g. map chest, etc) when collecting in MQ. * Set all areas to spoiled if not rando. * Revert attempt to spoil in randomizer based on MQ dungeon count as I don't know how that works at the moment. * Restore and update spoiling based on MQ dungeon settings (none, selection, or count of 12). Fix Anju As Adult check. * Remove Anchor-specific code :baguette: * Use `ClearAreaTotals()` in `Teardown()` instead of the duplicate code there. * Update to `ClearAreaChecksAndTotals()` with `vec.clear()` added. * Fix type spoiling again. Now spoils on 0 MQ dungeons, not rando, if the option is enabled in check tracker settings, selection, or set number of 12. Fix vanilla checks being marked collected in MQ dungeons. * Fix 100 GS check. * ACTUALLY fix 100 GS: change flag type to `RandomizerInf()` in `item_location.cpp`, add RC to RandoInf for it to the table. Also don't send GI for flag if father, falsely triggers ZR frogs minigame. * Fix gravedigging tour tracking. * Fix membership card check tracking. Change scene and flag values to any existing enums. Clarifying formatting for the checking loop vOrMQ conditions. * Fix Gravedigging Tour tracking. Simplify Always Win Gravedigging Tour and Fix Gravedigging Tour Glitch applications. Modified all necessary paths to use vanilla GDT PoH collection flag instead of randomizer variant. * Fix Kak Potion Shop being "seen" when entering as child.
* Add gDisableChangingSettings * Add support for dropping a config file to overwrite CVars
…void overlaps that result in dropped verts
* Fix Darunia's dancing animation speed (static for now; needs toggle later). * Moved previous code to toggleable fix in enhancements. Tweaked speed factors, partially successful.
MacReady Delta -> develop
…prove Alt toggling (HarbourMasters#3479) * set otr string paths for DList on skeleton limbs * delay toggling alt assets cvar to end of frame
…cready develop-macready -> develop
# Conflicts: # soh/soh/Enhancements/custom-message/CustomMessageTypes.h # soh/soh/Enhancements/debugger/debugSaveEditor.h # soh/soh/Enhancements/item-tables/ItemTableTypes.h # soh/soh/Enhancements/mods.cpp # soh/soh/Enhancements/randomizer/3drando/entrance.cpp # soh/soh/Enhancements/randomizer/3drando/item_location.cpp # soh/soh/Enhancements/randomizer/3drando/keys.hpp # soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp # soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp # soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_training_grounds.cpp # soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ice_cavern.cpp # soh/soh/Enhancements/randomizer/3drando/menu.cpp # soh/soh/Enhancements/randomizer/3drando/playthrough.cpp # soh/soh/Enhancements/randomizer/3drando/settings.cpp # soh/soh/Enhancements/randomizer/3drando/settings.hpp # soh/soh/Enhancements/randomizer/randomizer.cpp # soh/soh/Enhancements/randomizer/randomizerTypes.h # soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp # soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp # soh/soh/Enhancements/randomizer/randomizer_entrance.c # soh/soh/OTRGlobals.cpp # soh/src/code/z_sram.c # soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
null
Build Artifacts