1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-01 04:14:47 +00:00
Commit graph

91 commits

Author SHA1 Message Date
Cameron Taylor 4b400f7f1a cutsceneCLeanup 2021-04-18 06:53:11 -04:00
Cameron Taylor 74a8cc9308 Merge branch 'nitpix' of https://github.com/ninjamuffin99/funkin-secret 2021-04-18 05:26:52 -04:00
Cameron Taylor 278354d0fc MOVING ANIMATIONS LOL 2021-04-18 05:25:44 -04:00
Cameron Taylor d964223ee7 cutscene shit in progress 2021-04-18 04:09:56 -04:00
Cameron Taylor 1b67a9e176 in-game animation cutscene type beat 2021-04-17 23:19:33 -04:00
Cameron Taylor 053c3975eb guns and animation shit in progress 2021-04-15 11:57:59 -04:00
MtH d2a2f0f261 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-04-15 15:29:08 +02:00
MtH c521f0907c guns chart tiny tweak 2021-04-15 04:35:28 +02:00
Cameron Taylor 06cbd2b73e animation rotations 2021-04-14 11:31:52 -04:00
MtH 70003ec619 Merge branch 'testtrack' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-04-14 04:07:59 +02:00
Cameron Taylor 4d42e839df Merge branch 'nitpix' of https://github.com/ninjamuffin99/funkin-secret 2021-04-11 19:08:46 -04:00
Cameron Taylor fbbfa42d16 sprite animation shit idk lol who cares loL! 2021-04-11 19:08:36 -04:00
MtH 813b402da6 stress anim for all difficulties 2021-04-11 19:21:37 +02:00
MtH 7b0e1a9118 ugh anims for all difficulties 2021-04-11 19:06:41 +02:00
Cameron Taylor 1dfae62926 ugh and stress animations 2021-04-10 18:23:56 -04:00
Cameron Taylor 8bbeef10a1 recycling and groups i guess 2021-04-10 01:49:57 -04:00
Cameron Taylor a518562806 quieter trailer and GF doin shit 2021-04-09 22:49:25 -04:00
Cameron Taylor 1cca8e1849 video, and load screenshit 2021-04-09 19:17:14 -04:00
Cameron Taylor ef0a0db812 cutscenes, menu, story shit 2021-04-09 16:37:54 -04:00
Cameron Taylor a3cb040831 Merge branch 'shart' of https://github.com/ninjamuffin99/funkin-secret 2021-04-09 15:48:06 -04:00
Cameron Taylor 02d6ad9e18 load screen and censors 2021-04-09 03:03:27 -04:00
Cameron Taylor 1e903523fb cutscene shit in progress 2021-04-07 20:19:49 -04:00
MtH 6e9f75a1a7 blammed chart pico funny adlibs 2021-04-07 21:14:20 +02:00
Cameron Taylor a2ae9bbcd1 cutscene character work in progress 2021-04-06 18:12:31 -04:00
Cameron Taylor b46d75883d Merge pull request #3 from ninjamuffin99/mac_fixes
fix errors on mac
2021-04-03 09:43:40 -07:00
Cameron Taylor 0b7787fbd0 Merge branch 'shart' 2021-04-03 09:41:35 -07:00
MtH df1e5bb37f Merge branch 'nitpix' of github.com:ninjamuffin99/Funkin-secret into testtrack 2021-03-30 14:10:04 +02:00
George FunBook 38cc859bb4 fix errors on mac 2021-03-29 23:05:21 -05:00
MtH f92b803e24 test chart oopsy 2021-03-30 05:58:59 +02:00
MtH e18cb1d5c2 test song and added to freeplay (JUST FOR TESTING) 2021-03-30 05:45:04 +02:00
MtH c01a9f45a1 week6 touchups 2021-03-30 03:38:05 +02: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 526f91fe5f pico in progress 2021-03-29 10:24:49 -07: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
MtH 371a995dbd week4 touchups 2021-03-27 04:40:23 +01:00
MtH 6ea92694b7 funny pico week touchups 2021-03-25 00:35:20 +01:00
MtH 1800a5a174 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into shart 2021-03-24 21:03:45 +01: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
MtH f7869d61a4 bopeebo speeds n shit 2021-03-23 17:55:39 +01:00
George FunBook aa85510496 Merge branch 'master' into options 2021-03-22 23:05:46 -05:00
MtH 0718739801 week1 chart touchups 2021-03-23 02:41:09 +01:00
MtH 1b15a33c6a STRESS charts 2021-03-22 20:05:07 +01:00
Cameron Taylor cafc047da7 Merge branch 'shart' 2021-03-21 16:42:22 -04:00
Cameron Taylor e16b347606 stress bullshit in progress 2021-03-21 16:40:25 -04:00
Cameron Taylor 08ccaef628 color swap shit in progress 2021-03-21 14:45:46 -04:00