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

115 commits

Author SHA1 Message Date
MtH ab6cd0e34e Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-04-08 18:51:01 +02:00
MtH cdd93d8e48 merge from PUBLIC 2021-04-08 14:44:13 +02:00
Cameron Taylor 29a5802a5b cutscene shit in progress 2021-04-07 20:19:49 -04:00
Cameron Taylor 3db5184b71 cutscene character work in progress 2021-04-06 18:12:31 -04:00
Cameron Taylor c99297cc14 lol mute debug thing! 2021-04-06 12:27:07 -04:00
Cameron Taylor c72a238782 drag and drop (commented out, for use later) 2021-04-05 16:42:04 -04:00
Kade M 76ebfef571 close the thing on the dead 2021-04-02 14:35:14 -07:00
Cameron Taylor 643ce8a350 bullshit for working mac build? lol 2021-03-31 10:08:55 -07:00
Cameron Taylor fb7ad03083 FPS counter toggle 2021-03-30 20:51:17 -07:00
Cameron Taylor fe91708b9b tankman/picospeaker better syncs 2021-03-30 13:58:05 -07:00
Cameron Taylor 32f1b509f4 moved animate bullshit into CoolUtil and gave up 2021-03-30 11:15:34 -07:00
Cameron Taylor f93def6df1 Merge branch 'master' of https://github.com/ninjamuffin99/Funkin-secret 2021-03-29 18:00:37 -07:00
Cameron Taylor 8f25fb29ef potential adobe animate texture atlas bullshit WIP 2021-03-29 18:00:30 -07:00
Cameron Taylor c0cfbc3380 Merge pull request #1 from ninjamuffin99/sans_discord
allow run without discord stuff
2021-03-29 13:43:10 -07:00
Cameron Taylor 17545fbc86 reverted the ng thingies 2021-03-27 16:11:14 -07:00
Cameron Taylor 105c05f2e2 no flashing menu 2021-03-26 21:22:07 -04:00
Cameron Taylor b470cfc83a preference toggling 2021-03-26 20:09:04 -04:00
Cameron Taylor 180c3db3c4 outline bullshit in progress 2021-03-24 18:41:54 -04:00
George FunBook c5888e44ed Merge branch 'master' into sans_discord 2021-03-23 18:07:02 -05:00
George FunBook 3476796cc6 Merge branch 'master' into options 2021-03-22 23:05:46 -05:00
George FunBook 9c6b3bf51d finalize options menu 2021-03-22 21:39:35 -05:00
George FunBook 8a515b63f5 allow run without discord stuff 2021-03-22 09:09:46 -05:00
Cameron Taylor 75ed1d5231 color swap shit in progress 2021-03-21 14:45:46 -04:00
Cameron Taylor c80d8cc09e shader bullshit 2021-03-20 15:20:00 -04:00
Cameron Taylor 671046a6d5 SHADERRRR 2021-03-20 14:55:29 -04:00
Cameron Taylor 01065e54d5 new note spritesheets 2021-03-20 00:48:17 -04:00
Cameron Taylor 619f7c8a22 Merge branch 'master' of https://github.com/ninjamuffin99/funkin 2021-03-18 19:12:39 -04: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
George FunBook 9ffa28dd21 Merge branch 'master' into options 2021-03-13 22:41:29 -06:00
George FunBook 95f8d65972 Merge branch 'master' into ng_login 2021-03-13 20:24:57 -06:00
Cameron Taylor 388a3f8aab oops more bullshit 2021-03-13 13:37:59 -05:00
Cameron Taylor bfd6325c43 mod menu prototyping 2021-03-10 00:27:57 -05:00
Cameron Taylor 956b5b94fd video stuff in progress 2021-03-04 19:36:56 -05:00
WorstAquaPlayer b1993259bf Changed RPC !html and added Debug Status 2021-02-27 21:06:30 -03:00
Jakkzero bd2228f3f5 put the thread import in the right place 2021-02-26 13:25:55 +00:00
Jakkzero cb8aa3d175 Adding updated source files 2021-02-26 12:27:32 +00: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
George FunBook e6b9ec2100 finalize prompts and uix 2021-02-19 20:11:33 -06:00
George FunBook 80e7539deb add prompt, finalize login UI 2021-02-18 13:58:16 -06:00
Cameron Taylor a3ece662fe icon bullshit and somethin else gitaroo man 2021-02-16 00:21:11 -05: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
George FunBook 8dd68b6360 remove TitleState.soundExt 2021-02-11 13:14:16 -06:00
George FunBook 225ee24fc3 move files to weeks and load songs individually 2021-02-10 14:18:14 -06:00
George FunBook 07abc35f66 add Paths asset name helper 2021-02-08 15:34:48 -06:00
Cameron Taylor 5ad361ecaa leaves lol! 2021-01-31 09:17:56 -05:00
Cameron Taylor 19f77fec97 so much win 2021-01-24 22:42:51 -05:00
Cameron Taylor 55b5f56624 scripted type beat 2021-01-20 04:11:55 -05:00
Cameron Taylor 88b52ab548 cool heads 2021-01-16 23:15:29 -05:00