Merged
Conversation
* Bump ZAPDTR & OTRExporter. Changes to use o2r by default Changes to the new player animation format # Conflicts: # OTRExporter # ZAPDTR # soh/soh/OTRGlobals.cpp # soh/src/code/z_skelanime.c * Fix actions * Format * Cherry pick ZAPDTR * Update exporter * Move configs to port * Remove copy * Remove more XML copies * Remove extractor directory from actions builds. * Fix OTRExporter for linux * FIx ZAPD volatile * Format * Fix extractor? * Fix linux * Fix * Remove appimage stuff * Screnity now * Remove ZAPD from install paths * Remove soh.sh.in * Fix linux * Cleanups and use a thread for message box
* more tricks 1. big poe without epona 2. king dodongo with chu 3. morpha without hookshot 4. open underwater chests (ignore water temple usage for now because water logic is weird) 5. DC MQ stairs without stick, also bring over vanilla alternatives for stairs rename RT_DC_STAIRCASE to RT_DC_STAIRS_WITH_BOW * consistency
…#5338) * Separate HBA range * Separate 4 rooftop regions * Rest of rooftops * Small cleanup * Whoops * Create `thieves_hideout.cpp` & move `gerudo_fortress.cpp` * Ground and some inside * More outside cleanup and more inside * Kitchen * Final tweaks * Use `TH_` prefix for Thieves' Hideout locations * Add clarifying images (+ `.xcf` source) * Thieves' Hideout is overworld * Fix `RC_GF_GS_TOP_FLOOR` & blue -> violet entrance * Address review * Update gerudo_fortress.cpp * Address review * Split "CarpenterRescue" * Rename events * Update logic.cpp * Move from function to event * Rename most of the regions * Address review * Add new conections * update logic, get it working * apply clang format * undo clang format in logic files * final reordering * remove additions to .gitIgnore * Fix some jump trick logic * clean up ShufflePots * fix submodules * update for review and talk to jail and always gate PRs * change thieves hideout to scene handling * final fixes and update enum names and hint text --------- Co-authored-by: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>
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.
Test