1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-05 06:14:36 +00:00
Commit graph

680 commits

Author SHA1 Message Date
MtH 25654c3cd6 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-04-10 01:32:54 +02:00
Cameron Taylor 0e373a0d42 video, and load screenshit 2021-04-09 19:17:14 -04:00
Cameron Taylor 1f45a072c0 cutscenes, menu, story shit 2021-04-09 16:37:54 -04:00
Cameron Taylor d9612ebb2b Merge branch 'nitpix' of https://github.com/ninjamuffin99/funkin-secret 2021-04-09 15:48:16 -04:00
MtH ed79dd13c9 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-04-09 21:10:22 +02:00
Cameron Taylor 7fa9700664 jeff gameover censor 2021-04-09 11:38:09 -04:00
Cameron Taylor 80c6609ef9 load screen and censors 2021-04-09 03:03:27 -04:00
Cameron Taylor 7f80550598 tanky 2021-04-08 22:50:29 -04:00
Cameron Taylor 462734d87b tankman anims song 2 lil thing 2021-04-08 22:02:49 -04:00
Cameron Taylor b06cc7b105 pico asset re export 2021-04-08 21:52:21 -04:00
Cameron Taylor e85f883fa3 thingie LOL 2021-04-08 20:58:07 -04:00
MtH f10a935a75 menu scroll sound on pause screen 2021-04-09 02:56:17 +02:00
MtH af5abd27d1 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-04-09 02:52:41 +02:00
Cameron Taylor f696c0909c pico offsets 2021-04-08 20:48:11 -04:00
Cameron Taylor 11d9998539 stress cunt cutscene stuff 2021-04-08 18:59:37 -04:00
Cameron Taylor ea430156e2 cutscene polish in progress 2021-04-08 17:31:08 -04:00
MtH 662711b787 freeplay 2021-04-08 23:29:31 +02:00
MtH ab6cd0e34e Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-04-08 18:51:01 +02:00
MtH 35516cb8f9 discord rpc ignore unfocus if autopause disabled 2021-04-08 18:45:59 +02:00
Cameron Taylor 7c75bfaf31 tank cutscene GUNS 2021-04-08 12:33:19 -04:00
MtH cdd93d8e48 merge from PUBLIC 2021-04-08 14:44:13 +02:00
MtH 729d48707d don't try to resync vocals after vocals already ended or song fading out 2021-04-08 14:17:21 +02:00
MtH 10bb5d8a30 im dumb 2021-04-08 13:33:36 +02:00
MtH ba62e4cb0e NEEDS TESTING: delay note miss by one frame to fix lag causing misses 2021-04-08 03:29:32 +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
Cameron Taylor f474459ef9 Merge branch 'nitpix' of https://github.com/ninjamuffin99/funkin-secret 2021-04-04 22:33:37 -04:00
Cameron Taylor 6205470907 autopause bullshit 2021-04-04 20:37:23 -04:00
Cameron Taylor 08074f56a5 camera bullshit for menus a lil cooler 2021-04-04 10:17:46 -07:00
Cameron Taylor 6cd6f9b0f7 Merge branch 'master' of https://github.com/ninjamuffin99/Funkin-secret 2021-04-03 21:38:00 -07:00
Cameron Taylor 3451be5943 bf holding GF dead offset shit in progress 2021-04-03 21:37:57 -07:00
Cameron Taylor e45446bbe4 Merge pull request #3 from ninjamuffin99/mac_fixes
fix errors on mac
2021-04-03 09:43:40 -07:00
MtH 001794591f sort notes on countdown, fixes layering issue on thorns 2021-04-03 02:03:53 +02:00
MtH bbe773d68c Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into testtrack 2021-04-03 01:42:23 +02:00
MtH 427ce7bd7f remove test from freeplay 2021-04-03 01:42:11 +02:00
Cameron Taylor 72e2fcada9 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 91c591f026 Merge pull request #695 from KadeDev/patch-1
Discord RPC fix
2021-04-02 14:39:42 -07:00
Kade M c07533c0c3 add the fucntioln 2021-04-02 14:37:58 -07:00
Kade M 76ebfef571 close the thing on the dead 2021-04-02 14:35:14 -07:00
Cameron Taylor e25f528e24 dumbass sort maybe lol! 2021-04-01 19:28:20 -07:00
Cameron Taylor 7e17d2a673 gf speaker placement tanky 2021-04-01 18:43:53 -07:00
Cameron Taylor d4abfcda6a placement shit for tnakstage again 2021-04-01 18:35:10 -07:00
Cameron Taylor e3c473f65b tank assets placements 2021-04-01 16:39:03 -07:00
actuallyasmartname 0ad4ad3906 Make link for downloads the latest version, not the Ludum Dare prototype 2021-03-31 18:52:07 -04:00
Cameron Taylor 1cde68cc91 smoke effects on tankstage 2021-03-31 12:41:45 -07:00
MtH 5e74a0ea44 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret 2021-03-31 19:11:42 +02:00
MtH 2d48435b3b downscroll susnotes positioning 2021-03-31 19:11:05 +02:00
Cameron Taylor eae5b1888c Merge branch 'master' of https://github.com/ninjamuffin99/Funkin-secret 2021-03-31 10:09:01 -07:00