2559 commits

Author	SHA1	Message	Date
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
lemz	5baa4c7ef7	Merge branch 'develop' into fps-setting	2024-05-31 11:52:10 +02: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
lemz	4ce79cc386	Merge branch 'develop' into fps-setting	2024-05-30 22:23:34 +02:00
Eric	2380058820	Merge pull request #2328 from nebulazorua/new-judge-applying ... New judge application logic	2024-05-30 16:10:17 -04:00
lemz	11fee0f200	Merge branch 'develop' into fps-setting	2024-05-30 13:54:22 +02:00
EliteMasterEric	b7a828e7d8	Make Freeplay use correct ranks, play the slam animation after Results, new Results music	2024-05-30 05:25:51 -04:00
EliteMasterEric	ee70e85dec	Merge branch 'rewrite/master' into feature/freeplay-shit+santa-cutscene	2024-05-29 23:56:51 -04:00
FabsTheFabs	e7079452fb	freeplay visual changes + base rank visuals	2024-05-30 04:34:00 +01:00
FabsTheFabs	68e9937b43	interval shake class	2024-05-30 04:33:26 +01:00
Eric	6cc9c3d968	Merge pull request #2409 from Burgerballs/scroll-speed-fix ... [FEATURE] Scroll Speed Event	2024-05-29 23:22:03 -04:00
EliteMasterEric	6572d13a7f	Improve documentation a bit.	2024-05-29 23:21:32 -04:00
Eric	0388f887b5	Merge pull request #2565 from gamerbross/bugfix/charting-sustain-trails ... [BUGFIX] Charting Editor Sustain Trails (2 bugs)	2024-05-29 22:54:49 -04:00
EliteMasterEric	174c595837	Fix crash caused by improperly canceling a tween	2024-05-29 22:49:57 -04:00
EliteMasterEric	8d7591a796	Fix an issue where Story Menu props wouldn't render.	2024-05-29 21:43:54 -04:00
lemz	26b357df72	Merge branch 'fps-setting' of https://github.com/lemz1/Funkin into fps-setting	2024-05-30 00:22:18 +02:00
lemz	4a531888b5	Update PreferencesMenu.hx	2024-05-30 00:22:10 +02:00
Cameron Taylor	75b4baefca	Merge branch 'gamerbross/chart-editor-sustains' into develop-0.4.0	2024-05-29 16:54:19 -04:00
Cameron Taylor	4dca6671c4	Merge branch 'gamerbross/freeplay-crash' into develop-0.4.0	2024-05-29 16:53:26 -04:00
Cameron Taylor	a2fd14c031	Merge branch 'richtrash21/main-menu-camera' into develop-0.4.0	2024-05-29 16:51:24 -04:00
Cameron Taylor	3ba778606b	Merge branch 'sector-a/story-menu-score' into develop-0.4.0	2024-05-29 16:50:05 -04:00
Cameron Taylor	5adeada357	Merge branch 'gamerbross/scripted-stage-tostring' into develop-0.4.0	2024-05-29 16:49:12 -04:00
Cameron Taylor	e449dfa0ef	Merge branch 'bugfix/titlestate-startintro-crash' into develop-0.4.0	2024-05-29 16:48:10 -04:00
Cameron Taylor	4f34079b98	Merge branch 'audio-stream' into develop-0.4.0	2024-05-29 16:45:35 -04:00
Your Name	ee4be81062	Now Preloader resets CWD	2024-05-29 15:16:31 -03:00
lemz	262bcc4d8b	Merge branch 'develop' into fps-setting	2024-05-29 18:45:09 +02:00
Eric	934d6c2518	Merge pull request #2539 from gamerbross/bugfix/titlestate-startintro-crash ... [BUGFIX] Fix TitleState bugs + crash	2024-05-29 01:50:46 -04:00
lemz	088ff3744a	Merge branch 'develop' into fps-setting	2024-05-29 07:26:35 +02:00
Eric	d02ecd17e8	Merge pull request #2576 from richTrash21/develop-mainmenu-fix ... [BUGFIX] Main Menu Camera Fix	2024-05-29 01:17:34 -04:00
Eric	972f649d82	Merge pull request #2604 from gamerbross/bugfix/legacy-chart-importer-instrumental ... [BUGFIX] Chart Importer Wrong Instrumental	2024-05-29 01:10:40 -04:00
Eric	60d90c6698	Merge pull request #2585 from sector-a/main ... Make texts update on difficulty change in Story Menu	2024-05-29 00:54:32 -04:00
EliteMasterEric	d97d77566e	Make song score lerp faster	2024-05-29 00:53:32 -04:00
lemz	01b1ce679c	Merge branch 'develop' into fps-setting	2024-05-29 06:42:46 +02:00
Eric	eeaae74b46	Merge pull request #2603 from gamerbross/bugfix/unscripted-stage-trace ... [BUGFIX] Unscripted Stage Log Trace (missing toString for Stage)	2024-05-29 00:27:36 -04:00
Cameron Taylor	9aa2411b50	Merge branch 'rewrite/master' into audio-stream	2024-05-28 23:59:36 -04:00
Cameron Taylor	2d300039ae	promises + error out partial sounds that attempt to load multiple times	2024-05-28 23:53:50 -04:00
Eric	fd9cfc2cb1	Merge pull request #2457 from gamerbross/bugfix/freeplay-no-song-data-crash ... [BUGFIX] Freeplay Crash when song is invalid	2024-05-28 23:47:46 -04:00
Eric	5e1f61665a	Merge pull request #2553 from lemz1/loadingbar-fix ... [BUGFIX] Fix Web Loading Bar (Again)	2024-05-28 23:37:16 -04:00
Eric	db7b97d513	Merge pull request #562 from FunkinCrew/loadingbar-fix ... [PUBLIC PR] Loading Bar Fix	2024-05-28 23:37:10 -04:00
EliteMasterEric	58415d49c9	Merge remote-tracking branch 'secret/bugfix/html5-save-data' into loadingbar-fix	2024-05-28 22:52:19 -04:00
Eric	34ca8dcd24	Merge pull request #2488 from MaybeMaru/downscroll ... Fix hold notes on downscroll	2024-05-28 22:02:46 -04:00
EliteMasterEric	f0cd6c50c8	Merge remote-tracking branch 'secret/rewrite/master' into downscroll	2024-05-28 21:57:29 -04:00
gamerbross	cf61b9ef90	Add toString to Stage + Revert "Fix Unscripted Stage Log Trace"	2024-05-28 14:51:16 +02:00
Cameron Taylor	f89e33d551	Merge branch 'rewrite/master' into Ethan-makes-music/main	2024-05-28 02:41:16 -04:00
Cameron Taylor	9ccee66b47	Merge branch 'rewrite/master' into downscroll	2024-05-28 02:24:40 -04:00
Cameron Taylor	8b73d4ef22	Merge branch 'rewrite/master' into bugfix/titlestate-startintro-crash	2024-05-28 02:20:45 -04:00
Cameron Taylor	e04a181d2c	Merge branch 'rewrite/master' into loadingbar-fix	2024-05-28 02:13:37 -04:00
EliteMasterEric	9a47666fc7	Fix a merge issue.	2024-05-28 01:37:30 -04:00
EliteMasterEric	3b5e85d050	Merge remote-tracking branch 'secret/rewrite/master' into bugfix/html5-save-data	2024-05-28 01:35:43 -04:00
Axuko	004ed32fad	Remove alot of unused imoprts	2024-05-27 22:34:28 -07:00
EliteMasterEric	3f9d8ccda9	Merge branch 'rewrite/master' into bugfix/html5-save-data	2024-05-28 01:34:16 -04:00
Cameron Taylor	827ad61602	Merge branch 'rewrite/master' into feature/results-clear-rank	2024-05-28 00:56:18 -04:00
PurSnake	cb2f4b0f06	[BUGFIX] Correct characters scaling ... bruh	2024-05-25 21:00:10 +03:00
lemz	267fd0eadc	alpha stuff and correct text positioning	2024-05-25 16:30:08 +02:00
lemz	814d72cb3f	sounds	2024-05-25 03:06:27 +02:00
lemz	b75f6e5853	Update PreferencesMenu.hx	2024-05-25 02:19:11 +02:00
gamerbross	4acfbfb76d	Fix Legacy Chart Importer wrong instrumental	2024-05-25 01:21:37 +02:00
lemz	dd6d12de23	rename vars	2024-05-25 01:20:10 +02:00
lemz	f86a163692	Merge branch 'develop' into fps-setting	2024-05-25 01:16:34 +02:00
lemz	e0fe7cb1eb	add fps option	2024-05-25 01:11:34 +02:00
gamerbross	07959d3e88	Fix Unscripted Stage Log Trace	2024-05-25 01:08:17 +02:00
EliteMasterEric	dd3e241f0c	Fix some merge conflicts	2024-05-24 16:44:12 -04:00
Cameron Taylor	85bfd00bad	desktop vis testing	2024-05-24 16:38:35 -04:00
EliteMasterEric	e44266f5c0	Merge remote-tracking branch 'secret/feature/results-clear-rank' into develop-0.4.0	2024-05-24 13:29:35 -04:00
Burgerballs	eb2b143a1c	Merge branch 'develop' into scroll-speed-fix	2024-05-24 17:23:45 +01:00
Eric	b167e485a1	Merge pull request #2593 from gamerbross/feature/legacy-healthicon-winning ... [FEATURE] Add Winning support to Legacy Health Icons	2024-05-24 01:51:10 -04:00
EliteMasterEric	44880fa569	Implement placeholder GREAT animation	2024-05-24 00:06:26 -04:00
Burgerballs	b40bb98bb4	Merge branch 'develop' into scroll-speed-fix	2024-05-23 22:44:25 +01:00
Cameron Taylor	b8ed779660	Merge branch 'rewrite/master' into feature/save-favorites	2024-05-23 17:14:07 -04:00
Cameron Taylor	c02d75b94a	Merge branch 'public-release/develop' into rewrite/master	2024-05-23 16:38:34 -04:00