morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 20:21:32 -06:00
Code Issues Packages Projects Releases Wiki Activity
4,553 Commits 2 Branches 10 Tags
e204a0fce6207e33df731438de3d5b48cee77d0d
Commit Graph

763 Commits

Author SHA1 Message Date
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
Chris Wilson
761f798f39 Fix formatting in Plando tutorial 2021-01-24 21:31:33 -05:00
Chris Wilson
635d04f6ec Update Player Settings and Weighted Settings pages on website to reflect new possible settings. 
- Also fix a bug caused by the website settings always forcing options to lowercase
 2021-01-24 21:14:58 -05:00
CaitSith2
5c427f5e3e Add Ice rod hunt to player settings and weighted settings. 2021-01-24 14:52:42 -08:00
Fabian Dill
9386a9c220 Update Menus 2021-01-24 21:58:26 +01:00
Fabian Dill
a6dad66b59 Merge branch 'multishop' 2021-01-24 20:30:52 +01:00
Fabian Dill
441fa3e5db Allow Plando'ing Dungeon Prizes 
There be dragons beyond this point.
 2021-01-24 08:26:39 +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
2b730ab1d4 Merge branch 'main' into multishop 2021-01-18 22:30:05 +01:00
Fabian Dill
4fb8067b5e document item plando force parameter 2021-01-18 05:07:53 +01:00
Fabian Dill
f4281f81f5 Merge branch 'main' into multishop 2021-01-17 22:08:43 +01:00
Fabian Dill
0286a81755 plando world false is default 2021-01-17 21:42:28 +01:00
Fabian Dill
26314f7c13 Document Connection Plando 
and show where Connection Plando Errors come from
 2021-01-17 18:28:10 +01:00
Fabian Dill
446893c504 Document Item Plando 2021-01-17 17:58:58 +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
3b5ba161de first two plando modules documented 2021-01-17 02:15:46 +01:00
Fischfilet89
65fa39df95 Update weightedSettings.json (#162) 
fixed a typo at line 1020 regarding enemy health on the setting "armor-plated"
 2021-01-16 00:38:55 +01:00
Fabian Dill
25330bd730 Fix displaying Race Seeds 2021-01-16 00:32:52 +01:00
CaitSith2
10a4a89c5f Merge branch 'main' into multishop 2021-01-15 01:41:36 -08:00
Edos512
fd888d9e31 Update MSU spanish tutorial (#161) 
Added Stream-safe MSU packs section
 2021-01-13 22:35:49 +01:00
Fabian Dill
67731d9e53 Merge branch 'main' into multishop 2021-01-13 15:00:19 +01:00