Skip to content

Conversation

@Malkierian
Copy link
Contributor

@Malkierian Malkierian commented Apr 9, 2025

inspectredc and others added 30 commits April 3, 2025 00:06
* 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]>
…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
Extloga and others added 8 commits April 9, 2025 15:24
* 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
@Archez Archez merged commit 824c203 into HarbourMasters:develop Apr 11, 2025
6 checks passed
@Malkierian Malkierian deleted the blair-bravo-dev-merge branch May 17, 2025 23:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants