cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-01 04:14:47 +00:00
Code Issues Releases Wiki Activity
681 commits 3 branches 3 tags 3 GiB
Commit graph

291 commits

Author SHA1 Message Date
Cameron Taylor fd56a32515 weird polish bullshit 2021-04-10 02:53:23 -04:00
Cameron Taylor 8bbeef10a1 recycling and groups i guess 2021-04-10 01:49:57 -04:00
Cameron Taylor a518562806 quieter trailer and GF doin shit 2021-04-09 22:49:25 -04:00
Cameron Taylor 7149b586ac tankman shit maybe 2021-04-09 20:34:25 -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 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 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 6eb948d868 cutscene polish in progress 2021-04-08 17:31:08 -04: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
Cameron Taylor 1e903523fb cutscene shit in progress 2021-04-07 20:19:49 -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 436980361b camera bullshit for menus a lil cooler 2021-04-04 10:17:46 -07:00
MtH 5851d94b6c sort notes on countdown, fixes layering issue on thorns 2021-04-03 02:03:53 +02: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
Cameron Taylor f1b65fa92d smoke effects on tankstage 2021-03-31 12:41:45 -07:00
MtH 4a72828234 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret 2021-03-31 19:11:42 +02:00
MtH e16588af62 downscroll susnotes positioning 2021-03-31 19:11:05 +02:00
Cameron Taylor a259716163 Merge branch 'master' of https://github.com/ninjamuffin99/Funkin-secret 2021-03-31 10:09:01 -07:00
Cameron Taylor 3d20c2fd12 bullshit for working mac build? lol 2021-03-31 10:08:55 -07:00
MtH d1807afa7e Merge branch 'nitpix' of github.com:ninjamuffin99/Funkin-secret 2021-03-31 14:43:43 +02:00
MtH 393ab7733d clip rotated sus 2021-03-31 14:43:37 +02:00
Cameron Taylor 4518cbfbbc pico note sort 2021-03-30 21:25:41 -07:00
MtH 242443810c susnote clip for downscroll still looks like shit tho 2021-03-31 03:02:12 +02:00
Cameron Taylor b6e8cc93b8 basically down scroll 2021-03-30 15:10:15 -07:00
MtH 377feed549 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-03-31 00:02:59 +02:00
MtH 82fba0eb8b have notes show up properly on scroll speeds below 1 2021-03-31 00:02:09 +02:00
Cameron Taylor 5b2412cf6f tankman/picospeaker better syncs 2021-03-30 13:58:05 -07:00
MtH 1bd5cbf472 fixed bugs where game would crash if pressing R during cutscene or state transition 2021-03-30 18:43:07 +02:00
MtH bbe6b739fe Merge branch 'scoreoutline' of https://github.com/ActualMandM/Funkin into nitpix 2021-03-30 16:39:10 +02:00
MtH 81ce710db6 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-03-30 14:06:56 +02:00
Cameron Taylor 23e6f9b972 Merge pull request #640 from VoltrexMaster/patch-1 
feat(performance): Use switch statement
 2021-03-29 13:45:54 -07:00
Cameron Taylor 217521860e Merge pull request #500 from ActualMandM/she_cheers 
girlfriend cheering in tutorial
 2021-03-29 13:43:41 -07:00
Cameron Taylor 482fd33f23 Merge pull request #1 from ninjamuffin99/sans_discord 
allow run without discord stuff
 2021-03-29 13:43:10 -07:00
Cameron Taylor 526f91fe5f pico in progress 2021-03-29 10:24:49 -07:00
MtH f067ebd8e9 resync by BOTH voices and inst 
also remove unnecessary includes in chartingstate
 2021-03-29 17:01:49 +02:00
Voltrex da91d35ebc Fix indentation 
2 -> 7 tabs.
 2021-03-29 18:17:41 +04:30