Commit graph

130 commits

Author SHA1 Message Date
Cameron Taylor
592204bfa7 Merge branch 'swf' 2021-05-14 17:21:50 -04:00
Cameron Taylor
6f0b0fc6bb cheat code bullshit oops im on swf branch LOL! 2021-05-14 17:20:01 -04:00
MtH
c5d33192a4 fix crash when going back to title 2021-04-22 21:36:56 +02:00
Cameron Taylor
157769b41a that pussy be yankin 2021-04-18 13:23:09 -04:00
Cameron Taylor
e1a6325e02 cutscene shit in progress 2021-04-18 04:09:56 -04:00
Cameron Taylor
ac8a8aef42 seen video save data shit 2021-04-18 03:47:48 -04:00
Cameron Taylor
2f63837430 pico stage shader 2021-04-18 01:43:28 -04:00
Cameron Taylor
8524f244c7 animation rotations 2021-04-14 11:31:52 -04:00
Cameron Taylor
c61529d40f sprite animation shit idk lol who cares loL! 2021-04-11 19:08:36 -04:00
Cameron Taylor
0ed4f87bdb weird polish bullshit 2021-04-10 02:53:23 -04:00
Cameron Taylor
26f690a264 quieter trailer and GF doin shit 2021-04-09 22:49:25 -04:00
Cameron Taylor
3f1552be6e tankman shit maybe 2021-04-09 20:34:25 -04:00
Cameron Taylor
0e373a0d42 video, and load screenshit 2021-04-09 19:17:14 -04:00
Cameron Taylor
d9612ebb2b Merge branch 'nitpix' of https://github.com/ninjamuffin99/funkin-secret 2021-04-09 15:48:16 -04:00
Cameron Taylor
f696c0909c pico offsets 2021-04-08 20:48:11 -04:00
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