 Sarge-117
|
100d83151e
|
Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows
|
2022-09-06 12:43:13 -07:00 |
|
|
Sarge-117
|
9e6defe1b5
|
Fix merge mistake
|
2022-09-06 12:21:06 -07:00 |
|
|
Sarge-117
|
99b9531cfd
|
Merge branch 'zhora-magic-arrows' into rando-enhanced-magic-arrows
|
2022-09-06 11:10:46 -07:00 |
|
|
Sarge-117
|
37acd52016
|
Clarify var names and comments
|
2022-09-06 11:05:52 -07:00 |
|
|
Sarge-117
|
5991be8256
|
Remove !=0 from cvar check
|
2022-09-06 10:57:08 -07:00 |
|
|
Sarge-117
|
a73729b9b1
|
Clarify var names and comments
Also preserve chain platform cutscene in spirit based on Link's position
|
2022-09-06 10:40:26 -07:00 |
|
|
Sarge-117
|
a999a51998
|
Merge remote-tracking branch 'upstream/develop-zhora' into zhora-magic-arrows
|
2022-09-06 08:50:37 -07:00 |
|
|
aMannus
|
3b844375b7
|
Add missing pendingFlags (#1414)
|
2022-09-06 11:27:26 +02:00 |
|
|
briaguya
|
8d75603e4b
|
Merge pull request #1425 from garrettjoecox/1471-fix-shooting-gallery-rando-check
Fix #1417
|
2022-09-06 01:30:37 -04:00 |
|
|
briaguya
|
d2682998c4
|
Merge pull request #1423 from garrettjoecox/fix-for-scrubs-being-disabled
Fix issue when merchantPrices is empty
|
2022-09-06 01:05:16 -04:00 |
|
|
Sarge-117
|
db9f608177
|
Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows
|
2022-09-05 21:41:18 -07:00 |
|
|
Garrett Cox
|
a99330a8a5
|
Fix #1417
|
2022-09-05 23:34:52 -05:00 |
|
|
Garrett Cox
|
c9c648322d
|
Fix for a single zeroed merchantPrice entry
|
2022-09-05 22:30:39 -05:00 |
|
|
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 |
|
|
Sarge-117
|
da7dc55317
|
Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows
|
2022-09-04 20:18:54 -07:00 |
|
|
Sarge-117
|
5aaaccb72d
|
Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows
|
2022-09-04 15:36:12 -07: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 |
|
|
Sarge-117
|
347154c4d1
|
Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows
|
2022-09-03 22:31:21 -07: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 |
|
|
Sarge-117
|
938ecef131
|
Tooltip wording + line break
|
2022-09-03 14:27:27 -07:00 |
|
|
Sarge-117
|
e9822eed62
|
Add line break in tooltip
|
2022-09-03 14:25:47 -07:00 |
|
|
Sarge-117
|
dc4d8e322b
|
Update tooltip
|
2022-09-03 14:19:59 -07:00 |
|
|
Sarge-117
|
27e58842b0
|
Update tooltip
To inform the player that they might have to reload the room if they're enabling this for the first time.
|
2022-09-03 14:10:39 -07:00 |
|
|
Sarge-117
|
9b841c428a
|
Merge pull request #11 from aMannus/rando-magical-arrows
Incorporate magic arrows in rando settings
|
2022-09-03 14:05:49 -07:00 |
|
|
Sarge-117
|
4c6aeb9fb0
|
Merge branch 'rando-enhanced-magic-arrows' into rando-magical-arrows
|
2022-09-03 14:05:37 -07:00 |
|
|
aMannus
|
70ab1406e1
|
Incorporate magic arrows in rando settings
|
2022-09-03 22:56:09 +02:00 |
|
|
Garrett Cox
|
77a5d03019
|
Hook into file delete and clear notes
|
2022-09-03 15:46:33 -05:00 |
|