cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-12-26 15:07:14 +00:00
Code Issues Releases Wiki Activity
3577 commits 31 branches 21 tags 3 GiB
Commit graph

853 commits

Author SHA1 Message Date
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 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
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
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
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
sector-a d84e832c6c
Make texts update on difficulty change in Story Menu 2024-05-22 12:57:57 +03: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
EliteMasterEric 6cb5816378 Add freeplay favorites to the save data so they persist between sessions. 2024-05-21 02:49:07 -04:00
richTrash21 1050176b27 main menu camera fix 2024-05-20 23:52:48 +04:00
gamerbross 9a18e3fde6 Fix Charting Dragging Sustain Trails 2024-05-20 01:38:52 +02:00
gamerbross dcfc51cdcd Fix Charting Sustain Trails Inverted 2024-05-20 01:37:35 +02:00
EliteMasterEric 228ac66cc2 Credit the song's charter in the pause menu. 2024-05-19 01:48:51 -04:00
lemz e0867643d0 fix the setgraphicsize stuff 2024-05-19 01:39:30 +02:00
EliteMasterEric b6b93bb0c6 Added clear percent, rank name, and background text. 2024-05-17 20:26:34 -04:00
gamerbross 85b9de1de9 Allow Volume Keys while watching Toy Commercial (AttractState) 2024-05-17 23:53:43 +02:00
gamerbross b10872e8e8 Fix TitleState late start + enter spam crash 2024-05-17 23:51:07 +02:00
Cameron Taylor 2434f64381 web fix for scroll 2024-05-14 21:21:47 -04:00
Cameron Taylor 1619751eab Merge branch 'public-release/develop' into freeplayscrollwheel-bugfix 2024-05-14 21:13:48 -04:00
Cameron Taylor 0428482d04 Merge branch 'bugfix/freeplay-exiting-active' into public-release/develop 2024-05-13 21:30:02 -04:00
Cameron Taylor e26d4ac440
Merge pull request #554 from FunkinCrew/bugfix/public-fixes 
Eric's public bug fixes
 2024-05-13 21:20:47 -04:00
Cameron Taylor 259df760bc re-add lerp to load screen 2024-05-13 21:06:41 -04:00
lemz 54f337fe9c Merge remote-tracking branch 'origin/develop' into loadingbar-fix 2024-05-14 00:17:25 +02:00
lemz 4e935b47c6 Update LoadingState.hx 2024-05-14 00:04:45 +02:00