1710 commits

Author	SHA1	Message	Date
gamerbross	8f44d9606d	Remove unnecessary scrollMenu sounds + adjust volume	2024-06-10 13:17:38 -04:00
Cameron Taylor	4691e3d249	Merge branch 'bugfix/chart-editor-event-toolbox-crash' into rewrite/master	2024-06-10 12:26:47 -04:00
Cameron Taylor	b7d25bf04f	Merge branch 'escape-quit' into rewrite/master	2024-06-10 12:04:30 -04:00
Cameron Taylor	5dcd3eb946	Merge branch 'heart-capsule-pos' into rewrite/master	2024-06-10 12:04:09 -04:00
Cameron Taylor	55edb9ea14	pressing escape on title screen exits game	2024-06-09 15:38:22 -04:00
Cameron Taylor	d974f12c72	Merge branch 'develop' into rewrite/master	2024-06-09 15:30:14 -04:00
Cameron Taylor	f2d5a80bd1	completes funk-305	2024-06-09 15:06:45 -04:00
Cameron Taylor	45b43108d1	lower fft amount on desktop	2024-06-07 22:36:25 -04:00
Eric	4169116129	Merge branch 'develop' into abstract-optionname	2024-06-07 21:44:28 -04:00
gamerbross	1172949a04	Fix Options Menu not enabled in transIn	2024-06-07 21:31:53 -04:00
EliteMasterEric	d19e9e62fa	Merge branch 'richtrash21/freeplay-camera-optimization' into develop	2024-06-07 21:21:11 -04:00
EliteMasterEric	2e4b94d528	Fix additional merge conflicts	2024-06-07 21:20:04 -04:00
EliteMasterEric	4382b3e16e	Merge branch 'develop' into richtrash21/freeplay-camera-optimization	2024-06-07 21:13:13 -04:00
Eric	9a8ba4183e	Merge branch 'develop' into patch-1	2024-06-07 21:08:09 -04:00
gamerbross	cd485213db	Pause Camera Follow when pausing	2024-06-08 02:26:17 +02:00
gamerbross	ee6c4478a9	Use FlxG.camera instead of camGame	2024-06-08 02:02:54 +02:00
Hundrec	393355b512	Fix botplay sustain release bug ... Copied opponent's holdTimer code to the player's side	2024-06-07 19:59:02 -04:00
EliteMasterEric	d39f3dc1e8	Merge branch 'main' into develop	2024-06-07 19:54:30 -04:00
Cameron Taylor	1d6315fe0e	Merge pull request #610 from FunkinCrew/2hot-freeplay ... regexp for numbers	2024-06-07 14:33:56 -04:00
Cameron Taylor	34c91dae76	dadbattle hard/erect fix	2024-06-07 14:24:57 -04:00
Cameron Taylor	a0adbc72b3	regexp for numbers	2024-06-07 13:04:45 -04:00
Cameron Taylor	6fd030cb30	Merge branch 'patch-1' into rewrite/master	2024-06-07 11:38:57 -04:00
Cameron Taylor	c54c10f562	lower fft res on desktop	2024-06-06 20:46:12 -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
Cameron Taylor	73c7bcf609	Merge branch 'rewrite/master' into burgerballs/scroll-speed-event	2024-06-06 19:49:47 -04:00
Cameron Taylor	02be65c383	Merge branch 'rewrite/master' into pursnake/character-scale	2024-06-06 19:47:48 -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
FabsTheFabs	642f272bce	freeplay polish + new text	2024-06-06 01:49:33 +01: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	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	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	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	50990b15e1	heart glow	2024-06-04 23:36:32 -04:00
Cameron Taylor	f2dd626ed9	rollback viz hmm	2024-06-04 22:37:51 -04:00
Cameron Taylor	56c72716fc	Merge branch 'bugfix/save-data-recovery' into rewrite/master	2024-06-04 22:08:51 -04:00
Cameron Taylor	cb773ed137	Merge branch 'ninjamuffin99/funk-269' into rewrite/master	2024-06-04 22:00:49 -04:00