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

362 commits

Author SHA1 Message Date
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
Cameron Taylor 21337c608f TANKMAN GAMEOVER SHIT 2021-03-18 14:15:54 -04: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 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
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
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 8e95e79c3b tankmen foreground in progress 2021-03-08 18:38:58 -05:00
Cameron Taylor d5e6985024 tank guy and quality of life shit 2021-03-07 15:34:21 -05:00
Cameron Taylor 847ec80f07 assets, and switch statement so i dont get roasted 2021-03-07 01:59:22 -05:00
Cameron Taylor 9f9996154a video stuff in progress 2021-03-04 19:36:56 -05: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 a211dc50e6 monster and shit 2021-03-02 04:30:25 -05:00
Cameron Taylor 1a6b2e51a7 freeplay stuff in progress 2021-03-02 00:46:28 -05:00
Cameron Taylor 2ca75724cd freeplay icon polish, and pause title touchups 2021-03-01 23:58:19 -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 1a9ae4ba0a song icon formatting 2021-03-01 22:56:12 -05:00
Cameron Taylor eff2a19257 week metadata bullshit for free[;ay 2021-02-24 20:52:59 -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 b37f6a7614 options menu in progress 2021-02-24 18:32:51 -05:00
Cameron Taylor 9ac509c72b Merge pull request #384 from ActualMandM/resyncvocals 
Resync by music instead of vocals
 2021-02-24 01:42:00 -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
Cameron Taylor 29d3d15741 bullshit lol 2021-02-23 23:32:53 -05:00