3470 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
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
Eric	b6724eb8c6	Merge pull request #2581 from Keoiki/playstate-notestyles-query ... [FEATURE] Custom Note Style Support	2024-05-24 01:39:04 -04:00
Cameron Taylor	1326dcdc97	Merge pull request #2594 from FunkinCrew/language-labels ... add simple PR auto labelling action	2024-05-23 15:06:09 -04:00
Cameron Taylor	5d866cb186	pr target	2024-05-23 14:53:25 -04:00
Cameron Taylor	28bf46022a	add simple PR auto labelling action	2024-05-23 14:37:50 -04:00
gamerbross	5e130eeffc	Add Winning support to Legacy Health Icons	2024-05-23 18:18:37 +02:00
Keoiki	4e47bfe68b	Fix Note Styles in PlayState & Chart Editor	2024-05-21 23:52:40 +03:00
Eric	25016f45f9	Merge pull request #2508 from TechnikTil/main ... Ludum Dare 47 typo	2024-05-18 14:17:44 -04: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	0a4cbf4ef8	Merge pull request #2469 from gamerbross/vscode-just-debug ... Add debugging without compiling to VSCode	2024-05-18 14:16:52 -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
Eric	311fb1bca1	Merge pull request #2544 from SanicBTW/develop ... Keep the consistency in Conductor	2024-05-18 14:12:59 -04:00
Eric	12f2d9010d	Merge pull request #2396 from gedehari/compile-docs-fix ... Add a fix guide for those with poor internet connection	2024-05-18 14:02:42 -04:00
SanicBTW	6b42da0902	Keep the consistency in Conductor	2024-05-18 09:04:27 +02:00
Eric	6e5783ce8b	Merge pull request #2493 from richTrash21/develop-char-opt ... Use OR operator instead of Array.contains() in BaseCharacter	2024-05-17 19:30:51 -04:00
Eric	6a33f5026b	Merge pull request #2542 from FunkinCrew/main ... Apply fixes from main branch.	2024-05-17 19:29:27 -04:00
Eric	f4a31b30c3	Merge pull request #2472 from Noobz4Life/hxcodec-fix ... Bump hxCodec commit (fixes Linux issue where it crashes after load)	2024-05-17 19:27:36 -04:00
gamerbross	85b9de1de9	Allow Volume Keys while watching Toy Commercial (AttractState)	2024-05-17 23:53:43 +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	7490b7eab7	Merge branch 'develop-0.3.3'	2024-05-14 23:29:27 -04:00
Cameron Taylor	f21cff86be	asset submod grr...	2024-05-14 23:29:09 -04:00
Cameron Taylor	28bee8397e	git submodules trolled	2024-05-14 23:19:02 -04:00
Cameron Taylor	1befa9f548	Merge branch 'develop-0.3.3' into develop	2024-05-14 23:17:47 -04:00
Cameron Taylor	e724373563	more changeloggy	2024-05-14 22:16:57 -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	37fc84946d	Merge pull request #2357 from FunkinCrew/bugfix/shader-crash-freeplay ... Fix an AMD shader crash on Freeplay.	2024-05-14 22:14:22 -04:00
Cameron Taylor	1a8706b031	project.xml version bump	2024-05-14 22:11:57 -04:00
Cameron Taylor	4e6d980447	0.3.3 changelog	2024-05-14 22:10:13 -04:00
Cameron Taylor	ac06c23577	assets submod	2024-05-14 21:41:42 -04:00
Cameron Taylor	5e70d9fcef	Merge pull request #2390 from ImCodist/polish/game-over-transition ... Polish for the transition from GameOverSubState back into PlayState.	2024-05-14 21:32:19 -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	86de75feab	Merge pull request #2466 from JugieNoob/freeplayscrollwheel-bugfix ... Fixed Freeplay Scrolling Issue	2024-05-14 21:23:10 -04:00
Cameron Taylor	41686dce9e	assets submod	2024-05-14 21:22:17 -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
TechnikTil	be57564100	ludum dare 47 typo	2024-05-14 12:32:50 -06:00
Cameron Taylor	20810d4787	Merge pull request #2470 from gamerbross/bugfix/freeplay-exiting-active ... Fixed doing actions when exiting Freeplay menu	2024-05-13 21:30:49 -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	3be1056e35	Merge pull request #2499 from lemz1/loadingbar-fix ... Fix Web Loading Bar	2024-05-13 21:08:13 -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
richTrash21	7df41ebc56	minor optimization	2024-05-13 21:35:26 +04:00
Noobz4Life	42e69c1f73	bump hxcodec version	2024-05-12 18:51:21 -04:00
Noobz4Life	1f8954acad	bump hxcodec version (fixes linux compilation)	2024-05-11 21:47:28 -04:00