Commit Graph

784 Commits

Author SHA1 Message Date
Cameron Taylor 1cca8e1849 video, and load screenshit 2021-04-09 19:17:14 -04:00
Cameron Taylor ef0a0db812 cutscenes, menu, story shit 2021-04-09 16:37:54 -04:00
Cameron Taylor 446190e676 Merge branch 'nitpix' of https://github.com/ninjamuffin99/funkin-secret 2021-04-09 15:48:16 -04:00
Cameron Taylor a3cb040831 Merge branch 'shart' of https://github.com/ninjamuffin99/funkin-secret 2021-04-09 15:48:06 -04:00
MtH f36c24b59f Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-04-09 21:10:22 +02:00
Cameron Taylor 436a80bb41 jeff gameover censor 2021-04-09 11:38:09 -04:00
Cameron Taylor 02d6ad9e18 load screen and censors 2021-04-09 03:03:27 -04:00
Cameron Taylor afb3f9347d tanky 2021-04-08 22:50:29 -04:00
Cameron Taylor b537e770da tankman anims song 2 lil thing 2021-04-08 22:02:49 -04:00
Cameron Taylor 606c697251 pico asset re export 2021-04-08 21:52:21 -04:00
Cameron Taylor 4944a7e026 thingie LOL 2021-04-08 20:58:07 -04:00
MtH e7b074ff4f menu scroll sound on pause screen 2021-04-09 02:56:17 +02:00
MtH d437db7585 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-04-09 02:52:41 +02:00
Cameron Taylor aa09f17f4b pico offsets 2021-04-08 20:48:11 -04:00
Cameron Taylor 275c6ff60c stress cunt cutscene stuff 2021-04-08 18:59:37 -04:00
Cameron Taylor c0dc75bb58 offsets close enuf yuck yuck yuck 2021-04-08 18:14:53 -04:00
Cameron Taylor 6eb948d868 cutscene polish in progress 2021-04-08 17:31:08 -04:00
MtH d63206a6d7 freeplay 2021-04-08 23:29:31 +02:00
MtH c600802565 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-04-08 18:51:01 +02:00
MtH ee89a5f29a discord rpc ignore unfocus if autopause disabled 2021-04-08 18:45:59 +02:00
Cameron Taylor e81f58499c tank cutscene GUNS 2021-04-08 12:33:19 -04:00
MtH a36dd5d613 merge from PUBLIC 2021-04-08 14:44:13 +02:00
MtH 1dacbe047d don't try to resync vocals after vocals already ended or song fading out 2021-04-08 14:17:21 +02:00
MtH a2b7f3ade5 im dumb 2021-04-08 13:33:36 +02:00
MtH d42d36817f NEEDS TESTING: delay note miss by one frame to fix lag causing misses 2021-04-08 03:29:32 +02:00
Cameron Taylor 1e903523fb cutscene shit in progress 2021-04-07 20:19:49 -04:00
MtH 6e9f75a1a7 blammed chart pico funny adlibs 2021-04-07 21:14:20 +02:00
Cameron Taylor a2ae9bbcd1 cutscene character work in progress 2021-04-06 18:12:31 -04:00
Cameron Taylor b518fdad0a lol mute debug thing! 2021-04-06 12:27:07 -04:00
Cameron Taylor c643d4651f drag and drop (commented out, for use later) 2021-04-05 16:42:04 -04:00
Cameron Taylor de9ee7f6a9 gf holdup anims in progress 2021-04-05 12:59:22 -04:00
Cameron Taylor c792739d7c Merge branch 'nitpix' of https://github.com/ninjamuffin99/funkin-secret 2021-04-04 22:33:37 -04:00
Cameron Taylor 0b2a58ac5f autopause bullshit 2021-04-04 20:37:23 -04:00
Cameron Taylor 436980361b camera bullshit for menus a lil cooler 2021-04-04 10:17:46 -07:00
Cameron Taylor ce9fac5fe0 Merge branch 'master' of https://github.com/ninjamuffin99/Funkin-secret 2021-04-03 21:38:00 -07:00
Cameron Taylor 150f314467 bf holding GF dead offset shit in progress 2021-04-03 21:37:57 -07:00
Cameron Taylor b46d75883d Merge pull request #3 from ninjamuffin99/mac_fixes
fix errors on mac
2021-04-03 09:43:40 -07:00
Cameron Taylor 0b7787fbd0 Merge branch 'shart' 2021-04-03 09:41:35 -07:00
MtH 5851d94b6c sort notes on countdown, fixes layering issue on thorns 2021-04-03 02:03:53 +02:00
MtH 26a0410acd Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into testtrack 2021-04-03 01:42:23 +02:00
MtH d1b7a325f7 remove test from freeplay 2021-04-03 01:42:11 +02:00
Cameron Taylor 02c0573a93 Merge pull request #691 from actuallyasmartname/master
Make link for downloads the latest version, not the Ludum Dare prototype
2021-04-02 15:27:14 -07:00
Cameron Taylor ca9af04d9d Merge pull request #695 from KadeDev/patch-1
Discord RPC fix
2021-04-02 14:39:42 -07:00
Kade M 3f16a70f1a add the fucntioln 2021-04-02 14:37:58 -07:00
Kade M b30c5f365f close the thing on the dead 2021-04-02 14:35:14 -07:00
Cameron Taylor 3eff5398f4 dumbass sort maybe lol! 2021-04-01 19:28:20 -07:00
Cameron Taylor 3cdfee90f2 gf speaker placement tanky 2021-04-01 18:43:53 -07:00
Cameron Taylor 3030ca4392 placement shit for tnakstage again 2021-04-01 18:35:10 -07:00
Cameron Taylor 916d6437db tank assets placements 2021-04-01 16:39:03 -07:00
actuallyasmartname 29bce6f499 Make link for downloads the latest version, not the Ludum Dare prototype 2021-03-31 18:52:07 -04:00