3129 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Cameron Taylor	7fb4b47e2a	Merge branch 'rewrite/master' into feature/credits	2024-04-01 22:06:58 -04:00
Cameron Taylor	626cc5cc78	assets submod	2024-04-01 22:06:44 -04:00
EliteMasterEric	67e096e443	Bunch of results screen fixes	2024-04-01 21:59:53 -04:00
Cameron Taylor	bf9f87e9e7	Merge pull request #441 from FunkinCrew/bugfix/spookeez-hold-note ... Bugfix/spookeez hold note	2024-04-01 21:00:14 -04:00
EliteMasterEric	927b2a7cfc	Put judgements below the notes, and remove COMBO word.	2024-04-01 20:21:27 -04:00
EliteMasterEric	1df4a354cb	Freeplay menu now filters to supported songs when you change difficulty	2024-04-01 18:34:26 -04:00
Cameron Taylor	583ecf97b0	Merge pull request #432 from FunkinCrew/feature/new-audio ... Audio improvements and a Freeplay crash fix	2024-03-30 03:32:52 -04:00
Cameron Taylor	ac5ca3991e	Merge branch 'rewrite/master' into feature/new-audio	2024-03-30 03:32:30 -04:00
Cameron Taylor	fe498b38e5	assets submod	2024-03-30 03:32:17 -04:00
Cameron Taylor	e03998fd86	Merge pull request #439 from FunkinCrew/bugfix/week-6-blueball-camera ... Fix camera in game over screen on Week 6	2024-03-30 03:25:08 -04:00
Cameron Taylor	52c5f81e26	Merge branch 'rewrite/master' into bugfix/week-6-blueball-camera	2024-03-30 03:24:46 -04:00
Cameron Taylor	3637e3594b	assets submod	2024-03-30 03:24:30 -04:00
Cameron Taylor	065ef8895b	Merge pull request #448 from FunkinCrew/bugfix/spooky-lightning-crash ... Fix polymod error on Spookeez	2024-03-30 03:07:03 -04:00
Cameron Taylor	846df8de6f	assets submod	2024-03-30 03:06:39 -04:00
FabsTheFabs	2f22bb8abe	update assets submodule	2024-03-30 05:10:33 +00:00
FabsTheFabs	f53d4ac89d	Merge remote-tracking branch 'origin/bugfix/quick-camera-fixes' into feature/2hot-cutscenes	2024-03-30 03:35:30 +00:00
FabsTheFabs	254648eb55	update assets submodule	2024-03-30 03:27:40 +00:00
EliteMasterEric	f19507bd95	Add a bunch of erect songs	2024-03-29 23:00:42 -04:00
FabsTheFabs	175c580fef	update assets submodule	2024-03-29 23:34:22 +00:00
Cameron Taylor	32ed26ffa6	stereo preloader in progress	2024-03-29 17:54:20 -04:00
EliteMasterEric	5be47e6619	Fix limo ride too	2024-03-29 10:34:59 -04:00
EliteMasterEric	f50c1ce86f	Update assets submodule	2024-03-29 10:17:16 -04:00
Cameron Taylor	1803742af8	Merge pull request #447 from FunkinCrew/cancel-merge-2 ... lol ref	2024-03-29 02:14:46 -04:00
Cameron Taylor	2d2aa271dd	Merge pull request #446 from FunkinCrew/cancel-merge-2 ... better branch	2024-03-29 02:14:39 -04:00
Cameron Taylor	826b6737e5	Merge pull request #445 from FunkinCrew/cancel-merge-2 ... sender branch name	2024-03-29 02:14:31 -04:00
Cameron Taylor	10db02a19b	Merge pull request #444 from FunkinCrew/cancel-merged-actions ... remove push lol	2024-03-29 02:14:11 -04:00
Cameron Taylor	d7a4fa7601	Merge pull request #443 from FunkinCrew/cancel-merged-actions ... Cancel runs of merged and "outdated" branches	2024-03-29 02:13:50 -04:00
Cameron Taylor	e949900bec	Merge pull request #434 from FunkinCrew/bugfix/combo-fixes ... Bugfix/combo fixes cancel builds if there's a new one queued get list of current runs on current-branch push test comment out if merge wrap in string actions permissions log more log cancel runs test write permission uncomment pr merge check remove push lol sender branch name better branch lol ref	2024-03-29 02:13:46 -04:00
Cameron Taylor	f6857d3aa1	Merge pull request #434 from FunkinCrew/bugfix/combo-fixes ... Bugfix/combo fixes cancel builds if there's a new one queued get list of current runs on current-branch push test comment out if merge wrap in string actions permissions log more log cancel runs test write permission uncomment pr merge check remove push lol sender branch name better branch	2024-03-29 02:13:43 -04:00
Cameron Taylor	1a1f40e31b	Merge pull request #434 from FunkinCrew/bugfix/combo-fixes ... Bugfix/combo fixes cancel builds if there's a new one queued get list of current runs on current-branch push test comment out if merge wrap in string actions permissions log more log cancel runs test write permission uncomment pr merge check remove push lol sender branch name	2024-03-29 02:13:40 -04:00
Cameron Taylor	be69a10b86	Merge pull request #434 from FunkinCrew/bugfix/combo-fixes ... Bugfix/combo fixes cancel builds if there's a new one queued get list of current runs on current-branch push test comment out if merge wrap in string actions permissions log more log cancel runs test write permission uncomment pr merge check remove push lol	2024-03-29 02:13:34 -04:00
Cameron Taylor	93a270fba5	Merge pull request #434 from FunkinCrew/bugfix/combo-fixes ... Bugfix/combo fixes cancel builds if there's a new one queued get list of current runs on current-branch push test comment out if merge wrap in string actions permissions log more log cancel runs test write permission uncomment pr merge check	2024-03-29 02:13:06 -04:00
EliteMasterEric	9b7bfff817	Update assets submodule	2024-03-29 01:23:36 -04:00
EliteMasterEric	28462681b2	Fix bug where 100ms sustains wouldn't update their rendering.	2024-03-29 00:52:20 -04:00
EliteMasterEric	7c04630bb7	Fix a bug where duplicate notes would get placed at the beginning	2024-03-29 00:49:02 -04:00
Cameron Taylor	5ee550afb1	Merge pull request #434 from FunkinCrew/bugfix/combo-fixes ... Bugfix/combo fixes	2024-03-29 00:46:38 -04:00
Cameron Taylor	0ce8ac3265	Merge pull request #438 from FunkinCrew/feature/weekend-1-graphic ... Update Story Menu Weekend 1 graphic	2024-03-29 00:44:46 -04:00
Cameron Taylor	c97227b130	assets submod	2024-03-29 00:39:32 -04:00
EliteMasterEric	ddb41c9ef7	Increase AFK timer, and add SFX over it	2024-03-28 23:13:47 -04:00
Cameron Taylor	b75c7c2361	funkVis html5	2024-03-28 23:08:50 -04:00
EliteMasterEric	342782c3d3	Fix issue with pink screen when moving from PlayState->Freeplay->Main Menu	2024-03-28 22:33:50 -04:00
EliteMasterEric	aa7ff6fbc4	Update assets submodule	2024-03-28 21:40:47 -04:00
EliteMasterEric	8020624366	Fix a crash I found.	2024-03-28 21:40:16 -04:00
EliteMasterEric	1c9b087f2f	Update assets submodule	2024-03-28 21:20:08 -04:00
Jenny Crowe	e2851818b3	Zoom Camera: Property tweaks	2024-03-28 17:47:38 -07:00
EliteMasterEric	443a501e4e	Merge branch 'rewrite/master' into feature/freeplay-ost-text	2024-03-28 20:33:17 -04:00
Eric	0eddea9bf8	Merge branch 'rewrite/master' into bugfix/combo-fixes	2024-03-28 20:32:34 -04:00
EliteMasterEric	22f8d39ef1	Merge branch 'rewrite/master' into hl-compiles	2024-03-28 20:32:11 -04:00
Eric	7e96b02248	Merge branch 'rewrite/master' into feature/new-audio	2024-03-28 20:31:10 -04:00
EliteMasterEric	c7d67b46e0	Update art submodule	2024-03-28 20:29:32 -04:00