aMannus
|
fe413fd675
|
Set key colors to be on by default
|
2022-09-04 23:09:17 +02:00 |
|
Garrett Cox
|
45fc416963
|
Swap german and french translations for shop messages
|
2022-09-04 15:25:37 -05:00 |
|
Garrett Cox
|
ad1e051b59
|
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity
|
2022-09-04 15:23:18 -05:00 |
|
PurpleHato
|
a6937e9850
|
added hovertext for the number display
|
2022-09-04 21:31:50 +02:00 |
|
Garrett Cox
|
adb7ce773e
|
Merge pull request #3 from leggettc18/pr/garrettjoecox/1329
Implement's Tycoon Wallet.
|
2022-09-04 14:30:47 -05:00 |
|
Garrett Cox
|
f282e25c16
|
Move all merchant messages to be generated on file load
|
2022-09-04 13:53:59 -05: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 |
|
Christopher Leggett
|
9e617f8923
|
Implement's Tycoon Wallet.
|
2022-09-04 12:32:07 -04: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 |
|
Garrett Cox
|
8a3d1352d7
|
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity
|
2022-09-03 17:39:11 -05: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 |
|
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 |
|
Sarge-117
|
2b540df7ea
|
Update logic Cvar name
|
2022-09-03 12:57:46 -07:00 |
|
Sarge-117
|
a260f680d1
|
Merge branch 'rando-next' into rando-enhanced-magic-arrows
|
2022-09-03 12:17:23 -07: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 |
|
Sarge-117
|
e1da7bf9af
|
Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows
|
2022-09-03 11:58:38 -07:00 |
|
aMannus
|
6cd8d6ca3a
|
Clean up bool
|
2022-09-03 20:48:00 +02:00 |
|
Sarge-117
|
b31b1ef157
|
Restore checkboxes in menu
Accidentally lost these during merge
|
2022-09-03 11:43:31 -07:00 |
|
Sarge-117
|
5a9540585a
|
Simplify mudwall collision check
|
2022-09-03 11:35:19 -07:00 |
|
aMannus
|
8d033c6766
|
Update settings.cpp
|
2022-09-03 20:29:45 +02:00 |
|
Sarge-117
|
0151294648
|
Simplify mudwall collision check
There was no need to have a second collider specifically for Ice Arrow hits
|
2022-09-03 11:24:17 -07: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 |
|
Sarge-117
|
a397b07ec4
|
Update location access logic
Including MQ locations in Spirit and GC now
|
2022-09-03 10:37:14 -07: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 |
|
Sarge-117
|
bb04e9d97d
|
Restore checkboxes to enhancements menu
These got lost in the merge
|
2022-09-03 09:57:35 -07:00 |
|
Sarge-117
|
43372155f2
|
Fix mistake from merge
oops
|
2022-09-03 09:39:42 -07:00 |
|