Commit Graph

2300 Commits

Author SHA1 Message Date
Chris Wilson c4d5756f52 Include new footer assets 2020-11-30 22:56:10 -05:00
Chris Wilson ddfcef09ec Merge master into website-redesign 2020-11-30 22:44:52 -05:00
Chris Wilson 8c2a6eed82 Remember to commit the custom background I assembled 2020-11-30 22:37:12 -05:00
Chris Wilson 33b6f27ba0 Slight improvement to tracker style 2020-11-30 22:31:17 -05:00
Chris Wilson 26fdb92c30 Implement new styles for tracker, mostly keep the old ones there. 2020-11-30 22:29:48 -05:00
Chris Wilson 660a65208f Added style for landing page and fixed footer style 2020-11-30 21:54:33 -05:00
Chris Wilson bd3b419de0 Updates all styles save for the tooltip and tracker, which are forthcoming. I just really wanted to commit all these changes. 2020-11-30 21:15:47 -05:00
Fabian Dill 145aec89c4 WebHost: add /api/room_status endpoint 2020-12-01 01:51:09 +01:00
Fabian Dill 31839d421d consolidate api endpoints into own module and flask Blueprint 2020-12-01 01:33:57 +01:00
pepperpow 8f1a6a434e Updated basepatch 2020-11-30 15:16:38 -06:00
Chris Wilson 7891c2761f Swap out most svg images for png 2020-11-30 16:00:48 -05:00
Fabian Dill 74cf51c20b create sprite directory if it doesn't exist 2020-11-30 21:34:40 +01:00
Fabian Dill 72a3930d18 add server password default to webhost 2020-11-30 21:07:26 +01:00
Fabian Dill 5128657349 allow setting remaining_mode from server options 2020-11-30 21:07:02 +01:00
Fabian Dill 60e20b7844 Merge remote-tracking branch 'origin/master' 2020-11-30 19:34:49 +01:00
Fabian Dill ddb8a91e5f increment version to 3.4.0 2020-11-30 19:34:42 +01:00
CaitSith2 f9a786e3f5 blacklist doors options from being warned about on master. 2020-11-30 07:43:13 -08:00
Fabian Dill b5e80d1f87 remove no longer used port_forward option 2020-11-30 16:33:54 +01:00
CaitSith2 8c94351d53 Get warnings of options that might not exist in options.yaml 2020-11-28 14:51:13 -08:00
CaitSith2 a269db6ab5 Add doors specific multi mystery default options 2020-11-28 11:39:37 -08:00
CaitSith2 77e74510af Add default options. 2020-11-28 11:34:29 -08:00
Fabian Dill 2b8db38fee update python to 3.9 2020-11-25 00:30:45 +01:00
Fabian Dill f77f4ecdcf update promp_toolkit 2020-11-24 23:42:55 +01:00
CaitSith2 e78e22477c Fix possible TypeError 2020-11-24 10:40:25 -08:00
CaitSith2 79aea6b3a6 more english improvements. 2020-11-24 10:29:52 -08:00
CaitSith2 5475b00b58 Fix bug where a sworded seed on normal item functionality or greater can still kill freezors with bombos. 2020-11-24 07:54:08 -08:00
Fabian Dill d88d916b94 update ponyorm 2020-11-24 16:14:56 +01: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
Chris Wilson ba3cc38d4a Added the dirt vertical and horizontal cliff pieces, added WIP corner pieces. 2020-11-23 18:34:55 -05:00
Chris Wilson 016d09150d Merge branch 'master' into website-redesign 2020-11-23 17:49:53 -05: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