2390 commits

Author	SHA1	Message	Date
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
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
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
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	34ca8dcd24	Merge pull request #2488 from MaybeMaru/downscroll ... Fix hold notes on downscroll	2024-05-28 22:02:46 -04:00
gamerbross	cf61b9ef90	Add toString to Stage + Revert "Fix Unscripted Stage Log Trace"	2024-05-28 14:51:16 +02: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
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
gamerbross	5e130eeffc	Add Winning support to Legacy Health Icons	2024-05-23 18:18:37 +02:00
sector-a	d84e832c6c	Make texts update on difficulty change in Story Menu	2024-05-22 12:57:57 +03:00
Keoiki	4e47bfe68b	Fix Note Styles in PlayState & Chart Editor	2024-05-21 23:52:40 +03:00
richTrash21	1050176b27	main menu camera fix	2024-05-20 23:52:48 +04:00
lemz	e0867643d0	fix the setgraphicsize stuff	2024-05-19 01:39:30 +02:00
Eric	6744c1d261	Merge pull request #2518 from gamerbross/bugfix/gameover-charting-crash ... [BUGFIX] ChartingState GameOver Crashes	2024-05-18 14:17:29 -04:00
Eric	8432f0668a	Merge pull request #2540 from gamerbross/bugfix/attract-toycommercial-allow-volume ... [BUGFIX] Allow Volume Keys while watching Toy Commercial (AttractState)	2024-05-18 14:13:28 -04:00
SanicBTW	6b42da0902	Keep the consistency in Conductor	2024-05-18 09:04:27 +02:00
gamerbross	85b9de1de9	Allow Volume Keys while watching Toy Commercial (AttractState)	2024-05-17 23:53:43 +02:00
gamerbross	b10872e8e8	Fix TitleState late start + enter spam crash	2024-05-17 23:51:07 +02:00
gamerbross	f1a0692c51	Fix ChartingState GameOver Crashes	2024-05-15 22:50:34 +02:00
rich	a8279cdd76	Merge branch 'FunkinCrew:main' into develop-char-opt	2024-05-15 16:32:22 +04:00
Cameron Taylor	bd7b1fb544	Merge branch 'public-release/main' into develop-0.3.3	2024-05-14 22:15:29 -04:00
Cameron Taylor	84a4a23d3c	Merge branch 'polish/game-over-transition' into public-release/develop	2024-05-14 21:32:05 -04:00
Cameron Taylor	2434f64381	web fix for scroll	2024-05-14 21:21:47 -04:00
Cameron Taylor	1619751eab	Merge branch 'public-release/develop' into freeplayscrollwheel-bugfix	2024-05-14 21:13:48 -04:00
Cameron Taylor	0428482d04	Merge branch 'bugfix/freeplay-exiting-active' into public-release/develop	2024-05-13 21:30:02 -04:00
Cameron Taylor	e26d4ac440	Merge pull request #554 from FunkinCrew/bugfix/public-fixes ... Eric's public bug fixes	2024-05-13 21:20:47 -04:00
Cameron Taylor	259df760bc	re-add lerp to load screen	2024-05-13 21:06:41 -04:00
lemz	54f337fe9c	Merge remote-tracking branch 'origin/develop' into loadingbar-fix	2024-05-14 00:17:25 +02:00
lemz	4e935b47c6	Update LoadingState.hx	2024-05-14 00:04:45 +02:00
MaybeMaru	c5caa0331e	Update Strumline.hx	2024-05-13 22:17:47 +02:00
richTrash21	7df41ebc56	minor optimization	2024-05-13 21:35:26 +04:00
MaybeMaru	c270f61cac	Update Strumline.hx	2024-05-13 02:21:43 +02:00
MaybeMaru	b22dd4d7d4	Update Strumline.hx	2024-05-13 02:18:57 +02:00
gamerbross	090e4fc6e8	Fixed doing actions when exiting Freeplay menu	2024-05-12 02:42:02 +02:00
JugieNoob	b22f09d4da	Fixed Scrolling on HTML5 Platforms	2024-05-12 02:21:59 +02:00