3499 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
EliteMasterEric	8d7591a796	Fix an issue where Story Menu props wouldn't render.	2024-05-29 21:43:54 -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
EliteMasterEric	58415d49c9	Merge remote-tracking branch 'secret/bugfix/html5-save-data' into loadingbar-fix	2024-05-28 22:52:19 -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
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	d4b2e94963	assets submod	2024-05-28 02:17:55 -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	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	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
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
lemz	e0867643d0	fix the setgraphicsize stuff	2024-05-19 01:39:30 +02: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
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