aMannus
|
49b48fb7a4
|
Fix BGS and maps/keys textboxes
|
2022-08-25 19:56:34 +02:00 |
|
aMannus
|
9fda6a0764
|
Merge branch 'rando-next' into tokensanity-bgs-fix
|
2022-08-25 19:27:55 +02:00 |
|
Christopher Leggett
|
efd4ceb636
|
Colors keywords in bean salesman text.
|
2022-08-25 12:46:08 -04:00 |
|
Christopher Leggett
|
6ab13f389b
|
Fixes salesman to properly take 60 rupees from you.
|
2022-08-25 12:43:19 -04:00 |
|
Christopher Leggett
|
00838cb5b6
|
Adds french text for the bean salesman
|
2022-08-25 12:39:34 -04:00 |
|
briaguya
|
9f60a97307
|
Merge pull request #1303 from aMannus/rando-skulls-winnerpoh-fix
Rando: Fix Winner PoH on skulltula's
|
2022-08-25 12:23:29 -04:00 |
|
briaguya
|
8a4c196566
|
Merge pull request #1312 from garrettjoecox/randomizer-inf
Transition to randomizerInf flags
|
2022-08-25 12:19:55 -04:00 |
|
aMannus
|
c22951353e
|
Renamed function
|
2022-08-25 18:04:52 +02:00 |
|
briaguya
|
ed5a2d8a42
|
Merge pull request #1307 from aMannus/rando-menu-tweaks
Rando: Small menu tweaks
|
2022-08-25 11:57:03 -04:00 |
|
aMannus
|
69157640f6
|
Removed BGS flag in Item_Give()
|
2022-08-25 17:34:45 +02:00 |
|
Garrett Cox
|
5e9d1d61f1
|
Fix minor thing in sram
|
2022-08-25 10:34:39 -05:00 |
|
Garrett Cox
|
f7bd48aaca
|
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into randomizer-inf
|
2022-08-25 10:27:34 -05:00 |
|
Garrett Cox
|
95372718a3
|
Transition a few things to randomizerInf flags
|
2022-08-25 10:27:31 -05:00 |
|
Christopher Leggett
|
90067be132
|
Fixes Dungeon Rewards from Song from Impa (#1311)
|
2022-08-25 17:19:17 +02:00 |
|
aMannus
|
9787f9d4f2
|
Swap hints & item pool
|
2022-08-25 16:34:48 +02:00 |
|
Christopher Leggett
|
5842beeb55
|
Fixes Bean Pack item from chest.
|
2022-08-25 10:11:35 -04:00 |
|
Christopher Leggett
|
ef1b662bf4
|
Finishes wiring up bean salesman settings and text.
|
2022-08-25 09:42:15 -04:00 |
|
briaguya
|
4ca146b4e1
|
Merge pull request #1299 from aMannus/bgs-dupe-fix
Rando: Fix BGS dupe check
|
2022-08-25 07:49:10 -04:00 |
|
briaguya
|
9b972c6e4a
|
Merge pull request #1304 from aMannus/item-tracker-v3-ganonkey-fix
Rando: Item Tracker V3 Ganon's Castle small key fix
|
2022-08-25 07:21:45 -04:00 |
|
aMannus
|
7de2c584b4
|
Rando menu tweaks
|
2022-08-25 11:11:24 +02:00 |
|
aMannus
|
c41de36c46
|
Comment
|
2022-08-25 10:36:28 +02:00 |
|
aMannus
|
6fd22f50ab
|
Swapped logic to boss key
|
2022-08-25 10:35:04 +02:00 |
|
aMannus
|
954a96baeb
|
tha fix
|
2022-08-25 10:27:04 +02:00 |
|
aMannus
|
bc5ec24889
|
Ice trap fix
|
2022-08-25 09:54:08 +02:00 |
|
aMannus
|
2626f6c7e3
|
Fixed Winner PoH on skulltula's
|
2022-08-25 09:34:46 +02:00 |
|
aMannus
|
cc6e4238cf
|
Fixes BGS on skull tokens
|
2022-08-25 08:49:15 +02:00 |
|
aMannus
|
050a9db01d
|
Fix BGS dupe check
|
2022-08-25 08:38:42 +02:00 |
|
Kenix3
|
80863fc7f2
|
Moves class member functions from headers to compilation units.
|
2022-08-24 23:06:23 -04:00 |
|
briaguya
|
d2fe83edf4
|
Merge pull request #1295 from HarbourMasters/develop-zhora
quick zhora -> rando-next
|
2022-08-24 19:47:26 -04:00 |
|
Baoulettes
|
c0b9171f98
|
Cosmetics Editor Fixes (#1287)
|
2022-08-25 01:28:27 +02:00 |
|
Christopher Leggett
|
db6a397195
|
Adds new text for the bean salesman
|
2022-08-24 17:58:01 -04:00 |
|
Christopher Leggett
|
c4de29b7f1
|
Correctly sets BEANS_BOUGHT as a "flag" for the bean salesman
|
2022-08-24 17:24:50 -04:00 |
|
Christopher Leggett
|
adf465c1a0
|
Sets up Magic Bean Salesman to sell a rando check for 60 rupees.
|
2022-08-24 17:20:45 -04:00 |
|
briaguya
|
f15b3880f3
|
Merge pull request #1292 from aMannus/custom-key-colors-fix
Rando: Custom key colors fix
|
2022-08-24 17:17:54 -04:00 |
|
briaguya
|
1d77b7fd24
|
Merge pull request #1293 from aMannus/rando-lost-woods-target-crash-fix
Rando: Lost Woods target crash fix
|
2022-08-24 17:16:15 -04:00 |
|
briaguya
|
0af2239473
|
Merge pull request #1290 from garrettjoecox/item-tracker-v3-fixes
Item tracker v3 small fixes
|
2022-08-24 17:14:38 -04:00 |
|
aMannus
|
a48ac71762
|
Fixed lost woods target crash
|
2022-08-24 23:02:48 +02:00 |
|
Garrett Cox
|
27ced1feca
|
Move some comments around
|
2022-08-24 15:52:19 -05:00 |
|
aMannus
|
179c432ee1
|
Comment
|
2022-08-24 22:20:20 +02:00 |
|
aMannus
|
d5074c3e77
|
Fixes double def and split second wrong colors
|
2022-08-24 22:18:24 +02:00 |
|
Ada
|
b70ad81f57
|
Add platform specific OTR instructions to readme (#1291)
|
2022-08-24 22:02:20 +02:00 |
|
Christopher Leggett
|
fe7aedc80d
|
Adds getItemEntry for Magic Bean Pack
|
2022-08-24 15:44:31 -04:00 |
|
briaguya
|
f88e7fabd5
|
Merge pull request #1283 from leggettc18/color-coded-keys
Implements Color Coded Keysanity keys and easier custom draw functions
|
2022-08-24 14:46:52 -04:00 |
|
Garrett Cox
|
29509341f9
|
Support hiding compasses and maps, move combo button behind floating window condition, add padding to windows mode
|
2022-08-24 13:15:00 -05:00 |
|
Christopher Leggett
|
37fe5491b2
|
Always color in Double Defense
|
2022-08-24 13:58:25 -04:00 |
|
Christopher Leggett
|
02a8ba8bb9
|
Fixes incorrect key order in DrawSmallKeys.
|
2022-08-24 13:16:14 -04:00 |
|
Christopher Leggett
|
821c7948d6
|
Cleanup
|
2022-08-24 13:06:48 -04:00 |
|
Christopher Leggett
|
ecd0e3e8bb
|
Merge branch 'rando-next' of github.com:HarbourMasters/Shipwright into color-coded-keys
|
2022-08-24 13:03:44 -04:00 |
|
Garrett Cox
|
b7e3a72f85
|
Fix issue from bad merge and a few other small things
|
2022-08-24 11:00:02 -05:00 |
|
Garrett Cox
|
693dc479d2
|
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into scrubsanity
|
2022-08-24 10:22:57 -05:00 |
|