3514 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Cameron Taylor	4f34079b98	Merge branch 'audio-stream' into develop-0.4.0	2024-05-29 16:45:35 -04:00
Cameron Taylor	9aa2411b50	Merge branch 'rewrite/master' into audio-stream	2024-05-28 23:59:36 -04:00
Cameron Taylor	1f64c7fcc9	update hmm flxpartialsound	2024-05-28 23:54:23 -04:00
Cameron Taylor	2d300039ae	promises + error out partial sounds that attempt to load multiple times	2024-05-28 23:53:50 -04:00
Cameron Taylor	01b6a11ddb	flxpartialsound lock to current version	2024-05-28 22:57:01 -04:00
Eric	53f7cfc8c7	Merge pull request #564 from FunkinCrew/downscroll ... downscroll holdnote fix	2024-05-28 22:03:15 -04:00
EliteMasterEric	f0cd6c50c8	Merge remote-tracking branch 'secret/rewrite/master' into downscroll	2024-05-28 21:57:29 -04:00
Eric	818fc9f914	Merge pull request #565 from FunkinCrew/Ethan-makes-music/main ... [PUBLIC PR] Remove a lot of unused imports	2024-05-28 21:55:53 -04:00
EliteMasterEric	5cd7466a74	Merge remote-tracking branch 'secret/bugfix/html5-save-data' into develop-0.4.0	2024-05-28 18:25:00 -04: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
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	64123f4496	Merge pull request #556 from FunkinCrew/feature/results-clear-rank ... Added clear percent, rank name, and background text.	2024-05-28 01:13:02 -04:00
Cameron Taylor	827ad61602	Merge branch 'rewrite/master' into feature/results-clear-rank	2024-05-28 00:56:18 -04:00
EliteMasterEric	dd3e241f0c	Fix some merge conflicts	2024-05-24 16:44:12 -04:00
EliteMasterEric	98505e58ec	Take two at fixing submodules	2024-05-24 14:04:55 -04:00
EliteMasterEric	c8930b5980	Attempt to repair local submodules	2024-05-24 13:45:37 -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
EliteMasterEric	62e04b3372	Update Changelog	2024-05-24 13:24:11 -04:00
EliteMasterEric	2db99b3cb4	Update submodule	2024-05-24 00:06:52 -04:00
EliteMasterEric	44880fa569	Implement placeholder GREAT animation	2024-05-24 00:06:26 -04:00
Cameron Taylor	8a4769e206	Merge pull request #558 from FunkinCrew/feature/save-favorites ... Add freeplay favorites to the save data so they persist between sessions	2024-05-23 17:16:31 -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
EliteMasterEric	9afc314a0d	Fix an issue with git modules	2024-05-22 15:20:53 -04: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
EliteMasterEric	f17f639304	Finish implementing smaller numbers.	2024-05-22 01:07:20 -04: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
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
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
EliteMasterEric	b6b93bb0c6	Added clear percent, rank name, and background text.	2024-05-17 20:26:34 -04: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