Eric Hoey
17ed54dbc5
add DC boss switch exception + tooltip ( #5447 )
2025-04-29 17:20:04 -04:00
Pepper0ni
5734be1e20
ItemList now accepts custom draw as an argument
2025-04-28 19:36:49 +01:00
Pepper0ni
343935cbc0
use a function to add items and avoid repeating the get
2025-04-28 14:53:17 +01:00
Pepper0ni
b705fc2f45
small comment change
2025-04-24 18:15:08 +01:00
Pepper0ni
a0e2a23463
fix Triforce Hint Text
2025-04-24 18:08:58 +01:00
Pepper0ni
50cfa58bdc
fix progressives having a price
2025-04-24 17:38:24 +01:00
Pepper0ni
56982bea37
generation failing
2025-04-24 01:46:16 +01:00
Pepper0ni
d7f411edfd
Merge branch 'develop' into ItemName
2025-04-23 23:07:46 +01:00
Pepper0ni
fdb6f42ec7
remove playthrough and progressive
2025-04-23 23:06:57 +01:00
Eric Hoey
fec676bbf8
Fix C-Down Position with Anchor Left ( #5423 )
2025-04-23 17:29:44 -04:00
briaguya
3d3d9c5226
add some imgui ids in input editor ( #5439 )
...
* add some imgui ids in input editor
* clang format
2025-04-22 20:39:10 -07:00
Malkierian
8a8ea676ba
Prevents hidden button combo setting from hiding the personal notes window when window type is Window. ( #5441 )
2025-04-22 20:38:45 -07:00
Pepper0ni
103a36e5fe
fix MQGTG right side resetting ( #5442 )
2025-04-22 20:38:14 -07:00
Pepper0ni
3c4f38e2f0
make sure adult is spawned for big poe check ( #5431 )
2025-04-22 17:16:16 -07:00
Pepper0ni
fbbfc07ff1
port over autoFunc punctuation changes and translations ( #5426 )
...
---
Co-authored-by: PurpleHato <47987542+PurpleHato@users.noreply.github.com>
Co-authored-by: amafresh <arminamayeh@gmail.com>
2025-04-21 14:21:42 -07:00
Pepper0ni
29af294b0c
fix TODO_TRANSLATE language replacement in cases where the text is already formatted ( #5415 )
...
* fix TODO_TRANSLATE language replacement in cases where the text is already formatted
* oops
2025-04-17 10:22:12 -04:00
Malkierian
52a3058926
Merge pull request #5409 from Malkierian/blair-charlie-dev-merge
...
Blair Charlie to Develop
2025-04-15 16:15:51 -07:00
Malkierian
14907a24b0
Merge branch 'develop-blair' of github.com:HarbourMasters/Shipwright into develop
2025-04-15 15:44:16 -07:00
Christopher Leggett
1b6dc13491
Blair Charlie version bump ( #5407 )
2025-04-15 14:27:55 -04:00
Malkierian
02ef33393a
Implements a rand inf for Ruto's letter to apply to logic to track it separate from the underwater item check. ( #5405 )
2025-04-15 13:13:30 -04:00
Archez
5ae8ce4eac
Fix Entrance Rando weather override behavior ( #5403 )
...
* Add AfterSceneCommands hook
* move ER weather override to AfterSceneCommands
2025-04-14 19:11:36 -04:00
Malkierian
5e399fe7a2
Race Lockout ( #5364 )
...
* Implement race lockout on the new menu, with option for opt-out.
* Cal's requests.
2025-04-13 19:29:29 -04:00
Pepper0ni
228ad0bfcb
post merge moves and more TODO_TRANSLATE
2025-04-13 14:29:12 +01:00
Pepper0ni
749a241da0
Merge branch 'develop' into ItemName
2025-04-13 14:27:12 +01:00
Jordan Longstaff
46b40b0220
Fix misspelling of Broken Giant's Knife fix CVar ( #5395 )
2025-04-12 12:12:48 -04:00
Malkierian
1416b2490a
Change the Reset All callback back to CosmeticsEditor_ResetAll, because it's already set up to not reset HUD position stuff. ( #5385 )
2025-04-12 09:14:13 -04:00
Pepper0ni
f304de2eb1
fix oversight in forest trial first room ( #5381 )
2025-04-11 22:56:47 -04:00
Malkierian
fc0cbbe9e7
Improve tracker dock bgs ( #5383 )
...
* Modify the flow for applying opacity to docked tracker windows only when they are docked to the "Main - Deck" dockspace.
* Add opacity clamping for check tracker.
2025-04-11 22:54:52 -04:00
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
f0f2157a4c
Move processing for RAND_INF_WEIRD_EGG to trade item processing so it happens whenever you get the egg. ( #5382 )
...
Remove RSK check for garden entrance because access is still handled by `CanUse(RG_WEIRD_EGG)`.
2025-04-11 15:49:34 -04:00
Proloe
698fca8862
Fixed right stick aiming being significantly less precise than left stick aiming. ( #5388 )
2025-04-11 15:44:40 -04:00
Archez
86e1e8e3aa
Fix boss key kaleido text for NTSC ( #5389 )
2025-04-11 13:42:08 -04:00
Christopher Leggett
05e96f310d
Fix Fishing-related checks location pool (again) ( #5378 )
2025-04-11 10:15:31 -04:00
Eric Hoey
a93917bb4a
Fix Adult Fishing as Child Softlock ( #5377 )
...
* pass a pointer not a pointer to a pointer
* update GIVanillaBehavior comment
* also drop this
2025-04-10 17:14:25 -04:00
Malkierian
9783f918d2
Add ImGuiWindowFlags_NoSavedSettings to notification windows to prevent cluttering the imgui.ini ( #5380 )
2025-04-10 09:50:35 -04:00
Malkierian
1791a0c52c
Fix input viewer's first-open position calculation. ( #5376 )
2025-04-10 09:49:21 -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
