3926 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Cameron Taylor	7214e159e0	update grig	2024-06-06 20:50:53 -04:00
Cameron Taylor	c54c10f562	lower fft res on desktop	2024-06-06 20:46:12 -04:00
Cameron Taylor	c0594b8c73	Merge branch 'satin-panties-erect' into rewrite/master	2024-06-06 20:31:09 -04:00
EliteMasterEric	715e834753	Update changelog	2024-06-06 20:30:15 -04:00
Cameron Taylor	20b9b2eddd	Merge branch 'satin-panties-erect' into rewrite/master	2024-06-06 20:29:18 -04:00
EliteMasterEric	7c638e0274	Add satin panties erect difficulty chart	2024-06-06 20:26:25 -04:00
Cameron Taylor	3c2a3a377e	Merge branch 'feature/spazkid-chart-changes' into rewrite/master	2024-06-06 20:22:29 -04:00
Cameron Taylor	e01e4d1e76	assets submod	2024-06-06 20:21:37 -04:00
Cameron Taylor	4f0e77c974	update hmm	2024-06-06 20:20:54 -04:00
Cameron Taylor	fa270aa6ca	Merge branch 'rewrite/master' into fix/grig-viz	2024-06-06 20:17:25 -04:00
Cameron Taylor	e45e359de7	Merge branch 'mainmenu-remember-selection' into rewrite/master	2024-06-06 20:15:11 -04:00
Cameron Taylor	7ef14b24c7	Merge branch 'prshit' into rewrite/master	2024-06-06 20:13:36 -04:00
Cameron Taylor	3aa3007dbb	Merge branch 'fix-url-open' into rewrite/master	2024-06-06 20:12:28 -04:00
EliteMasterEric	266049df65	Update assets submodule	2024-06-06 20:10:28 -04:00
Cameron Taylor	0bb22b60d9	update game version	2024-06-06 19:55:50 -04:00
Cameron Taylor	cd6dc35958	Merge pull request #579 from FunkinCrew/burgerballs/scroll-speed-event ... [PUBLIC PR] Implement Scroll Speed song events into the Chart Editor	2024-06-06 19:50:57 -04:00
Cameron Taylor	73c7bcf609	Merge branch 'rewrite/master' into burgerballs/scroll-speed-event	2024-06-06 19:49:47 -04:00
Cameron Taylor	d0e5c7f12b	Merge pull request #585 from FunkinCrew/pursnake/character-scale ... [PUBLIC PR] Fix an issue with character scaling	2024-06-06 19:49:35 -04:00
Cameron Taylor	02be65c383	Merge branch 'rewrite/master' into pursnake/character-scale	2024-06-06 19:47:48 -04:00
Cameron Taylor	8e6c43b81b	Merge pull request #605 from FunkinCrew/fabs-final-fixes ... Freeplay fixes, + some minor bug fixes	2024-06-06 19:47:16 -04:00
Cameron Taylor	824b05256d	Merge branch 'rewrite/master' into fabs-final-fixes	2024-06-06 19:46:50 -04:00
Cameron Taylor	e4647e9e2d	assets submod	2024-06-06 19:46:44 -04:00
Cameron Taylor	bdcb420c04	Merge pull request #604 from FunkinCrew/holy-fuck-pixel-one ... Update num1-pixel.png to not suck	2024-06-06 19:31:43 -04:00
EliteMasterEric	700b6e11b8	Update assets submodule	2024-06-06 19:05:05 -04:00
EliteMasterEric	fe5f1eb6ea	Fix merge conflict	2024-06-06 17:11:30 -04:00
EliteMasterEric	70f027cc3f	Fix another crash with the chart editor event toolbox	2024-06-06 16:44:47 -04:00
EliteMasterEric	a81b6b2d6e	Fix issue with rendering the grid in 3/4 time signature	2024-06-06 16:44:20 -04:00
EliteMasterEric	2596e6369e	More chart changes by SpazKid + changelog update	2024-06-06 14:00:22 -04:00
FabsTheFabs	b7eed4c4d3	assets submoddd!!!!!	2024-06-06 01:50:19 +01:00
FabsTheFabs	642f272bce	freeplay polish + new text	2024-06-06 01:49:33 +01:00
EliteMasterEric	e27e96a1cb	Update assets submodule	2024-06-05 20:19:00 -04:00
EliteMasterEric	6fb19dc4d3	Update chart editor dropdowns to be searchable	2024-06-05 20:09:26 -04:00
EliteMasterEric	6d133f007d	Fix a bug where the event data toolbox wouldn't rebuild, and it would crash.	2024-06-05 19:25:53 -04:00
Cameron Taylor	bc783a278a	rank clipping fix	2024-06-05 18:21:57 -04:00
Cameron Taylor	4311dd2074	hopefully dadbattle fix lol	2024-06-05 17:58:22 -04:00
Cameron Taylor	8616722e60	asset submod	2024-06-05 17:14:04 -04:00
Cameron Taylor	e01fa2c85e	Merge branch 'result-percentage' into rewrite/master	2024-06-05 17:11:47 -04:00
Cameron Taylor	6334d16984	Merge branch 'ninjamuffin99/funk-250' into rewrite/master	2024-06-05 17:11:22 -04:00
Cameron Taylor	eaa63196b3	fix for dadbattle appearing on freeplay	2024-06-05 17:10:53 -04:00
Cameron Taylor	c1bfc67f52	remove effin trace	2024-06-05 15:43:25 -04:00
Cameron Taylor	5bcc0f9b25	partial sound loading should be more resiliant	2024-06-05 15:02:29 -04:00
Cameron Taylor	6e761ba156	hardcode the songname position	2024-06-05 14:47:29 -04:00
Cameron Taylor	fa1fafba68	less effin traces	2024-06-05 14:13:06 -04:00
Cameron Taylor	3534ba6224	roses fix	2024-06-05 13:50:57 -04:00
Cameron Taylor	af2e4bd16c	Merge pull request #600 from FunkinCrew/feature/cory-chart-updates ... Cory made some chart tweaks. Plus some authorship changes.	2024-06-05 01:50:41 -04:00
Cameron Taylor	88248233b0	Merge pull request #599 from FunkinCrew/bugfix/results-percent-display ... Fix some display issues with the clear percent in the results screen.	2024-06-05 01:48:43 -04:00
EliteMasterEric	9f3d80d1db	Cory made some chart tweaks. Plus some authorship changes.	2024-06-05 01:16:30 -04:00
EliteMasterEric	640c1cf236	Dave say 1 minute to make Dad sneak up and 2 minutes to play the cartoons	2024-06-05 00:49:59 -04:00
EliteMasterEric	5dda95c69b	Fix some display issues with the clear percent in the results screen.	2024-06-05 00:40:14 -04:00
Cameron Taylor	03bccee054	assets submod	2024-06-04 23:39:49 -04:00