1762 commits

Author	SHA1	Message	Date
AppleHair	9fa603363c	[BUGFIX] Made freeplay use the metadata to get the instrumental suffix ... Song previews in freeplay will now use the instrumental suffix from the current difficulty's corresponding song variation metadata instead of using the variation id as an instrumental suffix and checking only the "erect" variation.	2024-06-10 19:42:27 +03: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
EliteMasterEric	09aa8fbf52	Rebindable controls for the Freeplay menu	2024-06-09 02:22:03 -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
EliteMasterEric	ca345e6c4f	Play song IDs based on the chart file's "instrumental" field, not the variation ID.	2024-06-06 21:38:00 -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
Cameron Taylor	a643765db4	Merge branch 'ninjamuffin99/funk-270' into rewrite/master	2024-06-04 22:00:30 -04:00
EliteMasterEric	ae950c7382	Finish save data repair (you should be able to transfer your save now)	2024-06-04 19:44:00 -04:00
Cameron Taylor	6a62f38c33	quicki fix for incorrect clip tweens	2024-06-04 16:51:27 -04:00
Cameron Taylor	84d4d044d6	check clip width when text changes	2024-06-04 16:47:58 -04:00
Cameron Taylor	29a33c8815	modifies behaviour of how the difficulty stars appear	2024-06-04 16:38:21 -04:00
Cameron Taylor	d4712a8ef7	alphabetical filtering for freeplay non-all sort	2024-06-04 16:24:24 -04:00
EliteMasterEric	c056c72762	Implement advanced save data repair.	2024-06-04 14:26:24 -04:00
Cameron Taylor	e12a48b6fc	fabs code stuff and difficulty fixin	2024-06-03 18:18:33 -04:00
Cameron Taylor	8c4709c25e	Merge branch 'results-scrolling' into anim-rename-fixins	2024-06-03 18:11:45 -04:00
Cameron Taylor	75621435ea	lil more polish to fav icon + clipping	2024-06-02 02:53:07 -04:00
Cameron Taylor	c64db9966b	Merge branch 'rewrite/master' into rank-fixes	2024-06-02 02:19:36 -04:00
Cameron Taylor	08f3b1d95b	anim fixes on results	2024-06-02 00:15:10 -04:00
Cameron Taylor	51a44d4810	persistent draw false for results screen (fixes FUNK-256)	2024-06-01 23:36:57 -04:00
Cameron Taylor	7c6c51ea71	results dupe fix	2024-06-01 22:36:47 -04:00
EliteMasterEric	7aee1f900a	Fix a Results->Freeplay crash	2024-06-01 20:54:24 -04:00
Cameron Taylor	8248cffbaf	small bool cleanings, and maybe fixes	2024-06-01 20:36:14 -04:00
FabsTheFabs	63bd6f2ace	sparks nd more fixes.. i think	2024-06-02 00:25:52 +01:00
Cameron Taylor	bd7875e86a	fix rank icons appearing when they shouldn't be	2024-06-01 17:13:07 -04:00
Cameron Taylor	c95ebaa948	Merge branch 'rewrite/master' into nothyper474/cwd-preloader	2024-06-01 16:27:08 -04:00
Cameron Taylor	ded413ab77	Merge branch 'rewrite/master' into gamerbross/chart-importer-suffix	2024-06-01 16:26:18 -04:00
Cameron Taylor	c2cc73077f	Merge pull request #588 from FunkinCrew/ninjamuffin99/funk-244-preview-songs-on-freeplay-should-last-longer ... make songs last longer on freeplay	2024-06-01 16:25:49 -04:00
Cameron Taylor	de92a7ba5c	Merge branch 'rewrite/master' into bugfix/may-31st-fixes	2024-06-01 16:23:37 -04:00
EliteMasterEric	12acdcd9d9	Fix a Results->Freeplay crash	2024-05-31 21:55:27 -04:00
FabsTheFabs	1cffc36ba8	results timing redo + fixed anims for all ranks	2024-06-01 01:17:11 +01:00
FabsTheFabs	e08cdac35b	score number shuffling	2024-06-01 01:16:52 +01:00
EliteMasterEric	074b1afc76	Readd a reverted freeplay bugfix	2024-05-31 20:16:23 -04:00
EliteMasterEric	acdd6ba403	Merge remote-tracking branch 'secret/rewrite/master' into bugfix/may-31st-fixes	2024-05-31 20:08:31 -04:00
EliteMasterEric	9088570b92	Make sure JSON data uses latest version/generatedBy when writing.	2024-05-31 19:21:21 -04:00
EliteMasterEric	06daa9d402	Increase Great threshold to 80%	2024-05-31 19:20:39 -04:00
EliteMasterEric	8bf26322e9	Update generatedBy to the latest value when saving a chart.	2024-05-31 18:09:30 -04:00
EliteMasterEric	98eda8ef55	Give timeFormat a default value (fixes the Stress issues!)	2024-05-31 18:09:07 -04:00
Cameron Taylor	a1e34123f5	Merge pull request #582 from FunkinCrew/title-bg-fix ... fix the one random slice of pixels where the bg doesnt show... lol (FUNK-239)	2024-05-31 18:08:05 -04:00
Cameron Taylor	72ca1145ba	Merge pull request #584 from FunkinCrew/hard-erect-lag-fix ... removes trace() that lags freeplay	2024-05-31 18:07:48 -04:00
Cameron Taylor	00566848e9	Merge pull request #586 from FunkinCrew/bugfix/mod-songs-freeplay-preview ... Disable song previews for mod songs rather than crashing the game	2024-05-31 18:07:32 -04:00
Cameron Taylor	d89a898e6c	make songs last longer on freeplay	2024-05-31 17:16:26 -04:00
FabsTheFabs	28444fd478	rank tweaks, favourite changes + rank anim fixes	2024-05-31 10:39:53 +01:00
FabsTheFabs	1e65cacb0e	fix funkinsound compile error	2024-05-31 10:39:06 +01:00
EliteMasterEric	2a8cdfaffa	Fix an extra crash.	2024-05-31 02:30:42 -04:00
EliteMasterEric	9e0a993746	Disable song previews for mod songs rather than crashing the game	2024-05-31 02:03:40 -04:00
EliteMasterEric	0d4f3cdc33	Scrolling results text	2024-05-31 01:42:41 -04:00
Eric	3b74a14a0d	Merge pull request #2610 from PurSnake/fixing ... [BUGFIX] Correct characters scaling on stage	2024-05-30 23:54:38 -04:00
EliteMasterEric	573e1575a7	Merge branch 'rewrite/master' into pursnake/character-scale	2024-05-30 23:40:00 -04:00
Cameron Taylor	7347b66ce4	removes trace() that lags freeplay	2024-05-30 23:07:41 -04:00
Cameron Taylor	7a2f3c81a1	fix the one random slice of pixels where the bg doesnt show... lol	2024-05-30 21:11:17 -04:00
Cameron Taylor	c322e2aeef	Merge branch 'rewrite/master' into feature/results-freeplay-transition	2024-05-30 21:05:32 -04:00
Cameron Taylor	5f70e1be0b	Merge branch 'develop-0.4.0' into rewrite/master	2024-05-30 20:54:27 -04:00
Cameron Taylor	d015e73066	Merge branch 'bugfix/multifix' into develop-0.4.0	2024-05-30 20:53:18 -04:00
Eric	2380058820	Merge pull request #2328 from nebulazorua/new-judge-applying ... New judge application logic	2024-05-30 16:10:17 -04:00