Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-12-11 08:41:25 -05:00
Code Issues Projects Releases Packages Wiki Activity
3034 commits 30 branches 20 tags 3 GiB
Commit graph

698 commits

Author SHA1 Message Date
Cameron Taylor
22e411d43f Merge branch 'rewrite/master' into feature/chart-editor-gamepad-support 2024-04-19 13:57:42 -04:00
EliteMasterEric
b982484856 Properly fix the menu background to use the correct line colors. 2024-04-16 20:19:20 -04:00
Cameron Taylor
2d5153cdbf Merge branch 'rewrite/master' into bugfix/remove-kickstarter-backers 2024-04-16 13:33:02 -04:00
Cameron Taylor
fab6412bc6 Merge pull request #486 from FunkinCrew/bugfix/main-menu-color 
Fix the saturation on the main menu background.
 2024-04-16 13:25:46 -04:00
Eric
b553dbd517 Remove janky animation on Freeplay menu. (#488) 2024-04-16 13:24:41 -04:00
EliteMasterEric
4d1f60434a Fix the saturation on the main menu background. 2024-04-15 19:21:55 -04:00
EliteMasterEric
5e7b417d6f Remove Kickstarter link from credits. 2024-04-12 14:44:01 -04:00
Cameron Taylor
0f9ecda2a1 Merge branch 'rewrite/master' into html5/asset-optimization 2024-04-09 20:25:37 -04:00
Cameron Taylor
f00c6085e4 Merge pull request #477 from FunkinCrew/bugfix/song-compile-define 
Fix loading issue tied to -DSONG compile define.
 2024-04-09 20:15:24 -04:00
EliteMasterEric
dbcbb73338 Main menu fix and Week 3 train fix 2024-04-09 15:10:58 -04:00
EliteMasterEric
6d374c7af9 Fix loading issue tied to -DSONG compile define. 2024-04-08 18:39:51 -04:00
Cameron Taylor
3b87ecf6f5 Merge branch 'html5/asset-optimization' of github.com:FunkinCrew/Funkin-secret into html5/asset-optimization 2024-04-05 19:59:25 -04:00
Cameron Taylor
da4f1fb424 remove difficulty stars 2024-04-05 19:47:33 -04:00
EliteMasterEric
a6d44b1f15 Removed many unused assets to optimize bandwidth usage. 2024-04-05 19:43:52 -04:00
EliteMasterEric
a764112bd4 Removed many unused assets to optimize bandwidth usage. 2024-04-05 01:24:03 -04:00
EliteMasterEric
823baa3326 Add new album roll animation (again) 2024-04-04 16:30:04 -04:00
Cameron Taylor
acb58a6b49 remove sitelock 2024-04-04 05:41:44 -04:00
Cameron Taylor
8f3406cb0e Merge branch 'rewrite/master' into feature/results-screen-score 2024-04-04 05:34:29 -04:00
Cameron Taylor
544dcdf809 Merge branch 'rewrite/master' into bugfix/chart-editor-weekend-1 2024-04-04 05:32:26 -04:00
Cameron Taylor
ec47ee4285 Merge pull request #461 from FunkinCrew/bugfix/debuggercheckbox-crash 
Prevent a crash trying to open a non-existant debugger checkbox.
 2024-04-04 05:30:41 -04:00
Cameron Taylor
eed8299cfd Merge branch 'rewrite/master' into bugfix/hide-freeplay-menu-rating 2024-04-04 04:47:45 -04:00
Cameron Taylor
c23f97917c Merge branch 'rewrite/master' into preloader-polish 2024-04-04 03:43:23 -04:00
EliteMasterEric
57d6ed118d Hide Rating on the right side of the items in Freeplay 2024-04-04 03:31:03 -04:00
EliteMasterEric
f129cb7997 Fix a bug where if Weekend 1 wasn't cleared, you can't chart those songs 2024-04-03 21:57:29 -04:00
EliteMasterEric
58427363d1 Prevent a crash trying to open a non-existant debugger checkbox. 2024-04-03 20:33:51 -04:00
EliteMasterEric
e9d8546737 More results screen changes 2024-04-03 04:52:12 -04:00
Cameron Taylor
ad39ce3c21 local conductor got removed somewhere? 2024-04-03 04:43:12 -04:00
Cameron Taylor
b7c6b1aaf6 Merge pull request #458 from FunkinCrew/bugfix/a-couple-more-fixes 
Bugfix/a couple more fixes
 2024-04-03 03:38:37 -04:00
Cameron Taylor
668f47f761 Merge pull request #457 from FunkinCrew/html5/touch-to-start 
Fix some build issues with HTML5.
 2024-04-03 03:37:41 -04:00
EliteMasterEric
f7141e7096 Fixed an issue with save data not loading defaults properly. 2024-04-03 01:41:52 -04:00
EliteMasterEric
2b4bf42ac4 Fix multiple music, and crashes in freeplay 2024-04-03 01:41:47 -04:00
EliteMasterEric
f7ff381bc7 Fix some build issues with HTML5. 2024-04-02 23:33:10 -04:00
EliteMasterEric
90cf53b959 Someone forgot to merge assets from the credits branch. 2024-04-02 17:27:29 -04:00
Cameron Taylor
dcffe0537f Merge branch 'rewrite/master' into bugfix/buncha-2hot-fixes 2024-04-01 22:40:10 -04:00
Cameron Taylor
03cbba4a4e Merge branch 'rewrite/master' into feature/freeplay-ost-text 2024-04-01 22:21:29 -04:00
Cameron Taylor
d6723a8212 Merge branch 'rewrite/master' into bugfix/freeplay-menu-transition 2024-04-01 22:14:29 -04:00
Cameron Taylor
8a60115df6 Merge pull request #454 from FunkinCrew/feature/erect-filter-freeplay 
Freeplay menu now filters to supported songs when you change difficulty
 2024-04-01 22:08:25 -04:00
Cameron Taylor
db89e199c4 Merge pull request #455 from FunkinCrew/bugfix/results-screen-cleanup 
Bunch of results screen fixes
 2024-04-01 22:07:43 -04:00
Cameron Taylor
7fb4b47e2a Merge branch 'rewrite/master' into feature/credits 2024-04-01 22:06:58 -04:00
EliteMasterEric
67e096e443 Bunch of results screen fixes 2024-04-01 21:59:53 -04:00
EliteMasterEric
1df4a354cb Freeplay menu now filters to supported songs when you change difficulty 2024-04-01 18:34:26 -04:00
Cameron Taylor
32ed26ffa6 stereo preloader in progress 2024-03-29 17:54:20 -04:00
EliteMasterEric
7c04630bb7 Fix a bug where duplicate notes would get placed at the beginning 2024-03-29 00:49:02 -04:00
EliteMasterEric
ddb41c9ef7 Increase AFK timer, and add SFX over it 2024-03-28 23:13:47 -04:00
EliteMasterEric
342782c3d3 Fix issue with pink screen when moving from PlayState->Freeplay->Main Menu 2024-03-28 22:33:50 -04:00
EliteMasterEric
443a501e4e Merge branch 'rewrite/master' into feature/freeplay-ost-text 2024-03-28 20:33:17 -04:00
EliteMasterEric
571c6d5960 Merge branch 'rewrite/master' into feature/credits 2024-03-28 20:29:15 -04:00
Eric
5fa559dfb1 Merge branch 'rewrite/master' into bugfix/buncha-2hot-fixes 2024-03-28 20:26:45 -04:00
EliteMasterEric
6a131555f8 Merge branch 'rewrite/master' into feature/chart-editor-gamepad-support 2024-03-28 20:15:32 -04:00
Cameron Taylor
86c91d1e82 Merge pull request #436 from FunkinCrew/feature/touch-here-to-play 
New Funkin' Preloader, and Touch Here To Play
 2024-03-28 07:15:53 -04:00