Commit Graph

1781 Commits

Author SHA1 Message Date
pepperpow
62cfa8813f Merge branch 'shop-fill' into multishop-all 2020-12-23 20:50:41 -06:00
pepperpow
f72d93f6f6 Fix divide by zero 2020-12-23 20:50:13 -06:00
pepperpow
4162df7666 Merge branch 'multishop-all' of github.com:pepperpow/MultiWorld-Utilities into multishop-all 2020-12-23 16:37:31 -06:00
pepperpow
c67e5ae6e6 Fixed line 2020-12-23 16:36:58 -06:00
pepperpow
0debc3289b Merge branch 'shop-fill' into multishop-all 2020-12-23 16:36:45 -06:00
pepperpow
6f0511c047 Move shop table adjustments outside of Rom.py 2020-12-23 16:36:06 -06:00
pepperpow
a5a09ec4eb Merge branch 'shop-fill' into multishop-all 2020-12-23 15:31:23 -06:00
pepperpow
4c5cf78939 Fixes to logic, doesn't make unwinnable games 2020-12-23 15:30:21 -06:00
pepperpow
c66e97faf6 Merge branch 'shop-fill' into multishop-all 2020-12-23 11:29:20 -06:00
pepperpow
83304fd314 Rotate rupees out of shop and equalize prices 2020-12-23 11:28:42 -06:00
pepperpow
d80c12b37b Fixed overlooked commit lines 2020-12-15 17:20:57 -06:00
pepperpow
c5ced75983 Fixed missed lines in commit 2020-12-15 17:19:04 -06:00
pepperpow
767c84a581 Merge branch 'shop-fill' into multishop-all 2020-12-15 02:36:48 -06:00
pepperpow
ffe5b4b1a1 Fixes to clients/servers for shop checks 2020-12-15 02:34:22 -06:00
pepperpow
42adfd6f14 Potion changes 2020-12-02 21:08:35 -06:00
pepperpow
37493c85dc Merge branch 'shop-generate' of github.com:pepperpow/MultiWorld-Utilities into multishop-all 2020-12-02 20:41:49 -06:00
pepperpow
7b5bd016b9 Merge branch 'potion-shop' of github.com:pepperpow/MultiWorld-Utilities into multishop-all 2020-12-02 20:35:59 -06:00
pepperpow
360fcbea9e Add new patch, disallow single bee traps from shops 2020-12-02 20:00:08 -06:00
pepperpow
8f1a6a434e Updated basepatch 2020-11-30 15:16:38 -06:00
pepperpow
e1b5ce2d95 Updated patch 2020-11-24 01:32:26 -06:00
pepperpow
afe371613c update patch 2020-11-24 01:31:30 -06:00
pepperpow
6e01442092 Updated patch 2020-11-24 01:30:00 -06:00
pepperpow
7da69d5140 Added missing potion shop compatability 2020-11-23 20:21:53 -06:00
pepperpow
6642769caf Added missing player byte from table 2020-11-23 20:17:03 -06:00
pepperpow
167a253596 Added basepatch 2020-11-23 20:06:44 -06:00
pepperpow
608d96329f Shop Item Pool fill feature + multiworld player compatability 2020-11-23 20:05:04 -06:00
pepperpow
b757826174 Added basepatch 2020-11-23 19:41:38 -06:00
pepperpow
4f58459742 Shop Generation options
(reduced from previous PR)
2020-11-23 19:38:57 -06:00
pepperpow
5441830c09 Added missing basepatch 2020-11-23 19:33:13 -06:00
pepperpow
fe218fffa6 Potion Shop Changes
(reduced)
2020-11-23 19:00:11 -06:00
CaitSith2
4370447adc More fixes to non_local_items 2020-11-22 14:29:11 -08:00
Fabian Dill
25f0a5956c fix non_local_items help text 2020-11-22 22:55:31 +01:00
Fabian Dill
fc2f1dfd29 implement "non_local_items" 2020-11-22 22:53:31 +01:00
Fabian Dill
fd020ead7f Fix FillError message assembly crashing the error 2020-11-22 22:53:02 +01:00
Fabian Dill
19bbfab769 improve Bosses.py 2020-11-22 11:39:20 +01:00
CaitSith2
aba635007f Add key drop shuffle to playerSettings.yaml 2020-11-15 16:14:01 -08:00
Fabian Dill
f56efbc9e3 improve handling of embedded server options:
use whitelist
attempt to set, skip otherwise
attempt to convert data type
2020-11-15 15:21:41 +01:00
Fabian Dill
fd1a25e362 update Enemizer download link 2020-11-15 14:49:09 +01:00
Fabian Dill
34c2662801 update meta.yaml 2020-11-14 19:56:40 +01:00
Fabian Dill
838632ab27 Default CMD runs to vanilla ER 2020-11-14 00:46:29 +01:00
Fabian Dill
e005fb52f7 WebHost: report back generation errors to user 2020-11-12 19:50:13 +01:00
Fabian Dill
38490813de GUI: Move Timer options to Custom Items panel to make gui less high for smaller screens 2020-11-11 19:34:18 +01:00
Fabian Dill
3a47aadfd6 Remove sprites from repository and setup 2020-11-11 13:53:21 +01:00
Fabian Dill
033307cfc9 Allow just updating sprites and remove old alternate sprite folder 2020-11-11 13:45:21 +01:00
Fabian Dill
8060aa7884 add never adjust answer to client 2020-11-11 13:15:35 +01:00
Fabian Dill
be02136a1b revert QUSB2SNES port change (seems it sometimes doesn't host on this port and then things break) 2020-11-11 12:53:53 +01:00
Fabian Dill
dc8a7133a3 Allow qusb2snes to configure itself (now that it has a menu on first run) and bind to port 23070 2020-11-11 12:36:02 +01:00
Fabian Dill
ee9336983c Remove SD2SNES special handling
Requires QUSB2SNES 0.7.19
2020-11-11 12:21:37 +01:00
CaitSith2
42537c540c Ignore test results. 2020-11-11 00:27:45 -08:00
Fabian Dill
b2bbb77470 remove that I can be found on ALTTPR and pep8 reformat MultiMystery.py 2020-11-08 07:31:32 +01:00