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

344 commits

Author SHA1 Message Date
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 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
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
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
Cameron Taylor 7cba3e72ea freeplay icon polish, and pause title touchups 2021-03-01 23:58:19 -05:00
Cameron Taylor fee7a7746c pause screen polish shit 2021-03-01 23:00:02 -05:00
Cameron Taylor eeda572c3e easier storymode menu adding onto 2021-03-01 22:56:12 -05:00
Cameron Taylor be95f5a298 freeplay menu polish thingie 2021-03-01 22:56:12 -05:00
Cameron Taylor 15a57a34af song icon formatting 2021-03-01 22:56:12 -05:00
Cameron Taylor b1b3df25b5 week metadata bullshit for free[;ay 2021-02-24 20:52:59 -05:00
Cameron Taylor 3882de4ad8 freeplay fixin shit 2021-02-24 20:22:37 -05:00
Cameron Taylor 3e65da6d9d bopeebo note thing 2021-02-24 19:06:41 -05:00
Cameron Taylor 10ecc85baf options menu in progress 2021-02-24 18:32:51 -05:00
Cameron Taylor b62fbe935f Merge pull request #384 from ActualMandM/resyncvocals
Resync by music instead of vocals
2021-02-24 01:42:00 -05:00
Cameron Taylor ebcceb1f20 Merge branch 'deferred_loading' of https://github.com/Geokureli/Funkin into Geokureli-deferred_loading 2021-02-23 23:34:08 -05:00
Cameron Taylor a6deae4796 bullshit lol 2021-02-23 23:32:53 -05:00
Cameron Taylor 811cc1f3ae Merge branch 'master' of https://github.com/ninjamuffin99/ld47 2021-02-23 23:31:15 -05:00
Cameron Taylor d2062f41b6 small shit characters dunno this shit weird lol 2021-02-23 23:14:18 -05:00
MtH b83bb877d0 fix several issues caused by sustain notes no longer being removed after correctly hit 2021-02-20 01:31:52 +01:00
Cameron Taylor 12f8c57484 mobile bullshit cookin in progress??? 2021-02-16 01:53:25 -05:00
Cameron Taylor a3ece662fe icon bullshit and somethin else gitaroo man 2021-02-16 00:21:11 -05:00
George FunBook 7df55291a5 oices path 2021-02-15 15:49:13 -06:00
George FunBook 5b84e136fc Merge branch 'master' into deferred_loading 2021-02-15 15:30:29 -06:00
Cameron Taylor 86955d6670 icons and changelog and newgrounds 2021-02-14 19:45:18 -05:00
Cameron Taylor 5d96dc44e0 Merge pull request #357 from lotusotho/senpaidialoguebug-fix
Fixed bug that makes the whole game crash at the start of week 6
2021-02-14 19:44:41 -05:00
Cameron Taylor 3d8a3a8f98 Gitaroo easter egg 2021-02-14 19:03:02 -05:00
Cameron Taylor 9585ae42e7 Merge branch 'master' of https://github.com/ninjamuffin99/ld47 2021-02-14 03:32:29 -05:00
Cameron Taylor a41e14ecdf icons and cleanin 2021-02-14 03:32:24 -05:00
MtH 7a70182697 better sustain notes & organizing 2021-02-13 23:39:31 +01:00
M&M 93b0fe153d Merge branch 'master' into resyncvocals 2021-02-12 23:21:51 -08:00
George FunBook fb3ed180e1 Merge branch 'master' into deferred_loading 2021-02-12 09:46:22 -06:00
Cameron Taylor b3ec450352 more seamless storymode transitions 2021-02-12 01:20:20 -05:00
Cameron Taylor a037a52a60 Merge pull request #402 from TheDrawingCoder-Gamer/patch-1
Use haxe switch case 'or'
2021-02-11 22:14:24 -05:00
MtH a8a3c96e7b entirely phase out totalBeats/totalSteps in favor of the more reliable curStep/curBeat 2021-02-12 03:19:43 +01:00