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

510 commits

Author SHA1 Message Date
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 9aa59d679e shader dumbshit in progress IGNORE FOR NOW! 2021-03-20 04:33:44 -04:00
Cameron Taylor ba69b6f3be arrows stuff 2021-03-20 01:03:42 -04:00
Cameron Taylor 7f32d00647 new note spritesheets 2021-03-20 00:48:17 -04: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 fd7a46a90a small organization/cleanup of Discord things 2021-03-18 20:26:17 -04:00
Cameron Taylor 9d8cda5069 Merge branch 'master' of https://github.com/ninjamuffin99/funkin 2021-03-18 19:12:39 -04:00
Cameron Taylor 00395d9d39 Merge pull request #496 from Jakkzero/master
Discord RPC (custom status)
2021-03-18 19:08:55 -04:00
Cameron Taylor b9356fb543 Merge branch 'master' of https://github.com/ninjamuffin99/funkin 2021-03-18 19:01:08 -04:00
Cameron Taylor 81c3e20662 Merge pull request #542 from treacherousfiend/json-cleanup
Remove garbage data from end of songs
2021-03-18 19:00:38 -04:00
Cameron Taylor ad8b26cca0 Merge branch 'shart' 2021-03-18 16:29:35 -04:00
Cameron Taylor 155c334586 fixed compiler conditional thingie 2021-03-18 16:26:39 -04:00
Cameron Taylor 7f4218eabe Merge branch 'shart' of https://github.com/ninjamuffin99/funkin-secret into shart 2021-03-18 16:24:58 -04:00
Cameron Taylor 3a84984a3f Merge branch 'nitpix' 2021-03-18 16:22:53 -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
Cameron Taylor 21337c608f TANKMAN GAMEOVER SHIT 2021-03-18 14:15:54 -04: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
MtH 47952c7dcd bf pixel die offset fix & manual sparrow fix 2021-03-18 14:04:28 +01:00
MtH 4ef634ec2c title tweaks:
fix crash when spamming enter,
force logo bump,
compensate for missed beats with intro text (ex. when window being dragged)
2021-03-18 12:49:37 +01:00
MtH d662291f79 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-03-17 19:15:18 +01:00
MtH 5842a59e34 make pause actually use the pause control 2021-03-17 19:15:00 +01:00
MtH 69e51cb635 mitigate countdown dancing issues (might still fuck up on higher bpm) 2021-03-17 18:33:26 +01:00
Cameron Taylor 6f28bbe0a9 offsets and adjustemnts 2021-03-17 05:29:04 -04:00
Cameron Taylor 78dafab62f bf holding gf 2021-03-17 05:20:25 -04:00
Cameron Taylor df5692b601 swag 2021-03-16 01:59:54 -04:00
Cameron Taylor db3a4cc483 tnakmen in progres lol 2021-03-16 01:51:23 -04:00
MtH 98082b44cb Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-03-14 20:49:28 +01:00
MtH 305df1f6ad remove check if philly train sound playing 2021-03-14 20:48:02 +01:00
MtH ca2b62d8ea fix oppenent freezing when !mustHitSection and no notes, dance only on downbeat 2021-03-14 20:46:44 +01:00
Cameron Taylor 767059114c offsets for bf and gf 2021-03-13 23:02:14 -05:00
Cameron Taylor 09792b745e offset bullshit and pico 2021-03-13 20:53:57 -05:00
MtH e96205dfad make main menu bg not go offscreen when selecting options, add offsets for menu items 2021-03-13 22:31:49 +01:00
MtH 32452c4180 portraits before box to fix thorns intro layering issue 2021-03-13 20:06:03 +01:00
MtH 1933f65c2d finger fadeout oops 2021-03-13 19:48:49 +01:00
MtH ed7002226d freeplay monster icon 2021-03-13 19:43:11 +01:00
MtH 2226ab7939 week6 dialogue finger 2021-03-13 19:40:54 +01: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
Cameron Taylor 5848160819 conditionals for HTML5 2021-03-10 17:01:57 -05:00
MtH 383a3758e4 w7c2 first draft 2021-03-10 21:59:46 +01:00
Cameron Taylor 61ab98c879 mod menu prototyping 2021-03-10 00:27:57 -05:00
Cameron Taylor 141c01c8b8 Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret 2021-03-09 23:33:38 -05:00
Cameron Taylor 0e44032eda file and folder detection 2021-03-09 19:41:03 -05:00
MtH f1421e2ff6 gf sad offset TINY FIX 2021-03-09 12:29:00 +01:00
Cameron Taylor f0b799410c intro whatev 2021-03-09 00:06:14 -05:00