cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-01 12:24:27 +00:00
Code Issues Releases Wiki Activity
656 commits 3 branches 3 tags 3 GiB
Commit graph

656 commits

This branch
This branch
All branches
Author SHA1 Message Date
MtH 81ce710db6 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-03-30 14:06:56 +02:00
MtH 04ad093ef0 week score lerp fix INSPIRED BY PR #447 BY @jvc2 
https://github.com/ninjamuffin99/Funkin/pull/447
 2021-03-30 14:06:03 +02:00
Cameron Taylor 2c03f4f507 Merge pull request #668 from VoltrexMaster/patch-2 
feat(extra): Remove extra imports
 2021-03-29 21:23:51 -07:00
George FunBook 38cc859bb4 fix errors on mac 2021-03-29 23:05:21 -05:00
MtH c01a9f45a1 week6 touchups 2021-03-30 03:38:05 +02:00
Cameron Taylor 0f997c84af spritemap atlas bullshit? 2021-03-29 18:06:35 -07:00
Cameron Taylor 593e70e4e0 Merge branch 'master' of https://github.com/ninjamuffin99/Funkin-secret 2021-03-29 18:00:37 -07:00
Cameron Taylor 519c187fd9 potential adobe animate texture atlas bullshit WIP 2021-03-29 18:00:30 -07:00
MtH 41232f4fa8 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into shart 2021-03-30 02:18:28 +02:00
Cameron Taylor 23e6f9b972 Merge pull request #640 from VoltrexMaster/patch-1 
feat(performance): Use switch statement
 2021-03-29 13:45:54 -07:00
Cameron Taylor 217521860e Merge pull request #500 from ActualMandM/she_cheers 
girlfriend cheering in tutorial
 2021-03-29 13:43:41 -07:00
Cameron Taylor 482fd33f23 Merge pull request #1 from ninjamuffin99/sans_discord 
allow run without discord stuff
 2021-03-29 13:43:10 -07:00
Cameron Taylor 526f91fe5f pico in progress 2021-03-29 10:24:49 -07:00
MtH cfa0128db7 week score lerp fix INSPIRED BY PR #447 BY @jvc 
https://github.com/ninjamuffin99/Funkin/pull/447
 2021-03-29 17:18:25 +02:00
MtH f067ebd8e9 resync by BOTH voices and inst 
also remove unnecessary includes in chartingstate
 2021-03-29 17:01:49 +02:00
Voltrex da91d35ebc Fix indentation 
2 -> 7 tabs.
 2021-03-29 18:17:41 +04:30
Voltrex 59ba23c46e feat(extra): Remove extra imports 
Remove 2 extra imports, `IOErrorEvent` was imported already.
 2021-03-29 04:16:32 +04:30
MtH 6ccf1940cd pixel countdown 2021-03-28 23:36:14 +02:00
MtH 8ae8aaec51 FIX NOTE HITS 
fixes weird note misses when multiple notes are hittable
also fixes notes on HUD appearing pressed when the button is released during game pause/window unfocus
 2021-03-28 23:29:44 +02:00
MtH 333cd2711b Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-03-28 18:10:40 +02:00
MtH 51e537b245 week5 touchups 2021-03-28 18:09:06 +02:00
MtH 905f6c707b Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into shart 2021-03-28 17:41:09 +02:00
Cameron Taylor f1325d31e5 checkbox thingie hehe 2021-03-27 20:01:53 -07:00
Cameron Taylor 5408781804 reverted the ng thingies 2021-03-27 16:11:14 -07:00
MtH 371a995dbd week4 touchups 2021-03-27 04:40:23 +01:00
Cameron Taylor 9e236c91ac checkbox fix in progress 2021-03-26 21:33:16 -04:00
Cameron Taylor 2717c6f0c7 no camera zoom shit 2021-03-26 21:28:04 -04:00
Cameron Taylor 7516134f5d no flashing menu 2021-03-26 21:22:07 -04:00
Cameron Taylor 113730e85c preference toggling 2021-03-26 20:09:04 -04:00
Cameron Taylor d6821142ea cutscene bullshit 2021-03-26 05:09:42 -04:00
Cameron Taylor 4247f82694 cool note thingies 2021-03-26 03:51:39 -04:00
Cameron Taylor f98cb76c98 Merge branch 'shart' of https://github.com/ninjamuffin99/funkin-secret 2021-03-25 04:58:15 -04:00
Cameron Taylor 7cb1954718 lerp tweaks and shit more 2021-03-24 23:39:19 -04:00
Cameron Taylor 399da03591 camera movement lerp fix for high framerates 2021-03-24 22:41:41 -04:00
MtH 6ea92694b7 funny pico week touchups 2021-03-25 00:35:20 +01:00
Cameron Taylor 6f2302cbbc mod menu thingie 2021-03-24 19:19:08 -04:00
Cameron Taylor 6fed4b5f16 outline bullshit in progress 2021-03-24 18:41:54 -04:00
Cameron Taylor 6c2101fa6f converting shit to new options menu 2021-03-24 16:44:58 -04:00
MtH 1800a5a174 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into shart 2021-03-24 21:03:45 +01:00
Cameron Taylor 38cf7fa51a whatev lol! 2021-03-24 15:06:39 -04:00
Voltrex efbb29ad28 feat(performance): Use switch statement 
Use a `switch` statement instead of a huge `if .. else if` chains.
 2021-03-24 18:43:17 +04:30
Cameron Taylor a7a15cc6b9 lol fixed dumbass shader thinge oops 2021-03-23 21:33:17 -04:00
George FunBook 2da29bc5fb Merge branch 'master' into sans_discord 2021-03-23 18:07:02 -05:00
MtH 0f985267f2 week2 chart touchups 2021-03-23 23:53:16 +01:00
Cameron Taylor 699a77201b Merge pull request #2 from ninjamuffin99/options 
Options
 2021-03-23 18:48:03 -04:00
Cameron Taylor 03cc7d9099 outline shader in progress 2021-03-23 18:43:08 -04:00
George FunBook 15e52a4be0 fix remove defaultCamera refs 2021-03-23 17:30:58 -05:00
George FunBook cd46e2ef4d fix back bug 2021-03-23 17:28:05 -05:00
George FunBook c7ad5bd4b5 change discord to cpp 2021-03-23 14:17:04 -05:00
MtH f7869d61a4 bopeebo speeds n shit 2021-03-23 17:55:39 +01:00