1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-27 17:33:03 +00:00
Commit graph

386 commits

Author SHA1 Message Date
MtH daef9e0759 DECIMAL BPM support for da charters out there,
also changes to HealthIcon to better work in ChartingState
2021-03-20 17:33:29 +01:00
MtH 80cac358c2 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-03-20 12:56:53 +01:00
Cameron Taylor 42991c5fdf shader dumbshit in progress IGNORE FOR NOW! 2021-03-20 04:33:44 -04:00
Cameron Taylor 2b61c81ff5 arrows stuff 2021-03-20 01:03:42 -04:00
Cameron Taylor 01065e54d5 new note spritesheets 2021-03-20 00:48:17 -04:00
MtH db9d497460 hair blowing idle loop for week4 2021-03-19 19:02:42 +01:00
MtH 7e52a76329 quickAnimAdd() for all, fixes looping anims
dad, pico looping idle fixed, they now dance on beat instead
also adds animation.finish() after initial anims, so their anims on create don't get in the way of anims during countdown
commented-out idea for senpai idle, as it's currently 2 beats long but not properly on beat
2021-03-19 18:13:41 +01:00
Cameron Taylor be5907ba12 pixel icon bullshits 2021-03-19 00:03:29 -04:00
Cameron Taylor fdd8e0445e icon code redo for more modularity 2021-03-18 21:08:44 -04:00
Cameron Taylor 99407f07ab small organization/cleanup of Discord things 2021-03-18 20:26:17 -04:00
Cameron Taylor 619f7c8a22 Merge branch 'master' of https://github.com/ninjamuffin99/funkin 2021-03-18 19:12:39 -04:00
Cameron Taylor dbce0bffd8 Merge pull request #496 from Jakkzero/master
Discord RPC (custom status)
2021-03-18 19:08:55 -04:00
Cameron Taylor 744f6cc3f0 Merge branch 'shart' 2021-03-18 16:29:35 -04:00
Cameron Taylor ea6b7de62d fixed compiler conditional thingie 2021-03-18 16:26:39 -04:00
Cameron Taylor 2419af49d6 Merge branch 'shart' of https://github.com/ninjamuffin99/funkin-secret into shart 2021-03-18 16:24:58 -04:00
Cameron Taylor dc3098c3e1 Merge branch 'nitpix' 2021-03-18 16:22:53 -04:00
Cameron Taylor eefae64c0c TANKMAN GAMEOVER SHIT 2021-03-18 14:15:54 -04:00
MtH ab1a89783c bf pixel die offset fix & manual sparrow fix 2021-03-18 14:04:28 +01:00
MtH 6e23041d8c 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 87ec716ade Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-03-17 19:15:18 +01:00
MtH 3107d62053 make pause actually use the pause control 2021-03-17 19:15:00 +01:00
MtH 91409b67c9 mitigate countdown dancing issues (might still fuck up on higher bpm) 2021-03-17 18:33:26 +01:00
Cameron Taylor 48411894e2 offsets and adjustemnts 2021-03-17 05:29:04 -04:00
Cameron Taylor d8f0297675 bf holding gf 2021-03-17 05:20:25 -04:00
Cameron Taylor eba2639638 tnakmen in progres lol 2021-03-16 01:51:23 -04:00
MtH 49d060d9f2 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-03-14 20:49:28 +01:00
MtH 1467335ac7 remove check if philly train sound playing 2021-03-14 20:48:02 +01:00
MtH c3710025e1 fix oppenent freezing when !mustHitSection and no notes, dance only on downbeat 2021-03-14 20:46:44 +01:00
Cameron Taylor a55dcdc69c offsets for bf and gf 2021-03-13 23:02:14 -05:00
Cameron Taylor 15f7b5e2d2 offset bullshit and pico 2021-03-13 20:53:57 -05:00
MtH 367cb8b1cc make main menu bg not go offscreen when selecting options, add offsets for menu items 2021-03-13 22:31:49 +01:00
MtH 9885b03b7d portraits before box to fix thorns intro layering issue 2021-03-13 20:06:03 +01:00
MtH 53b5153c22 finger fadeout oops 2021-03-13 19:48:49 +01:00
MtH 30ef3e4955 freeplay monster icon 2021-03-13 19:43:11 +01:00
MtH c653c69720 week6 dialogue finger 2021-03-13 19:40:54 +01:00
Cameron Taylor 388a3f8aab oops more bullshit 2021-03-13 13:37:59 -05:00
Cameron Taylor f346cf096b guns slight changes and modding desktop conditionals 2021-03-10 20:17:26 -05:00
Cameron Taylor caa95c8c00 conditionals for HTML5 2021-03-10 17:01:57 -05:00
Cameron Taylor bfd6325c43 mod menu prototyping 2021-03-10 00:27:57 -05:00
Cameron Taylor ab4fa026a1 Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret 2021-03-09 23:33:38 -05:00
Cameron Taylor bfcb037b81 file and folder detection 2021-03-09 19:41:03 -05:00
MtH d3c17bc42a gf sad offset TINY FIX 2021-03-09 12:29:00 +01:00
Cameron Taylor d7aba46853 tankmen foreground in progress 2021-03-08 18:38:58 -05:00
Cameron Taylor 4fae6773c9 tank guy and quality of life shit 2021-03-07 15:34:21 -05:00
Cameron Taylor 7658fb245b assets, and switch statement so i dont get roasted 2021-03-07 01:59:22 -05:00
Cameron Taylor 956b5b94fd video stuff in progress 2021-03-04 19:36:56 -05:00
Cameron Taylor 0951b672e7 charts an shit and death counter 2021-03-04 14:30:35 -05:00
Cameron Taylor 6d002a8ef8 stuff for week 7 2021-03-04 03:00:48 -05:00
Cameron Taylor 9b5802e1d0 monster and shit 2021-03-02 04:30:25 -05:00
Cameron Taylor d7f6407578 freeplay stuff in progress 2021-03-02 00:46:28 -05:00