Merge Sulu Bravo -> develop #3121
Merged
Conversation
This file contains 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
…urMasters#3026) Co-authored-by: briaguya <briaguya@alice>
Co-authored-by: briaguya <briaguya@alice>
…urMasters#3045) * fix pal11 ganondorf falling platform offsets * fix pal11 dins fire offsets * add game region and platform methods * fix pal11 file menu options * move
* Change Granny's Shop collection type to RandomizerInf with proper scene and inf IDs so the tracker tracks it properly. * Changed pendingSale code to be checked outside of decrementing if block.
…w textbox while putaway is happening (HarbourMasters#3103) * Add check for animation count to prevent continuing final saw textbox while putaway is happening. * Added Fix toggle for it. Enabling Skip Text forces the behavior, regardless of previous selection for the Fix toggle itself (so it works if you have the Fix toggle enabled, or if you have Skip Text enabled). * Clarified the comment in `z_en_toryo`.
…asters#3066) * Reduce length of overflow prone item names * Overhaul Trick Names and change Desert Waterfall to Valley waterfall * Readd some old Trick names, Change Trick name table to a vector, improve french translations. * Resolve HarbourMasters#2682
* rewrite the logic to check for CRC32 at runtime * fix include for windows * fix pragmas * more clang fixes * MORE * Please apple * I hate this * MAC AGAIN * Clarify the ifdefs * ARM64 fixes
* fix rando gen crash when not enough remaining items to place * fix rando gen crash due to missing granny shop hint * add error sound if rando gen fails
* tweak kaleido tts * tts announce what items are assigned to buttons; announce page on open
…ump (HarbourMasters#3119) * implement for install method packagers * use std::filesystem::temp_directory_path * absolutely impeccable * include libultraship proof * fix windows compilation * rename "Installation" back to "Bundle" --------- Co-authored-by: Alto1772 <56553686+Alto1772@users.noreply.github.com>
garrettjoecox
approved these changes
Aug 14, 2023
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.
Merging Sulu Bravo to develop
Addressed merge conflicts
Build Artifacts