803 commits

Author	SHA1	Message	Date
Cameron Taylor	c05f053fe3	Merge branch 'rewrite/master' into bugfix/instrumental-id	2024-06-11 16:12:39 -04:00
EliteMasterEric	b30faad7d9	Save high scores and high ranks separately.	2024-06-11 00:40:43 -04:00
DM-kun	da61b72c48	crash fix	2024-06-10 16:21:41 -04:00
gamerbross	8f44d9606d	Remove unnecessary scrollMenu sounds + adjust volume	2024-06-10 13:17:38 -04:00
Cameron Taylor	4691e3d249	Merge branch 'bugfix/chart-editor-event-toolbox-crash' into rewrite/master	2024-06-10 12:26:47 -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
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	7ef14b24c7	Merge branch 'prshit' into rewrite/master	2024-06-06 20:13:36 -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	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
Cameron Taylor	e01fa2c85e	Merge branch 'result-percentage' into rewrite/master	2024-06-05 17:11:47 -04:00
Cameron Taylor	eaa63196b3	fix for dadbattle appearing on freeplay	2024-06-05 17:10:53 -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
EliteMasterEric	5dda95c69b	Fix some display issues with the clear percent in the results screen.	2024-06-05 00:40:14 -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	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
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
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
FabsTheFabs	28444fd478	rank tweaks, favourite changes + rank anim fixes	2024-05-31 10:39:53 +01: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	c322e2aeef	Merge branch 'rewrite/master' into feature/results-freeplay-transition	2024-05-30 21:05:32 -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
EliteMasterEric	b7a828e7d8	Make Freeplay use correct ranks, play the slam animation after Results, new Results music	2024-05-30 05:25:51 -04: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
EliteMasterEric	174c595837	Fix crash caused by improperly canceling a tween	2024-05-29 22:49:57 -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	4f34079b98	Merge branch 'audio-stream' into develop-0.4.0	2024-05-29 16:45:35 -04: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	db7b97d513	Merge pull request #562 from FunkinCrew/loadingbar-fix ... [PUBLIC PR] Loading Bar Fix	2024-05-28 23:37:10 -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
Cameron Taylor	9ccee66b47	Merge branch 'rewrite/master' into downscroll	2024-05-28 02:24:40 -04:00
EliteMasterEric	3b5e85d050	Merge remote-tracking branch 'secret/rewrite/master' into bugfix/html5-save-data	2024-05-28 01:35:43 -04: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
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	c02d75b94a	Merge branch 'public-release/develop' into rewrite/master	2024-05-23 16:38:34 -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	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
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	fed6d1146c	Do some cleanup (replace several utility functions with a utility library we already depend on!)	2024-05-21 04:02:32 -04:00
etvx86	9968c8eabc	Fix some trace typos	2024-05-20 10:42:17 -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
Eric	6744c1d261	Merge pull request #2518 from gamerbross/bugfix/gameover-charting-crash ... [BUGFIX] ChartingState GameOver Crashes	2024-05-18 14:17:29 -04:00
EliteMasterEric	b6b93bb0c6	Added clear percent, rank name, and background text.	2024-05-17 20:26:34 -04:00
gamerbross	f1a0692c51	Fix ChartingState GameOver Crashes	2024-05-15 22:50:34 +02:00
Burgerballs	21333ee8dc	burgerbugs require burgerfixes	2024-05-15 17:26:03 +01:00
Burgerballs	eaf998adf7	curse burgerballs	2024-05-15 17:24:04 +01:00
Burgerballs	96de434d75	multiplicative added!! + sum tween fixes	2024-05-15 17:17:09 +01:00
nebulazorua	e462b04b59	does notesplash	2024-05-15 20:46:08 +08:00
rich	a8279cdd76	Merge branch 'FunkinCrew:main' into develop-char-opt	2024-05-15 16:32:22 +04:00
Cameron Taylor	84a4a23d3c	Merge branch 'polish/game-over-transition' into public-release/develop	2024-05-14 21:32:05 -04: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
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
Burgerballs	5fd2ea0bcf	optimization of the cleary boy (:	2024-05-10 21:37:46 +01:00
Burgerballs	a5700b37e1	awesome shit (see desc) ... No longer Additive, it just sets the scroll speed Now you can set it to either strumline	2024-05-10 21:23:35 +01: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	3207fd82f3	Merge remote-tracking branch 'public/bugfix/easter-egg-crash' into bugfix/public-fixes	2024-05-09 16:40:11 -04:00
Burgerballs	e5ee6efdf4	redundancy is bad!!!!	2024-05-09 20:01:26 +01:00
Burgerballs	edfde606a1	magical machine of death	2024-05-09 17:51:03 +01:00
codist	bfaa4626f8	Polish for the transition from GameOverSubState back into PlayState.	2024-05-09 01:10:53 -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
Sword352	f6334fb30b	Use animOffsets directly.	2024-05-08 22:18:41 +02:00
nebulazorua	4b500f78e1	Revert change because i forgot to do it in a new branch oriignally lol	2024-05-08 20:30:47 +08:00
nebulazorua	2eaea3cdc5	Apply judgements through a seperate function to applyScore ... Also adds more to the HitNoteScriptEvent, such as the noteDiff and also isComboBreak. noteDiff is important as it lets you create stuff like notes with reduced hitboxes (i.e mines/"hurt notes") or millisecond hit displays. isComboBreak lets you set whether the judge combo broke, so you could in theory create custom judgements in scripts now with these changes (killer reimplementation in scripts? more likely than you'd think!)	2024-05-08 20:26:17 +08: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
EliteMasterEric	4e5531744a	Curse you burgerballs	2024-05-08 03:23:00 -04:00
Sword352	dd86934712	did the requested changes	2024-05-08 09:22:49 +02:00
Eric	6742e5c833	Merge pull request #2308 from Burgerballs/patch-1 ... Fix some spaghetti on PlayAnimationSongEvent	2024-05-08 02:32:26 -04:00
Sword352	7ce3eabd17	Better character animation offsets handling.	2024-05-08 07:35:46 +02: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	5e63832a87	Revert "Moved scroll speed to an instance variable" ... This reverts commit 6e5171b766.	2024-05-02 23:06:01 -04:00
EliteMasterEric	23a27dd36e	Implement onSongLoaded script event (with access to notes and events)	2024-05-02 04:11:27 -04:00
EliteMasterEric	65854b2ca8	Fix an issue with animated health icons from mods.	2024-05-02 04:09:38 -04:00
EliteMasterEric	cf01157b39	Mid-song cutscenes should just do nothing after they are finished,	2024-05-02 03:39:18 -04:00
EliteMasterEric	6e5171b766	Moved scroll speed to an instance variable in PlayState (for da modders :P)	2024-05-01 22:39:13 -04:00
Cameron Taylor	aaeb77a1f5	preventDefaultKeys for PreciseInputManager, and just use the FlxG.keys version	2024-05-01 17:23:22 -04:00
EliteMasterEric	079b1f327a	Fix two crashes thanks to a crash report	2024-04-30 23:24:43 -04:00
EliteMasterEric	dae7d71b17	Better (but not perfect) results screen text alignment	2024-04-30 13:34:34 -04:00
Cameron Taylor	23dd9937ec	black camera bg	2024-04-30 07:21:45 -04:00
FabsTheFabs	c609e3591b	fixed classic camera reset	2024-04-29 02:22:33 +01:00
FabsTheFabs	3083305f51	fix pixel combo numbers being huge	2024-04-29 02:21:44 +01:00
EliteMasterEric	01b80ab5c8	Merge remote-tracking branch 'origin/input-offsets' into rewrite/master	2024-04-28 19:07:44 -04:00
Cameron Taylor	7d2713a731	this doesn't need to be here	2024-04-25 01:55:51 -04:00
Cameron Taylor	12b5d6d086	some result screen polish	2024-04-25 01:53:13 -04:00
EliteMasterEric	dd90d430ee	Replace the zoom with a fade (for now)	2024-04-24 23:50:19 -04:00
EliteMasterEric	7c6bf7ef45	Fix the alignment of the song name in the results screen	2024-04-24 23:50:11 -04:00
EliteMasterEric	e0721b901e	Fix a bug where negative visual offsets would break the countdown.	2024-04-24 21:57:23 -04:00
EliteMasterEric	17a15a3947	Reposition notes based on the configured input offset (so you still hit them when centered)	2024-04-24 21:57:17 -04:00
EliteMasterEric	f474bc32a5	Merge remote-tracking branch 'origin/rewrite/master' into input-offsets	2024-04-24 21:54:45 -04:00
EliteMasterEric	b6247c933a	Disable chart editor on web until it's fixed.	2024-04-24 16:00:50 -04:00
EliteMasterEric	374c042ad0	Fix a critical issue causing instrumental variations to not load on web.	2024-04-23 18:32:07 -04:00
Cameron Taylor	5aba4008ac	Merge branch 'feature/2hot-cutscenes-eric' into bugfix/weekend-1-can-death-freeze	2024-04-23 04:20:28 -04:00
EliteMasterEric	1e5153f133	Fix an issue where zooming in the camera would persist to results screen	2024-04-22 23:04:57 -04:00
EliteMasterEric	84c3fd452b	Update Weekend 1 cutscenes to use the instanced Conductor	2024-04-20 02:11:04 -04:00
Cameron Taylor	678dbc0ab7	Merge branch 'rewrite/master' into a-bot-bars	2024-04-19 15:11:28 -04:00
FabsTheFabs	351cb8cbaa	popupstuff changes + make combopopup able to be edited outside of playstate	2024-04-19 14:14:33 -04:00
Cameron Taylor	035db7f00a	Merge branch 'rewrite/master' into bugfix/draw-crash	2024-04-19 14:03:58 -04:00
Cameron Taylor	93ae7692c8	Merge branch 'rewrite/master' into bugfix/weekend-1-bug-fixes	2024-04-19 13:55:01 -04:00
Cameron Taylor	1405e21e3d	Merge branch 'rewrite/master' into a-bot-bars	2024-04-16 20:02:08 -04:00
EliteMasterEric	d346c9387c	Fix a crash in the Results state. also nudge GF over to the spot she's in in the FLA	2024-04-16 19:42:52 -04:00
EliteMasterEric	43ec72fb9d	Ensure playNoteHoldCover doesn't call if note is judged as 'miss'	2024-04-15 20:36:38 -04:00
Cameron Taylor	658fd392fa	Merge branch 'rewrite/master' into a-bot-bars	2024-04-14 02:57:05 -04:00
EliteMasterEric	6f5c3a043f	Fix crash caused when game tries to render disposed sprites during a Sticker transition.	2024-04-10 14:45:07 -04:00
Cameron Taylor	5f48ca82bd	Merge branch 'rewrite/master' into bugfix/additional-fixins	2024-04-09 23:50:05 -04:00
EliteMasterEric	b464f51ba2	Fix an issue where a missing stage would cause a crash (rather than an error popup)	2024-04-06 22:38:32 -04:00
EliteMasterEric	ea1d123c49	Fixes to Pico Blazin' animations.	2024-04-06 21:42:31 -04:00
EliteMasterEric	5beb20ec7c	Fix bug where restarting the song would sometimes crash.	2024-04-06 21:42:18 -04:00
EliteMasterEric	14869b9373	Also disable highscores in botplay	2024-04-06 02:08:10 -04:00
EliteMasterEric	99ee2b07ca	Make results screen use full campaign score in Story Mode	2024-04-06 02:06:06 -04:00
EliteMasterEric	29f105a44d	Practice mode = no highscore!	2024-04-06 01:59:46 -04:00
EliteMasterEric	a6d44b1f15	Removed many unused assets to optimize bandwidth usage.	2024-04-05 19:43:52 -04:00
EliteMasterEric	95434018f7	Readd GF camera zoom into results state.	2024-04-05 02:56:47 -04:00
Eric	fd88ebef63	Merge pull request #467 from FunkinCrew/retro-fade ... small fade polish for week 8 convos	2024-04-05 02:47:10 -04:00
EliteMasterEric	9c8ab72494	Merge remote-tracking branch 'origin/rewrite/master' into bugfix/quick-camera-fixes	2024-04-05 02:45:23 -04:00
EliteMasterEric	08e8530ad4	Fix SetCameraBopSongEvent to be additive	2024-04-05 02:44:44 -04:00
EliteMasterEric	07092269b8	Merge branch 'rewrite/master' into input-offsets	2024-04-04 18:45:16 -04:00
Cameron Taylor	8f3406cb0e	Merge branch 'rewrite/master' into feature/results-screen-score	2024-04-04 05:34:29 -04:00