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
3763 commits 31 branches 21 tags 3 GiB
Commit graph

3763 commits

This branch
This branch
All branches
Author SHA1 Message Date
Cameron Taylor e01e4d1e76 assets submod 2024-06-06 20:21:37 -04:00
Cameron Taylor 4f0e77c974 update hmm 2024-06-06 20:20:54 -04:00
Cameron Taylor fa270aa6ca Merge branch 'rewrite/master' into fix/grig-viz 2024-06-06 20:17:25 -04:00
Cameron Taylor e45e359de7 Merge branch 'mainmenu-remember-selection' into rewrite/master 2024-06-06 20:15:11 -04:00
Cameron Taylor 7ef14b24c7 Merge branch 'prshit' into rewrite/master 2024-06-06 20:13:36 -04:00
Cameron Taylor 3aa3007dbb Merge branch 'fix-url-open' into rewrite/master 2024-06-06 20:12:28 -04:00
Cameron Taylor 0bb22b60d9 update game version 2024-06-06 19:55:50 -04:00
Cameron Taylor cd6dc35958
Merge pull request #579 from FunkinCrew/burgerballs/scroll-speed-event 
[PUBLIC PR] Implement Scroll Speed song events into the Chart Editor
 2024-06-06 19:50:57 -04:00
Cameron Taylor 73c7bcf609
Merge branch 'rewrite/master' into burgerballs/scroll-speed-event 2024-06-06 19:49:47 -04:00
Cameron Taylor d0e5c7f12b
Merge pull request #585 from FunkinCrew/pursnake/character-scale 
[PUBLIC PR] Fix an issue with character scaling
 2024-06-06 19:49:35 -04:00
Cameron Taylor 02be65c383
Merge branch 'rewrite/master' into pursnake/character-scale 2024-06-06 19:47:48 -04:00
Cameron Taylor 8e6c43b81b
Merge pull request #605 from FunkinCrew/fabs-final-fixes 
Freeplay fixes, + some minor bug fixes
 2024-06-06 19:47:16 -04:00
Cameron Taylor 824b05256d Merge branch 'rewrite/master' into fabs-final-fixes 2024-06-06 19:46:50 -04:00
Cameron Taylor e4647e9e2d assets submod 2024-06-06 19:46:44 -04:00
Cameron Taylor bdcb420c04
Merge pull request #604 from FunkinCrew/holy-fuck-pixel-one 
Update num1-pixel.png to not suck
 2024-06-06 19:31:43 -04:00
EliteMasterEric 700b6e11b8 Update assets submodule 2024-06-06 19:05:05 -04:00
EliteMasterEric 2596e6369e More chart changes by SpazKid + changelog update 2024-06-06 14:00:22 -04:00
FabsTheFabs b7eed4c4d3 assets submoddd!!!!! 2024-06-06 01:50:19 +01:00
FabsTheFabs 642f272bce freeplay polish + new text 2024-06-06 01:49:33 +01:00
EliteMasterEric e27e96a1cb Update assets submodule 2024-06-05 20:19:00 -04:00
Cameron Taylor bc783a278a rank clipping fix 2024-06-05 18:21:57 -04:00
Cameron Taylor 4311dd2074 hopefully dadbattle fix lol 2024-06-05 17:58:22 -04:00
Cameron Taylor 8616722e60 asset submod 2024-06-05 17:14:04 -04:00
Cameron Taylor e01fa2c85e Merge branch 'result-percentage' into rewrite/master 2024-06-05 17:11:47 -04:00
Cameron Taylor 6334d16984 Merge branch 'ninjamuffin99/funk-250' into rewrite/master 2024-06-05 17:11:22 -04:00
Cameron Taylor eaa63196b3 fix for dadbattle appearing on freeplay 2024-06-05 17:10:53 -04:00
Cameron Taylor c1bfc67f52 remove effin trace 2024-06-05 15:43:25 -04:00
Cameron Taylor 5bcc0f9b25 partial sound loading should be more resiliant 2024-06-05 15:02:29 -04:00
Cameron Taylor 6e761ba156 hardcode the songname position 2024-06-05 14:47:29 -04:00
Cameron Taylor fa1fafba68 less effin traces 2024-06-05 14:13:06 -04:00
Cameron Taylor 3534ba6224 roses fix 2024-06-05 13:50:57 -04:00
Cameron Taylor af2e4bd16c
Merge pull request #600 from FunkinCrew/feature/cory-chart-updates 
Cory made some chart tweaks. Plus some authorship changes.
 2024-06-05 01:50:41 -04:00
Cameron Taylor 88248233b0
Merge pull request #599 from FunkinCrew/bugfix/results-percent-display 
Fix some display issues with the clear percent in the results screen.
 2024-06-05 01:48:43 -04:00
EliteMasterEric 9f3d80d1db Cory made some chart tweaks. Plus some authorship changes. 2024-06-05 01:16:30 -04:00
EliteMasterEric 640c1cf236 Dave say 1 minute to make Dad sneak up and 2 minutes to play the cartoons 2024-06-05 00:49:59 -04:00
EliteMasterEric 5dda95c69b Fix some display issues with the clear percent in the results screen. 2024-06-05 00:40:14 -04:00
Cameron Taylor 03bccee054 assets submod 2024-06-04 23:39:49 -04:00
Cameron Taylor 50990b15e1 heart glow 2024-06-04 23:36:32 -04:00
Cameron Taylor 66d86a6969 2hot death fix 2024-06-04 23:07:08 -04:00
Cameron Taylor 8bdaf8f513 web rank sounds 2024-06-04 22:55:21 -04:00
Cameron Taylor f2dd626ed9 rollback viz hmm 2024-06-04 22:37:51 -04:00
Cameron Taylor 97400ed5d8 santa sounds 2024-06-04 22:26:35 -04:00
Cameron Taylor 56c72716fc Merge branch 'bugfix/save-data-recovery' into rewrite/master 2024-06-04 22:08:51 -04:00
Cameron Taylor cb773ed137 Merge branch 'ninjamuffin99/funk-269' into rewrite/master 2024-06-04 22:00:49 -04:00
Cameron Taylor a643765db4 Merge branch 'ninjamuffin99/funk-270' into rewrite/master 2024-06-04 22:00:30 -04:00
Cameron Taylor bbbe2248f8 Merge branch 'ninjamuffin99/funk-268' into rewrite/master 2024-06-04 21:59:59 -04:00
Cameron Taylor 1827cdb6e6
Merge pull request #593 from FunkinCrew/feature/new-one-graphic-holy-fuck 
Update num1.png to not suck
 2024-06-04 21:57:10 -04:00
EliteMasterEric ae950c7382 Finish save data repair (you should be able to transfer your save now) 2024-06-04 19:44:00 -04:00
Cameron Taylor 6a62f38c33 quicki fix for incorrect clip tweens 2024-06-04 16:51:27 -04:00
Cameron Taylor 84d4d044d6 check clip width when text changes 2024-06-04 16:47:58 -04:00