morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 12:11:33 -06:00
Code Issues Packages Projects Releases Wiki Activity
6,018 Commits 2 Branches 10 Tags
7a86285807fe4a83ba6482268f4b1dac40dd35a1
Commit Graph

236 Commits

Author SHA1 Message Date
CaitSith2
2a5115bc91 Good Bee shop item now fills bottles. 2021-01-23 11:59:32 -08:00
CaitSith2
5b223c3d9f Update base rom. 2021-01-22 15:33:58 -08:00
CaitSith2
ecf05dc29e Base rom update 2021-01-21 23:05:34 -08:00
CaitSith2
60afd0112c Update basepatch 2021-01-21 12:41:14 -08:00
pepperpow
62435c8349 Added overworld bee trap disguises, shop indicators and new shop items 2021-01-20 04:22:26 -06:00
Fabian Dill
e36c6e97c1 Merge remote-tracking branch 'pepper/multishop-all' into multishop 
# Conflicts:
#	EntranceRandomizer.py
#	Rom.py
#	WebHostLib/static/static/playerSettings.json
#	data/basepatch.bmbp
 2021-01-09 16:03:59 +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
CaitSith2
41fd85e8be Add Vanilla tile order 2020-12-22 20:05:19 -08:00
CaitSith2
d090a02d81 Implement tile shuffle 2020-12-22 01:05:48 -08:00
dependabot[bot]
b0681627f4 Bump ini from 1.3.5 to 1.3.8 in /data/web 
Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.8.
- [Release notes](https://github.com/isaacs/ini/releases)
- [Commits](https://github.com/isaacs/ini/compare/v1.3.5...v1.3.8)

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit eb6e094157ac65cbea3aa1b284d2fc86da1aa9f8)
 2020-12-19 19:35:54 +01:00
pepperpow
360fcbea9e Add new patch, disallow single bee traps from shops 2020-12-02 20:00:08 -06: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
pepperpow
6e01442092 Updated patch 2020-11-24 01:30:00 -06:00
pepperpow
167a253596 Added basepatch 2020-11-23 20:06:44 -06:00
Fabian Dill
3a47aadfd6 Remove sprites from repository and setup 2020-11-11 13:53:21 +01:00
CaitSith2
e48838151b Fix 2nd easy item pool silverbow not counting towards the 216 when it is your own. 2020-10-28 20:49:47 -07:00
CaitSith2
7cf4ad35a9 Encrypt most of the remaining items, and all player IDs 2020-10-27 01:43:32 -07:00
CaitSith2
b2a60ac926 Fix "LOCKED" always showing on file select screen. 2020-10-21 02:29:38 -07:00
CaitSith2
651e1a1901 Changes 
* Fix chests always being for yourself AND intended recipient for Race Rom seeds.
* Fix MultiMystery not being able to correctly pack Race Rom seeds into a zip file.
* Add tags to multidata for Race rom, Spoiler log, and Playthrough if spoiler log was generated.
 2020-10-21 02:02:13 -07:00
Fabian Dill
4f8c737eec squashed commit of many breaking changes 
Dropping Support for Python 3.7; adding support for Python 3.9
 2020-10-19 08:26:31 +02:00
CaitSith2
f17682e997 Implement pedestal ganon goal 2020-10-15 15:24:52 -07:00
CaitSith2
5b16fd2552 Allow master sword pedestal to be re-pulled if goal was pedestal. 2020-10-14 23:38:41 -07:00
CaitSith2
b6fed8d3d5 Fix long standing bug with Agahnim Tower compass counter never displaying 01/02. 2020-10-13 02:30:01 -07:00
CaitSith2
4a923c7046 Add bonk to random sprite on event 2020-10-07 16:16:56 -07:00
CaitSith2
d75281c37a Base rom now has default link sprite in the 32 randomspriteonevent slots. 2020-10-05 10:55:56 -07:00
CaitSith2
38ac943a9c Random sprite on hit now part of basepatch. Other events possible too. 2020-10-04 10:57:30 -07:00
CaitSith2
947041c06d Update baserom with latest changes 2020-09-23 11:59:23 -07:00
CaitSith2
c2e950aba5 Fix glitch where bombing yourself at lost woods chest game spawns you at pyramid. 2020-09-17 22:14:04 -07:00
CaitSith2
9ac6c33ab0 Add easy item functionality 
Allows swordless medallion use everywhere, whether or not you are actually on swordless.  It also allows for retrieving the tablets with just a hammer/book and the hammer to harm ganon.
 2020-09-16 22:00:27 -07:00
Chris Wilson
c11fe9cb51 Fix misleading data in WebUI. Server Version is now called ClientVersion 2020-09-13 00:39:52 -04:00
CaitSith2
0bae6b9860 Low stakes and high stakes chest games no longer increments item count. 2020-09-04 06:35:23 -07:00
CaitSith2
01525f6504 Update discord link in credits 2020-09-03 20:21:28 -07:00
CaitSith2
df04cbcac3 Allow only one quiver to be purchased. 2020-08-31 16:43:15 -07:00
Chris Wilson
0236097809 Add alternate font toggle to WebUI 2020-08-31 02:02:54 -04:00
Chris Wilson
3080925950 Update to fix security vulnerability in WebUI 2020-08-15 21:45:05 -04:00
CaitSith2
5c447967ab TerrorPin AI Fix 2020-08-05 08:49:50 -07:00
dependabot[bot]
cab75ea7df Bump elliptic from 6.5.2 to 6.5.3 in /data/web 
Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.2 to 6.5.3.
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](https://github.com/indutny/elliptic/compare/v6.5.2...v6.5.3)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-08-01 00:01:54 +00:00
Fabian Dill
ebd6a9e3cf Removed all instances of the word "Official" where it does not refer to Nintendo 2020-07-31 19:45:10 +02:00
CaitSith2
4ab1e563a0 Fix sprite glitch while receiving items during Ganon fight. 2020-07-29 22:05:37 -07:00
Chris Wilson
e62b406337 Update npm dependencies to pull in security updates 2020-07-18 16:40:04 -04:00
caitsith2
0ba2405bbc Swamp trench 1 no longer drains. That only happens in door rando now. 2020-07-14 22:45:55 -07:00
Fabian Dill
30c0415364 update sprites 2020-07-06 06:26:03 +02:00
CaitSith2
545bb8023c Add ganon triforce hunt (#117) 
* Add ganon triforce hunt

* Add self to license

* Correction of help message for Local Ganon Triforce Hunt.

* if 'triforcehunt in world.goal[player]:
 2020-06-26 16:18:53 +02:00
Fabian Dill
8d3961b6fb update sprites and double the width for sprites 2020-06-23 05:58:27 +02:00
caitsith2
780ae4ebcc Fix fake lightworld bug with climbing GT a second time. @compiling 2020-06-20 19:47:07 -07:00
caitsith2
95742ddb98 Skull Woods MSU v32 fix 2020-06-20 18:55:15 -07:00
Fabian Dill
29ee4fe307 rename baserom to basepatch to make it clearer what it is 
Also move actual baserom to root folder to make it harder to accidentally share it with others when copying stuff
 2020-06-17 08:59:50 +02:00
Chris
e11f33b589 Update WebUI to display server, check, and hint info. CURRENT HINT POINTS DO NOT WORK YET 2020-06-14 18:04:03 -04:00
Fabian Dill
fdaba7e28c Merge branch 'bsdiff4_baserom' 
# Conflicts:
#	Main.py
 2020-06-13 22:51:44 +02:00
Chris
53744be44c Remove useless code and rebuild bundle file 2020-06-13 15:24:28 -04:00