Archez
824c203b97
Merge pull request #5374 from Malkierian/blair-bravo-dev-merge
...
Blair Bravo -> develop 4-9
2025-04-11 17:20:08 -04:00
Malkierian
7e78694aee
Merge branch 'develop-blair' of github.com:HarbourMasters/Shipwright into develop
2025-04-09 16:12:46 -07:00
Christopher Leggett
85bc67ef24
Blair Bravo version bump ( #5372 )
2025-04-09 19:04:28 -04:00
Malkierian
a99e8836fb
Allow seeded enemy rando to use the values of the enemy list selection. ( #5371 )
2025-04-09 18:18:44 -04:00
Malkierian
c12349a7a3
Add check for bean inventory slot having bean on it to allow availability to succeed with ammo count 0. ( #5370 )
2025-04-09 16:58:06 -04:00
Pepper0ni
73400f5856
IC ledge to fountain child logic fixed ( #5368 )
...
* IC ledge to fountain child logic fixed
* fully unblob ZF
2025-04-09 16:46:43 -04:00
Malkierian
e98a6c3748
Fix migrators for tracker colors to match new menu formats. ( #5369 )
...
Add temporary additional clearing to CVarColorPicker's reset functionality to resolve already migrated issues.
2025-04-09 16:38:27 -04:00
Malkierian
c3322c85ae
Swap call to RecalculateAvailableChecks() in SaveFile() to a variable that triggers a recalculation in DrawElement(). ( #5366 )
2025-04-09 15:26:20 -04:00
Extloga
c21c632c09
Additions for the currencies in randomizer.cpp ( #5344 )
...
* 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
2025-04-09 15:24:05 -04:00
Pepper0ni
93d49d5c41
Fix ZD beehives and some small cleanup. ( #5353 )
...
* clean up zora domain logic
* revert useless short circuits
2025-04-09 15:17:25 -04:00
Christopher Leggett
cf75520394
Fix crash in Message Viewer when playing with an NTSC OTR. ( #5367 )
2025-04-09 15:16:25 -04:00
Eric Hoey
9250af0216
add check for agony option ( #5365 )
2025-04-09 13:01:26 -04:00
Christopher Leggett
2576f75b1a
Fix non-loach fish making it into the pool when Loach Only is selected. ( #5360 )
2025-04-09 12:20:37 -04:00
PurpleHato
30520a7565
Rando: Last missing french + tiny tweak ( #5359 )
...
* Update hint_list_exclude_overworld.cpp
* missing ones
* Oops forgot a '
2025-04-09 11:35:39 -04:00
Pepper0ni
f2161297a8
Fix break room access and crates underneath crates logic ( #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
2025-04-09 11:21:22 -04:00
Extloga
c1885991fa
Additions for the German translation in two files ( #5351 )
...
* 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
2025-04-08 16:31:52 -04:00
Malkierian
f5e0179e2b
Fix a couple typos in enhancement descriptions. ( #5358 )
2025-04-08 11:44:24 -07:00
Malkierian
f0f6259d2f
Fix Docked Tracker Ghosting ( #5354 )
...
* Dynamically changes a tracker's chosen color's opacity to full when it registers as docked to fix the framebuffer ghosting.
* remove debugging
2025-04-08 10:22:25 -07:00
Archez
1b17fea3d0
Add temporary patch for invisible boulder fragments ( #5352 )
2025-04-08 12:53:39 -04:00
Archez
88669742a2
Fix copyright tex for GC JP ( #5324 )
...
* Fix copyright tex for GC JP
* add 2004 texture for jp ce
2025-04-08 08:38:28 -07:00
Eric Hoey
4a3d60d061
Fix Rando Give for Adult Fishing as Child Glitch ( #5349 )
...
* VBVBVB
* Update soh/soh/Enhancements/randomizer/hook_handlers.cpp
* Update soh/soh/Enhancements/randomizer/hook_handlers.cpp
* first try
2025-04-08 11:27:08 -04:00
Pepper0ni
d40fa00b9e
Mixed pools now properly disables itself when hidden. ( #5341 )
...
* mixed pools now sets itself off when hidden
* the clanging never ends
2025-04-08 08:26:18 -07:00
Pepper0ni
88154d78c8
Fix Market Grass and Crate logic ( #5340 )
...
* fix market grass and crate logic
* apply clang
2025-04-08 08:26:04 -07:00
Malkierian
ae7654cb0e
Change check total array types to s16 to handle more check totals (thanks storage temple). ( #5348 )
...
Fix typos regarding `overridden` in various parts of the codebase.
2025-04-08 10:13:08 -04:00
Malkierian
71bd48cba9
Move the white iron knuckle entry in randomizedEnemySpawnTable to match the order of enemyCvarList. ( #5350 )
2025-04-08 07:45:35 -04:00
Christopher Leggett
b71a0c5803
Fix checking gSaveContext for used small keys ( #5346 )
2025-04-07 19:07:07 -04:00
PurpleHato
4acbf799cc
French Rando : Add missing text + some tweaks ( #5327 )
...
* 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 <141232749+Extloga@users.noreply.github.com>
* Update soh/soh/Enhancements/randomizer/3drando/shops.cpp
Co-authored-by: Extloga <141232749+Extloga@users.noreply.github.com>
* Update soh/soh/Enhancements/randomizer/3drando/shops.cpp
Co-authored-by: Extloga <141232749+Extloga@users.noreply.github.com>
* TODO_TRANSLATE is a macro no a string Hato
---------
Co-authored-by: Extloga <141232749+Extloga@users.noreply.github.com>
2025-04-07 18:34:56 -04:00
briaguya
98146c29f9
fix blank names in spoiler ( #5329 )
...
* fix blank names in spoiler
* replace a couple more `.english`/`.french` with `.GetEnglish()`/`.GetFrench()`
2025-04-07 17:24:24 -04:00
Pepper0ni
c351a2cf75
Fix shop translations and unify untranslated message alerts. ( #5312 )
...
* try to fix messages, crashing on vanilla text
* oops
* adjust shop flavor translations to better fit on 2 lines
* run clang format
2025-04-07 17:22:23 -04:00
Eric Hoey
497f90a392
Set Savewarp in Ganondorf to Ganon's Tower in Entrance Rando ( #5339 )
2025-04-07 13:27:47 -04:00
Eric Hoey
a247c06be8
Various menu fixes ( #5321 )
...
* input viewer + rang + draw + circledisp
* clang
2025-04-04 18:49:03 -04:00
Christopher Leggett
ee23d02921
move AltAssets to gSettings from gEnhancements ( #5323 )
2025-04-04 15:25:30 -04:00
Archez
2589448057
Fix boss title card extraction for NTSC; Fix Morpha water ( #5320 )
2025-04-04 11:57:37 -04:00
Malkierian
cb7d9279e4
Fix the GS Map combobox in the Flags tab of the save editor not remembering the selected index, and also rework it to remove the label. ( #5317 )
2025-04-04 11:00:05 -04:00
Christopher Leggett
38574bbb9e
Fix excluded locations on subsequent seed generations ( #5302 )
2025-04-04 10:15:04 -04:00
Christopher Leggett
e2bb2edb8a
Fix the start with Master Sword option ( #5304 )
2025-04-04 10:14:23 -04:00
Archez
f37c3aa228
clang-format .hpp files ( #5307 )
...
* Add hpp files to clang-format script
* clang-format hpp files
2025-04-03 23:33:35 -04:00
PBillodeau
9a78b04e68
ESC now toggles menubar ( #5293 )
...
* ESC now toggles menubar
* Update "menubar" to "menu" in README
* Add mouse capture toggle to README
2025-04-03 17:33:02 -07:00
Pepper0ni
4f783d5945
fix oversight causing big poes check not to run ( #5303 )
2025-04-03 16:47:56 -04:00
Archez
2deea6e105
Better verbose output for clang-format ( #5306 )
2025-04-03 15:23:47 -04:00
Philip Dubé
ef8fa17e7c
simplify clang-format script ( #5274 )
...
checked that -print0 & -0 also exist in apple's manpages
2025-04-03 00:36:10 -04:00
Philip Dubé
1e51f1e162
Cleanup whitespace ( #5281 )
2025-04-03 00:16:52 -04:00
inspectredc
fd96bf6b14
Fix Disable Bomb Billboarding ( #5290 )
2025-04-03 00:06:16 -04:00
Archez
1c248ded02
Bump Blair Alfa ( #5283 )
2025-04-02 16:21:47 -04:00
aMannus
dc20abe10b
Fix upgrade crash in rando settings ( #5282 )
2025-04-02 15:59:04 -04:00
Malkierian
58925bc770
More check renames ( #5262 )
...
* Rename a few more entrances to better match interior contents, and a lot of check names to match their grotto names.
* Undo debug commit. Now it's just text changes.
2025-04-02 10:24:01 -07:00
inspectredc
ccb7839eda
Reload font on language change ( #5279 )
2025-04-02 12:38:12 -04:00
inspectredc
c5e0e32391
Fix Names On Custom Message ( #5278 )
...
* Fix Names On Custom Message
* Display Blank Name
* format
2025-04-02 09:45:51 -04:00
inspectredc
2476a7752d
Use sOptionsMenuSettings to avoid OOB read ( #5277 )
2025-04-02 07:56:30 -04:00
inspectredc
a5a80bd8a2
Fix Crash On Play Scene Inits ( #5276 )
2025-04-02 07:40:43 -04:00
