1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-01 12:24:27 +00:00
Commit graph

53 commits

Author SHA1 Message Date
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
MtH 7c4bd7b584 guns easier 2021-03-21 16:06:57 +01:00
MtH af43771093 ugh EVEN EASIER 2021-03-21 14:55:48 +01:00
MtH fa09126a0b ugh easy redo 2021-03-20 23:34:50 +01:00
Cameron Taylor 20cd370df5 creds thingie and week6 imgage fixin 2021-03-19 14:34:00 -04:00
Cameron Taylor 7ee1a735b4 pixel icon bullshits 2021-03-19 00:03:29 -04:00
Cameron Taylor 1af910c20e icon code redo for more modularity 2021-03-18 21:08:44 -04:00
Cameron Taylor b9356fb543 Merge branch 'master' of https://github.com/ninjamuffin99/funkin 2021-03-18 19:01:08 -04:00
MtH 184a8cd9cd monster tweaks
now he sings at the start (by popular request)
camera shit
2021-03-18 19:33:47 +01:00
MtH a9b9d146b8 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into shart
also update hard chart with partial new ninja muffin pattern (pretty good pattern)
2021-03-18 17:51:15 +01:00
Cameron Taylor 78dafab62f bf holding gf 2021-03-17 05:20:25 -04:00
George FunBook 878a118045 Merge branch 'master' into options 2021-03-13 22:41:29 -06:00
George FunBook 430b6cbb7c Merge branch 'master' into ng_login 2021-03-13 20:24:57 -06:00
George FunBook b29a32e0c9 add options menu 2021-03-13 20:11:56 -06:00
Cameron Taylor 09792b745e offset bullshit and pico 2021-03-13 20:53:57 -05:00
Cameron Taylor ca54b2a163 oops more bullshit 2021-03-13 13:37:59 -05:00
MtH f067b17fbc w7s2 ez-norm (muffinbase) 2021-03-13 18:00:36 +01:00
Cameron Taylor fc8aef32ce guns slight changes and modding desktop conditionals 2021-03-10 20:17:26 -05:00
MtH 383a3758e4 w7c2 first draft 2021-03-10 21:59:46 +01:00
Cameron Taylor f0b799410c intro whatev 2021-03-09 00:06:14 -05:00
Cameron Taylor 8e95e79c3b tankmen foreground in progress 2021-03-08 18:38:58 -05:00
Cameron Taylor 847ec80f07 assets, and switch statement so i dont get roasted 2021-03-07 01:59:22 -05:00
treacherousfiend 9056c77210 remove garbage data
remove lots of null characters from the ends of almost every song, saves a surprising amount of file space, probably also makes IO slightly quicker?
also some other misc fixes to songs, like removing a new line from the start or end of a song
2021-03-05 13:11:59 -07:00
Cameron Taylor 4d27422c40 charts an shit and death counter 2021-03-04 14:30:35 -05:00
Cameron Taylor 451e7f7d7a stuff for week 7 2021-03-04 03:00:48 -05:00
Cameron Taylor 958bc23c4c CHARTS FOR THE MOST PART 2021-03-02 19:01:20 -05:00
Cameron Taylor e26b5f4cda pause screen polish shit 2021-03-01 23:00:02 -05:00
Cameron Taylor a6a3db6aa4 easier storymode menu adding onto 2021-03-01 22:56:12 -05:00
Cameron Taylor 0d3e116d88 freeplay menu polish thingie 2021-03-01 22:56:12 -05:00
Cameron Taylor 000a01664d freeplay fixin shit 2021-02-24 20:22:37 -05:00
Cameron Taylor e94c7a1fae bopeebo note thing 2021-02-24 19:06:41 -05:00
Cameron Taylor 972fdc3f50 Merge branch 'deferred_loading' of https://github.com/Geokureli/Funkin into Geokureli-deferred_loading 2021-02-23 23:34:08 -05:00
George FunBook 903648f674 add AtlasText cuz Alpabet sux 2021-02-23 18:55:24 -06:00
George FunBook 4fc4ca2206 alphabet menu items + separate ngPrompt 2021-02-21 12:08:30 -06:00
George FunBook c95f24983f add prompt, finalize login UI 2021-02-18 13:58:16 -06:00
George FunBook 85cae9dbd2 Merge branch 'deferred_loading' into ng_login 2021-02-15 16:09:35 -06:00
George FunBook 9d70e5c098 move cancelMenu to preload library 2021-02-15 16:07:20 -06:00
George FunBook 9f0277da57 Merge branch 'deferred_loading' into ng_login 2021-02-15 15:59:36 -06:00
George FunBook 145e32c5f8 Merge branch 'master' into deferred_loading 2021-02-15 15:30:29 -06:00