11 commits

Author	SHA1	Message	Date
Cameron Taylor	10bafff63e	Merge branch 'master' into feature/scripted-stages	2022-03-18 21:54:16 -04:00
Cameron Taylor	5f98aa7fb5	busted input fix (breaks pyro test probably)	2022-03-18 21:47:30 -04:00
Cameron Taylor	a40a4663d8	parse animate removed an import lol!	2022-03-18 12:28:25 -04:00
Cameron Taylor	d477320894	xmas mall positioning fix (plus score reset, lol!)	2022-03-09 18:57:36 -05:00
Cameron Taylor	ef665df9d0	hold note balance shit lol! unrelated to polymod!!	2022-03-09 15:04:35 -05:00
Cameron Taylor	9dcffaa3fa	spirit layering fix	2022-03-09 14:06:10 -05:00
Eric Myllyoja	fe109f878f	Merge remote-tracking branch 'origin/master' into feature/scripted-stages	2022-03-09 10:37:21 -05:00
Eric Myllyoja	19cda4ed15	Merge branch 'feature/scripted-stages' of github.com:ninjamuffin99/Funkin-secret into feature/scripted-stages	2022-03-09 10:36:39 -05:00
Eric Myllyoja	57fcb74657	Spirit trail is now behind	2022-03-09 10:36:13 -05:00
Cameron Taylor	45b9d725f2	tankman cloud reset?	2022-03-09 10:29:03 -05:00
Eric Myllyoja	404b2b648e	Modified every file in the codebase to solve a single bug.	2022-03-08 03:13:53 -05:00