Commit Graph

283 Commits

Author SHA1 Message Date
Fabian Dill 3d93f659e3 some option updates 2021-03-14 08:38:02 +01:00
Fabian Dill 03bcd2aed7 Merge branch 'main' into breaking_changes 2021-03-14 07:04:40 +01:00
Chris Wilson a305a0ffac Save filenames to yaml instead of sprite names, bump weighted settings version to 4.1.1 rev0 2021-03-13 18:53:53 -05:00
Fabian Dill 35285609e0 different default DB name for breaking_changes DB to avoid overlap 2021-03-13 23:36:57 +01:00
Fabian Dill 6455dc3ffc Merge branch 'main' into breaking_changes
# Conflicts:
#	README.md
2021-03-13 23:34:38 +01:00
Fabian Dill 6e129c3421 update spriteData.json 2021-03-13 01:56:31 +01:00
CaitSith2 b898803981 single player tracker now hides small key/big key column if everything in that column would be N/A. 2021-03-07 14:53:42 -08:00
CaitSith2 361460df26 Multiplayer tracker now shows big keys/small keys applicable to ALL players of that seed. 2021-03-07 14:30:21 -08:00
Fabian Dill f7dc21ddcc Merge branch 'main' into breaking_changes
# Conflicts:
#	Main.py
#	Utils.py
2021-03-07 22:04:06 +01:00
CaitSith2 a86238d741 Add actual tracking of player small keys/big keys 2021-03-06 13:59:04 -08:00
Chris Wilson ed77f93b6f Adjust color of links on the multi-tracker. 2021-03-06 00:37:14 -05:00
Fabian Dill 63fda9535a use jinja's url_for instead of manual text assembling 2021-03-06 06:09:12 +01:00
Fabian Dill 11e1125044 fixes for solo tracker 2021-03-06 05:59:49 +01:00
Fabian Dill 567954a17f Merge branch 'main' into breaking_changes
# Conflicts:
#	BaseClasses.py
2021-03-06 05:27:16 +01:00
CaitSith2 94b25112cd Whoops, min, not max. 2021-03-05 13:56:55 -08:00
CaitSith2 28fd8274b2 Set max progressive items. 2021-03-05 13:47:27 -08:00
CaitSith2 8c80909551 Correctly attribute items to each player. 2021-03-05 13:38:16 -08:00
Chris Wilson 280f3938ed Add Triforce HUD options to weighted settings page
- Added triforce hud options
- Fix a bug causing weighted settings to always fail to load (git blame forthcoming)
- Update ws_version to prompt users to update
- Who is Murahalda? (corrected to Murahadala)
2021-03-03 17:47:35 -05: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
CaitSith2 2e275d1f4e Merge remote-tracking branch 'pepperpow/triforce_changes' into main 2021-02-26 19:56:44 -08:00
Chris Wilson 8615b2f0f5 Finish implementing the player tracker 2021-02-25 01:16:22 -05:00
Chris Wilson c38eafeb59 Eliminate excess data being passed to playerTracker.html 2021-02-23 23:16:02 -05:00
Chris Wilson cb4ed06eb8 Fix progressive items not being tracked correctly 2021-02-23 22:43:40 -05:00
Chris Wilson 1749ca333c Fix alignment issue, include checks done / total checks 2021-02-23 20:19:41 -05:00
Chris Wilson 34c74c9d2a Set up basic template for player tracker 2021-02-23 19:34:35 -05:00
Chris Wilson 9c8169afa2 Correct wording on the weighted settings page regarding the restrict_dungeon_item_on_boss setting. 2021-02-23 01:06:49 -05:00
Chris Wilson c0c3d523ca Merge branch 'solo-tracker' into main 2021-02-23 00:06:35 -05:00
Chris Wilson 3027112a45 Finish writing backend for Jinja template for player-tracker 2021-02-23 00:05:31 -05:00
pepperpow 222784dbb6 Merge branch 'main' of https://github.com/Berserker66/MultiWorld-Utilities into triforce_changes 2021-02-22 22:44:43 -06: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 c0cd79f0d7 Garbage Collect Autohost subprocesses to accumulate less open file descriptors which may crash the webhost service. 2021-02-21 11:07:02 +01:00
Chris Wilson 67f0663715 Initial testing commit for a solo-tracker on the website. Nothing to see here. 2021-02-21 00:38:53 -05:00
Chris Wilson 5e8b4ac3ce Weighted Settings v4.0.1 rev1 - Fix a bug (it was a typo) causing the "puke" palettes to never be updated on weighted settings files generated from the website.
- Also added the "reduceflashing" option to weighted settings
2021-02-19 17:50:49 -05:00
pepperpow fca64f1177
Removes Flashing instances in game (#168)
* Added reduced flashing, triforce hud and cutscene options

* Corrected parameters and replacement order

* Mixed up rom byte

* Removed triforce hud, smoothed cutscene speed and reset tables

* Removed triforcehud line and added bird cutscene speedup

* Added options to yaml

* Added check for race rom generation (is not internal asm)

* Added options to GUI (check sprite adjust crash)

* Fixed inconsistency in setting weight

* A "slow" setting for the cutscenespeed (#1)

* Slow wall setting

* Slow wall setting

* Slow wall setting

* Slow wall setting

* Slow wall setting

* Slow wall setting

* Update playerSettings.yaml

* Remove instances of cutscene speed modification

* Changed command to remove to mitigate frame advantage

* Antiepilepsy enabled for default/race roms, param change, RTL byte

* Found a frame independent antiflashing patch for real

* Further ASM patching style

* Reduce these changes to just two bytes

* Added patches for Dark Mountain and Ether Flashing palette reveal

Co-authored-by: StructuralMike <66819228+StructuralMike@users.noreply.github.com>
2021-02-19 17:45:54 +01:00
Fabian Dill 68c639d798 empty text comes before text; right. 2021-02-19 15:23:18 +01:00
Fabian Dill 9b6a695551 default sort hints table so that it pushes found hints to the bottom 2021-02-19 15:18:26 +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
Chris Wilson 1eaab4e843 Implement a versioning system for the weighted-settings page 2021-02-07 13:58:24 -05:00
pepperpow 1d1abb7d22 Removed remnants of team stuff, make hide_goal default 2021-02-05 20:37:27 -06:00
Chris Wilson 87be751e45 Adjust the weighted settings json config file to properly reflect the key values for the shop_shuffle_slots option 2021-02-05 19:01:38 -05:00
Chris Wilson 5d84df4fa0 Fix a bug in the weighted settings causing the sprite list to not update when a preset is changed 2021-02-05 18:55:53 -05:00
Chris Wilson 239b365264 Remove outdated warning about QUsb2Snes version 2021-02-03 23:15:09 -05:00
Fabian Dill 078ad30195 Fix Multiworld tracker 2021-02-01 01:58:08 +01:00
Chris Wilson b4502f1338 Fix indentation bug in weightedSettings.yaml 2021-01-30 19:05:06 -05:00
Chris Wilson 889d24606f Updated weighted settings to reflect new beemizer documentation and include pyramid_open options 2021-01-30 19:03:54 -05: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
pepperpow 82fc2aba20 Added triforce hud options, expanded triforce requirement 2021-01-29 15:42:00 -06:00
Chris Wilson 5f4a1636aa Fix certain settings not being set properly on the weighted settings page. 2021-01-26 18:29:23 -05:00