1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-15 19:33:36 +00:00
Commit graph

875 commits

Author SHA1 Message Date
Cameron Taylor 75621435ea lil more polish to fav icon + clipping 2024-06-02 02:53:07 -04:00
Cameron Taylor c64db9966b Merge branch 'rewrite/master' into rank-fixes 2024-06-02 02:19:36 -04:00
Cameron Taylor 7c6c51ea71 results dupe fix 2024-06-01 22:36:47 -04:00
EliteMasterEric 7aee1f900a Fix a Results->Freeplay crash 2024-06-01 20:54:24 -04:00
Cameron Taylor 8248cffbaf small bool cleanings, and maybe fixes 2024-06-01 20:36:14 -04:00
FabsTheFabs 63bd6f2ace sparks nd more fixes.. i think 2024-06-02 00:25:52 +01:00
Cameron Taylor c95ebaa948 Merge branch 'rewrite/master' into nothyper474/cwd-preloader 2024-06-01 16:27:08 -04:00
Cameron Taylor c2cc73077f
Merge pull request #588 from FunkinCrew/ninjamuffin99/funk-244-preview-songs-on-freeplay-should-last-longer
make songs last longer on freeplay
2024-06-01 16:25:49 -04:00
Cameron Taylor de92a7ba5c Merge branch 'rewrite/master' into bugfix/may-31st-fixes 2024-06-01 16:23:37 -04:00
EliteMasterEric 12acdcd9d9 Fix a Results->Freeplay crash 2024-05-31 21:55:27 -04:00
EliteMasterEric 9088570b92 Make sure JSON data uses latest version/generatedBy when writing. 2024-05-31 19:21:21 -04:00
EliteMasterEric 8bf26322e9 Update generatedBy to the latest value when saving a chart. 2024-05-31 18:09:30 -04:00
Cameron Taylor a1e34123f5
Merge pull request #582 from FunkinCrew/title-bg-fix
fix the one random slice of pixels where the bg doesnt show... lol (FUNK-239)
2024-05-31 18:08:05 -04:00
Cameron Taylor 72ca1145ba
Merge pull request #584 from FunkinCrew/hard-erect-lag-fix
removes trace() that lags freeplay
2024-05-31 18:07:48 -04:00
Cameron Taylor d89a898e6c make songs last longer on freeplay 2024-05-31 17:16:26 -04:00
FabsTheFabs 28444fd478 rank tweaks, favourite changes + rank anim fixes 2024-05-31 10:39:53 +01:00
EliteMasterEric 2a8cdfaffa Fix an extra crash. 2024-05-31 02:30:42 -04:00
Cameron Taylor 7347b66ce4 removes trace() that lags freeplay 2024-05-30 23:07:41 -04:00
Cameron Taylor 7a2f3c81a1 fix the one random slice of pixels where the bg doesnt show... lol 2024-05-30 21:11:17 -04:00
Cameron Taylor c322e2aeef Merge branch 'rewrite/master' into feature/results-freeplay-transition 2024-05-30 21:05:32 -04:00
Cameron Taylor 5f70e1be0b Merge branch 'develop-0.4.0' into rewrite/master 2024-05-30 20:54:27 -04:00
Cameron Taylor d015e73066 Merge branch 'bugfix/multifix' into develop-0.4.0 2024-05-30 20:53:18 -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
EliteMasterEric ee70e85dec Merge branch 'rewrite/master' into feature/freeplay-shit+santa-cutscene 2024-05-29 23:56:51 -04:00
FabsTheFabs e7079452fb freeplay visual changes + base rank visuals 2024-05-30 04:34:00 +01:00
EliteMasterEric 8d7591a796 Fix an issue where Story Menu props wouldn't render. 2024-05-29 21:43:54 -04:00
Cameron Taylor 75b4baefca Merge branch 'gamerbross/chart-editor-sustains' into develop-0.4.0 2024-05-29 16:54:19 -04:00
Cameron Taylor 4dca6671c4 Merge branch 'gamerbross/freeplay-crash' into develop-0.4.0 2024-05-29 16:53:26 -04:00
Cameron Taylor a2fd14c031 Merge branch 'richtrash21/main-menu-camera' into develop-0.4.0 2024-05-29 16:51:24 -04:00
Cameron Taylor 3ba778606b Merge branch 'sector-a/story-menu-score' into develop-0.4.0 2024-05-29 16:50:05 -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 e449dfa0ef Merge branch 'bugfix/titlestate-startintro-crash' into develop-0.4.0 2024-05-29 16:48:10 -04:00
Cameron Taylor 4f34079b98 Merge branch 'audio-stream' into develop-0.4.0 2024-05-29 16:45:35 -04:00
Your Name ee4be81062 Now Preloader resets CWD 2024-05-29 15:16:31 -03:00
Eric 934d6c2518
Merge pull request #2539 from gamerbross/bugfix/titlestate-startintro-crash
[BUGFIX] Fix TitleState bugs + crash
2024-05-29 01:50:46 -04:00
Eric d02ecd17e8
Merge pull request #2576 from richTrash21/develop-mainmenu-fix
[BUGFIX] Main Menu Camera Fix
2024-05-29 01:17:34 -04:00
Eric 60d90c6698
Merge pull request #2585 from sector-a/main
Make texts update on difficulty change in Story Menu
2024-05-29 00:54:32 -04:00
EliteMasterEric d97d77566e Make song score lerp faster 2024-05-29 00:53:32 -04:00
Cameron Taylor 9aa2411b50 Merge branch 'rewrite/master' into audio-stream 2024-05-28 23:59:36 -04:00
Eric fd9cfc2cb1
Merge pull request #2457 from gamerbross/bugfix/freeplay-no-song-data-crash
[BUGFIX] Freeplay Crash when song is invalid
2024-05-28 23:47:46 -04:00
Eric 5e1f61665a
Merge pull request #2553 from lemz1/loadingbar-fix
[BUGFIX] Fix Web Loading Bar (Again)
2024-05-28 23:37:16 -04:00
EliteMasterEric 58415d49c9 Merge remote-tracking branch 'secret/bugfix/html5-save-data' into loadingbar-fix 2024-05-28 22:52:19 -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 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
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 0514e05328 Merge branch 'bugfix/html5-save-data' into develop-0.4.0 2024-05-22 15:15:56 -04:00