1609 commits

Author	SHA1	Message	Date
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
gamerbross	4acfbfb76d	Fix Legacy Chart Importer wrong instrumental	2024-05-25 01:21:37 +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
EliteMasterEric	e44266f5c0	Merge remote-tracking branch 'secret/feature/results-clear-rank' into develop-0.4.0	2024-05-24 13:29:35 -04: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
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
Cameron Taylor	a2ee359e46	fix for songs overlapping each other on desktop	2024-05-23 16:31:18 -04:00
gamerbross	5e130eeffc	Add Winning support to Legacy Health Icons	2024-05-23 18:18:37 +02:00
EliteMasterEric	0514e05328	Merge branch 'bugfix/html5-save-data' into develop-0.4.0	2024-05-22 15:15:56 -04:00
EliteMasterEric	55d66b858b	Merge branch 'feature/save-favorites' into develop-0.4.0	2024-05-22 15:15:47 -04:00
EliteMasterEric	30fd86befb	Merge branch 'feature/charter-in-pause-menu' into develop-0.4.0	2024-05-22 12:01:27 -04:00
EliteMasterEric	42ab0b74e3	Merge branch 'feature/results-clear-rank' into develop	2024-05-22 11:40:00 -04:00
sector-a	d84e832c6c	Make texts update on difficulty change in Story Menu	2024-05-22 12:57:57 +03:00
EliteMasterEric	f17f639304	Finish implementing smaller numbers.	2024-05-22 01:07:20 -04:00
Keoiki	4e47bfe68b	Fix Note Styles in PlayState & Chart Editor	2024-05-21 23:52:40 +03:00
EliteMasterEric	6d3b58cecd	Fix some additional compiling issues.	2024-05-21 04:02:53 -04:00
EliteMasterEric	fed6d1146c	Do some cleanup (replace several utility functions with a utility library we already depend on!)	2024-05-21 04:02:32 -04:00
EliteMasterEric	6cb5816378	Add freeplay favorites to the save data so they persist between sessions.	2024-05-21 02:49:07 -04:00
EliteMasterEric	f3868c2ee8	An attempt at an HTML5 save data fix	2024-05-21 02:23:21 -04:00
richTrash21	1050176b27	main menu camera fix	2024-05-20 23:52:48 +04:00
gamerbross	9a18e3fde6	Fix Charting Dragging Sustain Trails	2024-05-20 01:38:52 +02:00
gamerbross	dcfc51cdcd	Fix Charting Sustain Trails Inverted	2024-05-20 01:37:35 +02:00
EliteMasterEric	13595fca70	Changelog entry for chart metadata	2024-05-19 01:49:06 -04:00
EliteMasterEric	228ac66cc2	Credit the song's charter in the pause menu.	2024-05-19 01:48:51 -04:00
EliteMasterEric	faf7a0643c	Tinkered with ghost tapping some, leaving it off for now tho.	2024-05-19 01:47:36 -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
EliteMasterEric	b6b93bb0c6	Added clear percent, rank name, and background text.	2024-05-17 20:26:34 -04: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
JugieNoob	4f8a0dbebf	Fixed Freeplay Scrolling Issue	2024-05-12 01:35:04 +02:00
gamerbross	c0485fd1a2	Fix Freeplay Crash when song is invalid	2024-05-11 20:11:51 +02:00
EliteMasterEric	6c2d18c72c	Resurrected difficulty stars, fixed flame animation, fixed Random showing an album.	2024-05-11 01:05:51 -04:00
EliteMasterEric	83c3ff478c	Added Clear % tally to results.	2024-05-10 22:09:09 -04:00
EliteMasterEric	5d5cf74020	Reimplement rank-based results animations.	2024-05-09 22:37:21 -04:00
EliteMasterEric	a243b167b2	Fix up more credits	2024-05-09 22:37:01 -04:00
EliteMasterEric	99bd3a370f	Merge remote-tracking branch 'public/bugfix/duplicate-controls-binds' into bugfix/public-fixes	2024-05-09 16:41:42 -04:00
EliteMasterEric	c2650c0810	Merge remote-tracking branch 'public/bugfix/freeplay-lerp' into bugfix/public-fixes	2024-05-09 16:40:18 -04:00
EliteMasterEric	3207fd82f3	Merge remote-tracking branch 'public/bugfix/easter-egg-crash' into bugfix/public-fixes	2024-05-09 16:40:11 -04:00
EliteMasterEric	0b82a206ef	Merge remote-tracking branch 'public/bugfix/crash-handler-flxstate-check' into bugfix/public-fixes	2024-05-09 16:39:53 -04:00
Cameron Taylor	f2a06ad37b	fading in and erect track loading	2024-05-09 01:56:52 -04:00
Cameron Taylor	1b6febf01c	initial freeplay songs loading	2024-05-09 01:15:01 -04:00
codist	bfaa4626f8	Polish for the transition from GameOverSubState back into PlayState.	2024-05-09 01:10:53 -04:00
EliteMasterEric	4d5c0444c8	Fix an issue where control binds would be duplicated and quickly multiply.	2024-05-09 00:46:21 -04:00
Cameron Taylor	77446f28d7	Merge pull request #549 from FunkinCrew/sanitized/bugfix/easter-egg ... Fix an error related to an easter egg, plus some script warnings.	2024-05-08 23:30:50 -04:00
Cameron Taylor	9730ef4280	Merge pull request #550 from FunkinCrew/sanitized/bugfix/shader-crash-freeplay ... Fix a shader crash on Freeplay on some AMD cards.	2024-05-08 23:21:52 -04:00
Eric	34a6e16385	Merge pull request #2323 from nebulazorua/main ... Chart debug key takes you back to chart editor if you're charting	2024-05-08 23:14:59 -04:00
Eric	e3ee68abf2	Merge pull request #2370 from MadBear422/main ... Character selection fix for chart editor	2024-05-08 23:08:48 -04:00
codist	df5bdc7b7d	Fixed stutter once a transition to the main menu completes.	2024-05-08 22:42:33 -04:00
MadBear422	4d1c2c1b88	Character selection fix for chart editor.	2024-05-08 15:30:40 -07:00
nebulazorua	f5143c2d78	this is better	2024-05-08 19:56:13 +08:00
nebulazorua	6fdc090ecc	i have accidentally done this and wiped out my chart many times	2024-05-08 19:53:47 +08:00
codist	b49fac742f	Fixed stutter once a transition to the main menu completes.	2024-05-08 04:21:30 -04:00
EliteMasterEric	4e5531744a	Curse you burgerballs	2024-05-08 03:23:00 -04:00
Eric	6742e5c833	Merge pull request #2308 from Burgerballs/patch-1 ... Fix some spaghetti on PlayAnimationSongEvent	2024-05-08 02:32:26 -04:00
EliteMasterEric	2e74678caf	Fix an issue where the Freeplay menu never displays 100% clear.	2024-05-08 01:54:48 -04:00
codist	000e256b0e	Fixed an issue where hold note would be invisible for a single frame.	2024-05-08 01:20:39 -04:00
Burgerballs	2743a853bc	Fix some spaghetti on PlayAnimationSongEvent	2024-05-08 06:03:12 +01:00
EliteMasterEric	cfeca56634	Fix an error related to an easter egg, plus some warnings.	2024-05-08 00:36:22 -04:00
EliteMasterEric	be07760103	Fix a crash when querying FlxG.state	2024-05-08 00:08:44 -04:00
TheGalo X	5160fd02d4	fix window tween	2024-05-07 23:17:49 -03:00
EliteMasterEric	7ff37ae0c2	Fix a conflict between a shader variable name and a function on some graphics cards.	2024-05-07 14:22:22 -04:00
EliteMasterEric	a652bfe9f0	Fix an error related to an easter egg, plus some warnings.	2024-05-07 14:01:00 -04:00
Cameron Taylor	1aa53ee97b	Merge branch 'story-mode-diff-position' into develop-0.3.2	2024-05-03 01:14:31 -04:00
Cameron Taylor	7efc633f45	Merge branch 'actual-merch-fix' into develop-0.3.2	2024-05-03 01:12:23 -04:00
Cameron Taylor	ae9a132ccd	remove typing bit	2024-05-03 01:12:18 -04:00
EliteMasterEric	5e63832a87	Revert "Moved scroll speed to an instance variable" ... This reverts commit 6e5171b766.	2024-05-02 23:06:01 -04:00