Commit Graph
6373 Commits
Author SHA1 Message Date
EricandGitHub fb137bc722 Merge pull request #2624 from Ethan-makes-music/main
Remove alot of unused imoprts and comments (not even half)
2024-05-28 21:57:53 -04:00
EliteMasterEric f0cd6c50c8 Merge remote-tracking branch 'secret/rewrite/master' into downscroll 2024-05-28 21:57:29 -04:00
EricandGitHub 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 1ae30283a3 re add the xmlns schema stuff 2024-05-28 15:34:09 -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 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 6c0d998edd update funkVis in hmm 2024-05-28 01:18:18 -04:00
Cameron TaylorandGitHub 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
PurSnakeandGitHub cb2f4b0f06 [BUGFIX] Correct characters scaling
bruh
2024-05-25 21:00:10 +03:00
lemz 267fd0eadc alpha stuff and correct text positioning 2024-05-25 16:30:08 +02:00
lemz 814d72cb3f sounds 2024-05-25 03:06:27 +02:00
lemz b75f6e5853 Update PreferencesMenu.hx 2024-05-25 02:19:11 +02:00
gamerbross 4acfbfb76d Fix Legacy Chart Importer wrong instrumental 2024-05-25 01:21:37 +02:00
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
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
Cameron Taylor 85bfd00bad desktop vis testing 2024-05-24 16:38:35 -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
BurgerballsandGitHub eb2b143a1c Merge branch 'develop' into scroll-speed-fix 2024-05-24 17:23:45 +01:00
EricandGitHub 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
EricandGitHub b6724eb8c6 Merge pull request #2581 from Keoiki/playstate-notestyles-query
[FEATURE] Custom Note Style Support
2024-05-24 01:39:04 -04:00
EliteMasterEric 0e92023794 Add credits for all charts + tweak charts for Guns, Lit Up, Winter Horrorland 2024-05-24 00:21:45 -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
BurgerballsandGitHub b40bb98bb4 Merge branch 'develop' into scroll-speed-fix 2024-05-23 22:44:25 +01:00
Cameron TaylorandGitHub 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
Cameron TaylorandGitHub 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
richTrash21 4ca30a571d safety 2024-05-23 21:52:28 +04:00
richTrash21 1c352e4e11 simplify freeplay camera 2024-05-23 21:50:11 +04:00
gamerbross 5e130eeffc Add Winning support to Legacy Health Icons 2024-05-23 18:18:37 +02:00