Garrett Cox
|
0ab4f21382
|
Fix issue when merchantPrices is empty
|
2022-09-05 22:14:39 -05:00 |
|
briaguya
|
885d6dc6c2
|
Merge pull request #1422 from garrettjoecox/scrubs-trials-persist
Add merchantPrices to save file instead of loading from active spoiler log
|
2022-09-05 19:41:58 -04:00 |
|
briaguya
|
803ef49f6d
|
Merge pull request #1416 from aMannus/rando-skip-mask-shop-fix
Rando: Fix Complete Mask Quest & Mask Select interaction bugs
|
2022-09-05 19:27:00 -04:00 |
|
briaguya
|
bafd016cd9
|
Merge pull request #1413 from aMannus/rando-key-colors-default
Rando: Enable key colors matching dungeon by default
|
2022-09-05 19:09:37 -04:00 |
|
Garrett Cox
|
96a3354d45
|
Remove trialsRequired persisting in save manager
|
2022-09-05 15:12:30 -05:00 |
|
Garrett Cox
|
1c13fdec5f
|
Add trials required and merchant prices to save file instead of loading from active spoiler log
|
2022-09-05 14:55:34 -05:00 |
|
aMannus
|
fb5aff393a
|
tooltip line break
|
2022-09-05 16:54:02 +02:00 |
|
aMannus
|
9afe3ca746
|
Fix gerudo keys, add disabled checkbox
|
2022-09-05 16:48:59 +02:00 |
|
aMannus
|
39852c9278
|
Fix Sold Out bug
|
2022-09-05 11:46:50 +02:00 |
|
aMannus
|
983ab139d5
|
Add another flag to skip mask shop
|
2022-09-05 00:35:56 +02:00 |
|
briaguya
|
87a78cf87c
|
Merge pull request #1405 from PurpleHato/TrackerAmmoFix
Rando: Item Tracker currentAndMax rework
|
2022-09-04 18:35:46 -04:00 |
|
aMannus
|
fe413fd675
|
Set key colors to be on by default
|
2022-09-04 23:09:17 +02:00 |
|
PurpleHato
|
a6937e9850
|
added hovertext for the number display
|
2022-09-04 21:31:50 +02:00 |
|
PurpleHato
|
47c7d3f061
|
always display XX/YY when in ammo/capacity mode
|
2022-09-04 20:39:56 +02:00 |
|
PurpleHato
|
e11ca62ee1
|
small tweaks and rename
|
2022-09-04 20:09:48 +02:00 |
|
PurpleHato
|
2c241d5fe8
|
Merge branch 'rando-next' into TrackerAmmoFix
|
2022-09-04 19:57:56 +02:00 |
|
PurpleHato
|
7a222f9d0f
|
Merge pull request #20 from garrettjoecox/item-tracker-count-adjustments
Refactor DrawItemCount and Use EnhancementCombobox for tracker capacity options
|
2022-09-04 19:39:01 +02:00 |
|
Garrett Cox
|
6bf886ecae
|
Refactor DrawItemCount and Use EnhancementCombobox for tracker capacity options
|
2022-09-04 11:55:40 -05:00 |
|
briaguya
|
2c63321638
|
Merge pull request #1407 from garrettjoecox/item-tracker-notes-fix
Ensure itemTrackerNotes vector is not fully empty in InitItemTracker
|
2022-09-04 07:47:01 -04:00 |
|
Garrett Cox
|
1bbde39439
|
Ensure itemTrackerNotes vector is not fully empty
|
2022-09-04 02:06:42 -05:00 |
|
briaguya
|
6439c45f26
|
Merge pull request #1402 from garrettjoecox/beans-obtainability-fix
Fix for beans obtainability
|
2022-09-03 20:04:11 -04:00 |
|
PurpleHato
|
6dbc292ff3
|
Fix: changes to please new LUS
|
2022-09-04 01:22:15 +02:00 |
|
PurpleHato
|
ed96a0c272
|
Merge branch 'rando-next' into TrackerAmmoFix
|
2022-09-04 01:08:26 +02:00 |
|
PurpleHato
|
27f613b3f8
|
All color logic for all types
|
2022-09-04 01:03:28 +02:00 |
|
briaguya
|
e55ec29d66
|
Merge pull request #1396 from garrettjoecox/item-tracker-notes
Persist item tracker notes
|
2022-09-03 18:40:32 -04:00 |
|
PurpleHato
|
d4bc5875d7
|
tweak on main logic
|
2022-09-03 23:49:15 +02:00 |
|
Garrett Cox
|
77a5d03019
|
Hook into file delete and clear notes
|
2022-09-03 15:46:33 -05:00 |
|
Garrett Cox
|
72660e2cfd
|
Fix for beans obtainability
|
2022-09-03 15:28:59 -05:00 |
|
PurpleHato
|
377c030469
|
Fixed capacity on ammmo tracking
|
2022-09-03 21:57:58 +02:00 |
|
briaguya
|
d90145da47
|
Merge pull request #1391 from aMannus/rando-skip-scarecrow
Rando: Add Skip Scarecrow's Song option
|
2022-09-03 15:04:58 -04:00 |
|
briaguya
|
8e49f0465c
|
Merge pull request #1399 from aMannus/rando-bombchu-drops
Rando: Add Bombchu Drops
|
2022-09-03 15:03:30 -04:00 |
|
aMannus
|
6cd8d6ca3a
|
Clean up bool
|
2022-09-03 20:48:00 +02:00 |
|
aMannus
|
8d033c6766
|
Update settings.cpp
|
2022-09-03 20:29:45 +02:00 |
|
aMannus
|
ae0ccb9cca
|
Missing break
|
2022-09-03 20:18:54 +02:00 |
|
aMannus
|
274242e0d7
|
Implement rando bombchu drops
|
2022-09-03 20:17:12 +02:00 |
|
briaguya
|
cbc181bc0a
|
Merge pull request #1392 from lilDavid/re-add_progressive_chus
Reimplement progressive Bombchus + fix bowling Bombchu prize
|
2022-09-03 14:13:17 -04:00 |
|
briaguya
|
98dbbfda13
|
Merge pull request #1395 from leggettc18/starting-bgs
Fixes Link starting with BGS
|
2022-09-03 13:36:12 -04:00 |
|
briaguya
|
1f7122025f
|
Merge pull request #1394 from leggettc18/leggettc18/issue1390
Rando-next: Fixes Enemy Drops giving a blue rupee
|
2022-09-03 13:33:19 -04:00 |
|
Garrett Cox
|
b92b1eaee6
|
Use SohImGui::RequestCvarSaveOnNextTick
|
2022-09-03 09:33:54 -05:00 |
|
Garrett Cox
|
90bf5988ee
|
Adjust Hooks include
|
2022-09-03 09:30:53 -05:00 |
|
Garrett Cox
|
8be6f6e441
|
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into item-tracker-notes
|
2022-09-03 09:19:14 -05:00 |
|
Garrett Cox
|
ed8966054c
|
Persist item tracker notes
|
2022-09-03 09:15:05 -05:00 |
|
Christopher Leggett
|
e079c254f1
|
Fixes Link starting with BGS
|
2022-09-03 09:39:03 -04:00 |
|
Christopher Leggett
|
5421ad27c9
|
Rando-next: Deku Nut and Seed ammo gives a blue rupee
Fixes #1390
|
2022-09-03 09:24:37 -04:00 |
|
lil David
|
f5fae6df32
|
Reimplement progressive Bombchus
|
2022-09-03 08:11:51 -05:00 |
|
aMannus
|
8d2f63419f
|
Implement Skip Scarecrow's Song
|
2022-09-03 14:40:41 +02:00 |
|
aMannus
|
3aefd4c519
|
gSaveContext access in GameMenuBar.cpp
|
2022-09-03 12:47:32 +02:00 |
|
briaguya
|
431231f2be
|
Merge pull request #1388 from briaguya-ai/z-to-rando-next
zhora -> rando-next
|
2022-09-03 06:10:09 -04:00 |
|
briaguya
|
007540fb39
|
Merge branch 'develop-zhora' into z-to-rando-next
|
2022-09-03 05:55:40 -04:00 |
|
aMannus
|
f1dc980de8
|
Fixed autobreak after ImGui cleanup
|
2022-09-03 05:52:01 -04:00 |
|