-
Notifications
You must be signed in to change notification settings - Fork 632
Blair Bravo -> develop 4-9 #5374
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Archez
merged 38 commits into
HarbourMasters:develop
from
Malkierian:blair-bravo-dev-merge
Apr 11, 2025
Merged
Blair Bravo -> develop 4-9 #5374
Archez
merged 38 commits into
HarbourMasters:develop
from
Malkierian:blair-bravo-dev-merge
Apr 11, 2025
Conversation
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
* ESC now toggles menubar * Update "menubar" to "menu" in README * Add mouse capture toggle to README
…bering the selected index, and also rework it to remove the label. (HarbourMasters#5317)
* input viewer + rang + draw + circledisp * clang
…Masters#5312) * try to fix messages, crashing on vanilla text * oops * adjust shop flavor translations to better fit on 2 lines * run clang format
* fix blank names in spoiler * replace a couple more `.english`/`.french` with `.GetEnglish()`/`.GetFrench()`
* Should cover everything, I hope * One last * final tweaks for real this time * Update soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp Co-authored-by: Extloga <[email protected]> * Update soh/soh/Enhancements/randomizer/3drando/shops.cpp Co-authored-by: Extloga <[email protected]> * Update soh/soh/Enhancements/randomizer/3drando/shops.cpp Co-authored-by: Extloga <[email protected]> * TODO_TRANSLATE is a macro no a string Hato --------- Co-authored-by: Extloga <[email protected]>
…atch the order of `enemyCvarList`. (HarbourMasters#5350)
…anks storage temple). (HarbourMasters#5348) Fix typos regarding `overridden` in various parts of the codebase.
* fix market grass and crate logic * apply clang
…#5341) * mixed pools now sets itself off when hidden * the clanging never ends
* VBVBVB * Update soh/soh/Enhancements/randomizer/hook_handlers.cpp * Update soh/soh/Enhancements/randomizer/hook_handlers.cpp * first try
* Fix copyright tex for GC JP * add 2004 texture for jp ce
* Dynamically changes a tracker's chosen color's opacity to full when it registers as docked to fix the framebuffer ghosting. * remove debugging
* Additions for the German translation in hint_list_exclude_dungeon.cpp * Additions for the German translation in hint_list_exclude_overworld.cpp * Additions for the German translation in hint_list_exclude_overworld.cpp
…ers#5347) * fix break room acces and crates underneath crates logic * apply GF_JUMP to the jump from NEAR_GS to LONG_ROOF to reach BREAK_ROOM
* Update hint_list_exclude_overworld.cpp * missing ones * Oops forgot a '
* clean up zora domain logic * revert useless short circuits
* Rearrangement of the currencies in randomizer.cpp * Rearrangement of the currencies in randomizer.cpp * Rearrangement of the currencies in randomizer.cpp * Rearrangement of the currencies in randomizer.cpp * Rearrangement of the currencies in randomizer.cpp * Rearrangement of the currencies in randomizer.cpp * Rearrangement of the currencies in randomizer.cpp * Rearrangement of the currencies in randomizer.cpp * Rearrangement of the currencies in randomizer.cpp * Rearrangement of the currencies in randomizer.cpp * Rearrangement of the currencies in randomizer.cpp * Rearrangement of the currencies in randomizer.cpp
…able that triggers a recalculation in `DrawElement()`. (HarbourMasters#5366)
…asters#5369) Add temporary additional clearing to CVarColorPicker's reset functionality to resolve already migrated issues.
* IC ledge to fountain child logic fixed * fully unblob ZF
…lity to succeed with ammo count 0. (HarbourMasters#5370)
Archez
approved these changes
Apr 11, 2025
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