morgan/Grinch-AP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,563 Commits 3 Branches 10 Tags
1b51714f3b734d0c43e6fdffa006c692b12f8c50
Commit Graph

3131 Commits

Author SHA1 Message Date
Fabian Dill
bfa9bde348 Merge branch 'main' into breaking_changes 2021-03-03 02:00:10 +01:00
Fabian Dill
0d576eefbb Merge branch 'main' into breaking_changes 
# Conflicts:
#	Main.py
#	worlds/alttp/EntranceRandomizer.py
 2021-03-03 01:54:52 +01:00
Fabian Dill
7871555620 Implement PrintJSON 
Remove deprecated network packets
Make Client send new locations checked only once
Simplify register_location_checks
Rip out Server savegame compatibility
 2021-03-02 22:31:44 +01:00
Fabian Dill
07b9fcfefc minor cleanup 2021-02-28 20:48:30 +01:00
Fabian Dill
612c3c23c0 spheres should ignore empty locations 2021-02-27 18:58:17 +01:00
Fabian Dill
8bfddb7fc6 Remove Single-Item logic macros 2021-02-27 17:11:54 +01:00
Fabian Dill
bda86a65f7 Add Grimmkin Flames logic 2021-02-27 16:27:35 +01:00
Fabian Dill
abcc2690f0 Add "Fake" (Randomizer-only) Hollow Knight items 2021-02-26 21:03:16 +01:00
Fabian Dill
e5e70db380 improve set_getters a bit 2021-02-25 04:14:46 +01:00
Fabian Dill
f19291aaed Remove Fake Hollow Knight Items and Locations 
Add GetDataPackage Network system
 2021-02-25 02:07:28 +01:00
Fabian Dill
499f67c586 HK Logic 2021-02-24 06:02:51 +01:00
Fabian Dill
e60ae897b4 Allow HK items in shops and allow settings local/non-local items for HK 2021-02-24 00:36:37 +01:00
Fabian Dill
a248fd5f94 add a HK game completion rule 2021-02-22 11:18:53 +01:00
Fabian Dill
8a395a3021 update guis 2021-02-21 20:37:43 +01:00
Fabian Dill
ff9b24e88e Hollow Knight integration 
(prototype status)
 2021-02-21 20:17:24 +01:00
Fabian Dill
dcce53f8c8 Merge branch 'main' into breaking_changes 
# Conflicts:
#	Adjuster.py
#	Gui.py
#	MultiClient.py
#	setup.py
#	worlds/alttp/AdjusterMain.py
#	worlds/alttp/Main.py
 2021-02-21 20:15:07 +01:00
Fabian Dill
96dfccdbfc set correct version in multidata 2021-02-19 13:47:25 +01:00
Fabian Dill
122e360ec8 Merge branch 'main' into breaking_changes 
# Conflicts:
#	MultiClient.py
#	Utils.py
#	worlds/alttp/ItemPool.py
#	worlds/alttp/Main.py
#	worlds/alttp/Shops.py
 2021-02-19 13:45:50 +01:00
Fabian Dill
3d81f0cca7 update after merge from /main 2021-01-30 23:43:15 +01:00
Fabian Dill
2553b1d2ee Merge branch 'main' into breaking_changes 2021-01-30 23:40:25 +01:00
Fabian Dill
28c12054dd update to Shops release 2021-01-30 23:37:35 +01:00
Fabian Dill
a646594f08 Merge branch 'main' into breaking_changes 
# Conflicts:
#	BaseClasses.py
#	Fill.py
#	MultiClient.py
#	MultiServer.py
#	Utils.py
#	test/dungeons/TestDungeon.py
#	test/inverted/TestInverted.py
#	test/inverted_minor_glitches/TestInvertedMinor.py
#	test/inverted_owg/TestInvertedOWG.py
#	test/minor_glitches/TestMinor.py
#	test/owg/TestVanillaOWG.py
#	test/vanilla/TestVanilla.py
#	worlds/alttp/ItemPool.py
#	worlds/alttp/Main.py
#	worlds/alttp/Rom.py
 2021-01-30 23:29:32 +01:00
Fabian Dill
c604dfe509 move networks commands to [str, Optional[dict]] across the board 
and some other updates
PrintHTML is an experiment and is unlikely the solution I'll go with
 2021-01-21 23:37:58 +01:00
Fabian Dill
670b8b4b11 Merge branch 'main' into breaking_changes 
# Conflicts:
#	MultiClient.py
#	WebUI.py
 2021-01-21 05:36:16 +01:00
Fabian Dill
7333a15f1f handle merge conflicts after plando update 2021-01-17 06:54:38 +01:00
Fabian Dill
514cd19367 Merge branch 'main' into breaking_changes 
# Conflicts:
#	BaseClasses.py
#	Mystery.py
#	WebHostLib/downloads.py
#	WebHostLib/models.py
#	WebHostLib/templates/macros.html
#	WebHostLib/upload.py
#	worlds/alttp/ItemPool.py
#	worlds/alttp/Main.py
 2021-01-17 06:50:25 +01:00
Fabian Dill
6bb7631382 fix unit tests 2021-01-03 17:16:07 +01:00
Fabian Dill
8ebd36b5a7 update Archipelago 2021-01-03 14:32:32 +01:00
Fabian Dill
08ca4245c1 Merge branch 'main' into breaking_changes 
# Conflicts:
#	Adjuster.py
#	AdjusterMain.py
#	BaseClasses.py
#	MultiClient.py
#	MultiServer.py
#	Mystery.py
#	Utils.py
#	WebHostLib/downloads.py
#	WebHostLib/generate.py
#	dumpSprites.py
#	test/TestBase.py
#	worlds/alttp/EntranceRandomizer.py
#	worlds/alttp/Main.py
#	worlds/alttp/Rom.py
 2021-01-03 13:13:59 +01:00
Fabian Dill
4de64eab84 update Options system #2 2020-10-24 19:46:13 +02:00
Fabian Dill
1d58f54101 move ALTTP to its own world folder 2020-10-24 05:38:56 +02:00