4277 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
EliteMasterEric	299a3a1a25	Merge branch 'rewrite/master' into rewrite/feature/chart-editor-wasd	2023-10-10 23:38:38 -04:00
EliteMasterEric	2e56fdb026	Fast-forward submodules	2023-10-10 23:36:38 -04:00
EliteMasterEric	989d1c3175	Merge rewrite/master, fix high score retrieval	2023-10-10 23:32:01 -04:00
EliteMasterEric	b50ccfa080	Resolve merge conflicts	2023-10-10 22:36:58 -04:00
Cameron Taylor	e5fbf5d99f	Merge pull request #180 from FunkinCrew/rewrite/bugfix/difficulty-switch-crash ... [CRASH FIX] Safely handle difficulty switching to avoid null object reference in Play State	2023-10-10 21:33:57 -04:00
Cameron Taylor	b01d4ea8f4	Merge pull request #181 from FunkinCrew/rewrite/bugfix/alt-animation-fixes ... Alt animation fixes	2023-10-10 20:32:58 -04:00
Cameron Taylor	e26a82275c	Merge branch 'rewrite/master' into rewrite/bugfix/alt-animation-fixes	2023-10-10 20:32:12 -04:00
Cameron Taylor	5c2a3b912a	Merge pull request #183 from FunkinCrew/rewrite/freeplay-polish ... Cherry Pick of Freeplay Polish	2023-10-10 20:22:03 -04:00
EliteMasterEric	f652beb382	Fix several merge errors.	2023-10-09 20:04:21 -04:00
Cameron Taylor	8009045e76	fix to song selection	2023-10-09 18:38:52 -04:00
Cameron Taylor	9446f268e0	diff stars pop in nicer	2023-10-09 18:38:10 -04:00
Cameron Taylor	9926706e6e	litty fix	2023-10-09 18:38:05 -04:00
Cameron Taylor	4b1af216d4	capsule alpha stuff in progress	2023-10-09 18:38:02 -04:00
Cameron Taylor	387acd211e	icon scaling fix + removed temp lighting	2023-10-09 18:37:20 -04:00
Cameron Taylor	ba896508cc	cartoons and stuff	2023-10-09 18:35:43 -04:00
Cameron Taylor	546e15dcac	click polish	2023-10-09 18:34:54 -04:00
Cameron Taylor	8c74fcd73a	playingCartoon bool woops	2023-10-09 18:34:38 -04:00
Cameron Taylor	8f9206f639	python file to generate shitty audio	2023-10-09 18:34:29 -04:00
Cameron Taylor	ab5d6d2f48	sounds in progress	2023-10-09 18:33:50 -04:00
Cameron Taylor	66f77a985f	boyfriend blink code	2023-10-09 18:33:09 -04:00
Cameron Taylor	82bb619864	boyfriend tv looping	2023-10-09 18:33:09 -04:00
Cameron Taylor	5ddc4876bc	boyfriend animations swapped to atlas sprites	2023-10-09 18:33:03 -04:00
Cameron Taylor	f000d21689	shaders and blendmode overlay stuff in progres	2023-10-09 18:32:18 -04:00
Cameron Taylor	b20cb27f82	hue shifting in progress	2023-10-09 18:31:06 -04:00
Cameron Taylor	20d13f56ac	capsule text effect	2023-10-09 18:29:32 -04:00
Cameron Taylor	5d6264e67e	sprites follow rotation of capsule	2023-10-09 18:28:59 -04:00
Cameron Taylor	0dbcc50bcc	random song music in progress	2023-10-09 18:28:56 -04:00
Cameron Taylor	8525cfaf21	cute text popin	2023-10-09 18:28:11 -04:00
Cameron Taylor	f474c3aac5	better grouping stuf	2023-10-09 18:28:11 -04:00
Cameron Taylor	eacd76a0fa	difficulty rankings and grayscale mockup	2023-10-09 18:28:08 -04:00
Cameron Taylor	a8e39d90e8	temp rank stuff in progress	2023-10-09 18:27:17 -04:00
EliteMasterEric	f7bac02ee3	Fix crashing, broken countdown, broken miss muting in song preview	2023-10-09 18:24:07 -04:00
EliteMasterEric	5fa9c5246f	Fixed a bug where beat hit events were called multiple times during the conductor	2023-10-09 18:22:52 -04:00
EliteMasterEric	11b1ca5100	Fix bug where pressing ENTER in UI would cause song to try to preview. Fix bug where trying to preview a newly created song would crash.	2023-10-09 18:22:28 -04:00
EliteMasterEric	5b4a00e893	Make sure timestamps are consistent with use of Int64.	2023-10-09 18:22:02 -04:00
EliteMasterEric	4f0e9614e0	Fix build issues caused by int64 handling	2023-10-09 18:21:58 -04:00
EliteMasterEric	2f56c74060	Fix HTML typing issue	2023-10-09 18:19:58 -04:00
EliteMasterEric	4468e2a5a5	Fixed several bugs with Play State (mostly restarting the song)	2023-10-09 18:16:26 -04:00
Cameron Taylor	b96c0e6256	album artist stuff	2023-10-09 18:12:14 -04:00
Cameron Taylor	097b5dab46	freeplay optimize fix	2023-10-09 18:11:19 -04:00
Cameron Taylor	97267d18b9	freeplay wrapping fix	2023-10-09 18:10:02 -04:00
Cameron Taylor	c3d30f6711	polish / optimize in progress	2023-10-09 18:10:02 -04:00
Cameron Taylor	92f45d93aa	pixel icons	2023-10-09 18:09:59 -04:00
Cameron Taylor	8052773f92	comment	2023-10-09 18:09:25 -04:00
Cameron Taylor	ee7108757b	proper fav and # symbol move	2023-10-09 18:09:24 -04:00
Cameron Taylor	9c641f9e90	tabbing movement	2023-10-09 18:09:24 -04:00
Cameron Taylor	c469d4b7c0	regexp filter	2023-10-09 18:09:24 -04:00
Cameron Taylor	ce2e6a3993	proper letter stuff	2023-10-09 18:09:24 -04:00
Cameron Taylor	e618fbc64f	bouncing thingie	2023-10-09 18:09:23 -04:00
Cameron Taylor	c2f46309ab	arrow and seperator back in	2023-10-09 18:09:20 -04:00