4296 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Cameron Taylor	fbcf553bd9	Merge branch 'rewrite/master' into week5-alt-bg	2024-09-06 20:23:21 -04:00
FabsTheFabs	40b5ad7c2a	assets submod	2024-09-07 00:54:21 +01:00
FabsTheFabs	e0a4818e5a	registry updates	2024-09-07 00:52:38 +01:00
Cameron Taylor	b1e68c27fd	Merge branch 'rewrite/master' into feature/pico-results-perfect	2024-09-06 19:46:39 -04:00
Cameron Taylor	a623ec77f7	Merge branch 'feature/char-unlock-notif' into rewrite/master	2024-09-06 19:44:58 -04:00
Cameron Taylor	89e1cb8258	small null fix for if we're not playing music	2024-09-06 19:44:33 -04:00
Cameron Taylor	55c5e01bd5	Merge branch 'camera-helpies' into rewrite/master	2024-09-06 19:12:59 -04:00
Cameron Taylor	4f666e4855	creds merge	2024-09-06 19:12:36 -04:00
Cameron Taylor	e185eef7ea	Merge branch 'feature/album-titles-and-results-themes' into rewrite/master	2024-09-06 19:11:50 -04:00
Cameron Taylor	c45fa93786	update lime (ndlls)	2024-09-06 16:46:11 -04:00
EliteMasterEric	313dba6985	Update assets submodule	2024-09-06 00:24:07 -04:00
EliteMasterEric	34d13c61de	Cleanup character unlock impl and queue it for after Story Mode is completed.	2024-09-05 17:54:03 -04:00
EliteMasterEric	239b9b0419	Update assets submodule	2024-09-05 02:10:51 -04:00
Cameron Taylor	33aaabe190	lil console command helper for camera zoom	2024-09-05 01:22:45 -04:00
Cameron Taylor	0e37cb9540	Merge branch 'rewrite/master' into bugfix/blazin-flxanimate-fixes	2024-09-05 00:31:47 -04:00
Cameron Taylor	5c44e61ce1	assets submod	2024-09-05 00:20:55 -04:00
EliteMasterEric	24096bd319	Fixed positioning in Blazin'.	2024-09-04 10:58:18 -04:00
EliteMasterEric	3a2ca6b525	Code changes to fix Blazin'	2024-09-04 09:58:04 -04:00
EliteMasterEric	0a6350113e	Fix some issues with Blazin	2024-09-04 09:58:00 -04:00
Cameron Taylor	b37ebf1aac	assets submod	2024-09-03 23:57:01 -04:00
Cameron Taylor	788f0ee026	Merge branch 'bugfix/labor-daybor' into rewrite/master	2024-09-03 23:56:45 -04:00
Cameron Taylor	bd144d6adb	Merge branch 'rewrite/master' into bugfix/friday-fixes	2024-09-03 23:42:51 -04:00
EliteMasterEric	36505f75c1	The actual code for custom freeplay music LOL	2024-09-03 21:14:57 -04:00
FabsTheFabs	f16bffb3fc	assets submod.....................	2024-09-03 19:19:25 +01:00
FabsTheFabs	b58bd07fd2	rain shader recolor support	2024-09-03 19:16:58 +01:00
FabsTheFabs	d049478c65	registry updates	2024-09-03 19:16:46 +01:00
Cameron Taylor	930f5ff5a6	Merge branch 'feature/instrumental-select-hud' into rewrite/master	2024-09-03 11:25:34 -04:00
EliteMasterEric	2f59363432	Merge branch 'bugfix/assets-cleanup' into develop-2	2024-09-03 00:21:25 -04:00
Cameron Taylor	498cd4a830	Merge branch 'cards-and-char-select' into rewrite/master	2024-09-01 17:56:12 -04:00
Cameron Taylor	33d1112095	Merge branch 'bugfix/assets-cleanup' into rewrite/master	2024-09-01 17:20:03 -04:00
Cameron Taylor	cdc3883173	assets submod	2024-09-01 17:19:39 -04:00
EliteMasterEric	7511de1e7a	A bunch of Freeplay visual fixes	2024-09-01 03:28:56 -04:00
EliteMasterEric	21d5bb6112	Update assets submodule	2024-08-29 22:10:27 -04:00
FabsTheFabs	71da847158	forgot to change these back	2024-08-30 01:12:26 +01:00
FabsTheFabs	4f562e3d6c	assets submod	2024-08-30 01:08:47 +01:00
FabsTheFabs	27970e4c2d	freeplay style changelog oops	2024-08-30 01:04:51 +01:00
FabsTheFabs	60c10aae99	char select to freeplay transition, backing card implementation, beatHit for backing cards	2024-08-30 01:04:30 +01:00
FabsTheFabs	0c809c828e	color tint for angle mask shader	2024-08-30 01:03:11 +01:00
FabsTheFabs	de03da7e6f	backing card classes	2024-08-30 01:02:32 +01:00
FabsTheFabs	e7448cb8f7	style support	2024-08-30 00:58:19 +01:00
FabsTheFabs	a4f3c2cb84	freeplay style code	2024-08-30 00:55:24 +01:00
Cameron Taylor	78fb6e1188	Merge pull request #712 from FunkinCrew/menu-music-fix ... FUNK-525 stop main menu music from playing when entering freeplay from pausemenu	2024-08-29 18:28:00 -04:00
Cameron Taylor	ecd6100cf9	assets submod	2024-08-29 18:26:04 -04:00
Cameron Taylor	3e339916d2	flxanimate bump	2024-08-29 18:11:51 -04:00
Cameron Taylor	737a679196	merge conflict fixins	2024-08-29 15:26:35 -04:00
Cameron Taylor	825327e1c8	Merge branch 'rewrite/master' into feature/charSelect	2024-08-29 15:13:58 -04:00
Cameron Taylor	364a5d5a55	hmm flxanimate version fix	2024-08-29 15:06:11 -04:00
Cameron Taylor	0392eddba6	gf/nene char select mini optimization	2024-08-29 14:32:10 -04:00
Cameron Taylor	b27aa4c94d	Merge branch 'rewrite/master' into feature/pico-playable-christmas	2024-08-29 13:40:56 -04:00
Cameron Taylor	0a316c815f	stop main menu music from playing when entering freeplay from pausemenu	2024-08-29 13:22:56 -04:00