aMannus
|
4ebcc83161
|
Code styling
|
2022-08-26 15:13:34 +02:00 |
|
aMannus
|
9e6d61d7ec
|
Incompatible checkboxes
|
2022-08-26 11:13:11 +02:00 |
|
aMannus
|
b43f77caba
|
Columns in childs & code style changes
|
2022-08-26 09:56:34 +02:00 |
|
Christopher Leggett
|
53531c4481
|
Cleanup
|
2022-08-26 01:17:51 -04:00 |
|
Christopher Leggett
|
9148fa5aec
|
Adds custom particles to Freestanding Bean Pack item.
|
2022-08-25 20:48:28 -04:00 |
|
Christopher Leggett
|
4a51ab3187
|
Fixes bug where Bean Pack was also granting blue potion
|
2022-08-25 20:42:34 -04:00 |
|
Christopher Leggett
|
71e7fb9d70
|
Merge rando-next and rename scrub message table to merchant message table
|
2022-08-25 18:02:00 -04:00 |
|
Christopher Leggett
|
e9fa231ae6
|
Merge branch 'rando-next' of github.com:HarbourMasters/Shipwright into magic-bean-pack
|
2022-08-25 17:45:41 -04:00 |
|
briaguya
|
31c4b683d1
|
Merge pull request #1317 from briaguya-ai/no-more-blank-spoilers
No more blank spoilers
|
2022-08-25 17:42:09 -04:00 |
|
briaguya
|
0107699a6b
|
more formatting
|
2022-08-25 17:29:09 -04:00 |
|
briaguya
|
866cb3166b
|
formatting
|
2022-08-25 17:28:46 -04:00 |
|
briaguya
|
0bcc5b1310
|
no more blank spoilers
|
2022-08-25 17:27:37 -04:00 |
|
Christopher Leggett
|
78e506a072
|
Merge branch 'rando-next' of github.com:HarbourMasters/Shipwright into magic-bean-pack
|
2022-08-25 16:58:05 -04:00 |
|
briaguya
|
da07a8f409
|
Merge pull request #1300 from aMannus/tokensanity-bgs-fix
Rando: Tokensanity BGS and maps/compasses fix
|
2022-08-25 16:50:21 -04:00 |
|
briaguya
|
1cfa0a9623
|
Merge pull request #1264 from garrettjoecox/scrubsanity
Scrubsanity
|
2022-08-25 16:48:28 -04:00 |
|
Christopher Leggett
|
5043309c63
|
Adds basic german text for bean salesman
|
2022-08-25 16:43:57 -04:00 |
|
Garrett Cox
|
dc9eeb18d9
|
Increase size of randomizerInf
|
2022-08-25 15:38:41 -05:00 |
|
briaguya
|
60eb1382e0
|
Merge pull request #1315 from briaguya-ai/ztorn
zhora -> rando-next
|
2022-08-25 16:19:06 -04:00 |
|
briaguya
|
4919bddda2
|
Merge branch 'develop-zhora' into ztorn
|
2022-08-25 16:08:16 -04:00 |
|
Garrett Cox
|
c76ff719f4
|
Fix issue in spoiler generation
|
2022-08-25 13:53:04 -05:00 |
|
Garrett Cox
|
1e31d108e6
|
Various changes from feedback, and use new randomizerInf table
|
2022-08-25 13:49:02 -05:00 |
|
Christopher Leggett
|
3da197f0cd
|
Removes some magic numbers
|
2022-08-25 14:39:12 -04:00 |
|
Christopher Leggett
|
c2fed1a382
|
Fixes Lost Woods Bridge Ice Trap in Rando (#1313)
|
2022-08-25 20:16:43 +02:00 |
|
Garrett Cox
|
936513a9c4
|
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into scrubsanity
|
2022-08-25 13:02:47 -05:00 |
|
aMannus
|
29b9f0b37e
|
Comment
|
2022-08-25 19:58:05 +02:00 |
|
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 |
|
lilDavid
|
ad33aba9ba
|
Merge branch 'rando-next' into bombchu-logic
|
2022-08-25 11:23:30 -05: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 |