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
721 commits 3 branches 3 tags 3 GiB
Commit graph

721 commits

This branch
This branch
All branches
Author SHA1 Message Date
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 32e2f3ddf2 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-03-30 21:04:21 +02:00
MtH 554dfbf60b tighten main menu security to prevent weird crashes during transitions 2021-03-30 20:52:24 +02:00
Cameron Taylor cb8c5ca7b7 moved animate bullshit into CoolUtil and gave up 2021-03-30 11:15:34 -07:00
MtH 4c301801c5 skip to end of dialogue if not finished 2021-03-30 18:59:14 +02: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 d136168a5a resolve merge conflict with ActualMandM/pause 2021-03-30 16:47:50 +02:00
MtH bbe6b739fe Merge branch 'scoreoutline' of https://github.com/ActualMandM/Funkin into nitpix 2021-03-30 16:39:10 +02:00
MtH c00a8dc75a offset txts for all chars, move all chars to shared 2021-03-30 15:45:57 +02:00
MtH df1e5bb37f Merge branch 'nitpix' of github.com:ninjamuffin99/Funkin-secret into testtrack 2021-03-30 14:10:04 +02:00
MtH d05fff1a42 Merge branch 'nitpix' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-03-30 14:07:38 +02:00
MtH 81ce710db6 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-03-30 14:06:56 +02:00
MtH 04ad093ef0 week score lerp fix INSPIRED BY PR #447 BY @jvc2 
https://github.com/ninjamuffin99/Funkin/pull/447
 2021-03-30 14:06:03 +02:00
Cameron Taylor 2c03f4f507 Merge pull request #668 from VoltrexMaster/patch-2 
feat(extra): Remove extra imports
 2021-03-29 21:23:51 -07:00
George FunBook 38cc859bb4 fix errors on mac 2021-03-29 23:05:21 -05:00
MtH f92b803e24 test chart oopsy 2021-03-30 05:58:59 +02:00
MtH b82fdc257f Merge branch 'nitpix' of github.com:ninjamuffin99/Funkin-secret into testtrack 2021-03-30 05:45:15 +02:00
MtH e18cb1d5c2 test song and added to freeplay (JUST FOR TESTING) 2021-03-30 05:45:04 +02:00
MtH c01a9f45a1 week6 touchups 2021-03-30 03:38:05 +02:00
Cameron Taylor 0f997c84af spritemap atlas bullshit? 2021-03-29 18:06:35 -07:00
Cameron Taylor 593e70e4e0 Merge branch 'master' of https://github.com/ninjamuffin99/Funkin-secret 2021-03-29 18:00:37 -07:00
Cameron Taylor 519c187fd9 potential adobe animate texture atlas bullshit WIP 2021-03-29 18:00:30 -07:00
MtH 41232f4fa8 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into shart 2021-03-30 02:18:28 +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 cfa0128db7 week score lerp fix INSPIRED BY PR #447 BY @jvc 
https://github.com/ninjamuffin99/Funkin/pull/447
 2021-03-29 17:18:25 +02: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
Voltrex 59ba23c46e feat(extra): Remove extra imports 
Remove 2 extra imports, `IOErrorEvent` was imported already.
 2021-03-29 04:16:32 +04:30
MtH 6ccf1940cd pixel countdown 2021-03-28 23:36:14 +02:00
MtH 8ae8aaec51 FIX NOTE HITS 
fixes weird note misses when multiple notes are hittable
also fixes notes on HUD appearing pressed when the button is released during game pause/window unfocus
 2021-03-28 23:29:44 +02:00
MtH 333cd2711b Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-03-28 18:10:40 +02:00
MtH 51e537b245 week5 touchups 2021-03-28 18:09:06 +02:00
MtH 905f6c707b Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into shart 2021-03-28 17:41:09 +02:00
Cameron Taylor f1325d31e5 checkbox thingie hehe 2021-03-27 20:01:53 -07:00
Cameron Taylor 5408781804 reverted the ng thingies 2021-03-27 16:11:14 -07:00
MtH 371a995dbd week4 touchups 2021-03-27 04:40:23 +01:00
Cameron Taylor 9e236c91ac checkbox fix in progress 2021-03-26 21:33:16 -04:00
Cameron Taylor 2717c6f0c7 no camera zoom shit 2021-03-26 21:28:04 -04:00
Cameron Taylor 7516134f5d no flashing menu 2021-03-26 21:22:07 -04:00
Cameron Taylor 113730e85c preference toggling 2021-03-26 20:09:04 -04:00
Cameron Taylor d6821142ea cutscene bullshit 2021-03-26 05:09:42 -04:00
Cameron Taylor 4247f82694 cool note thingies 2021-03-26 03:51:39 -04:00
Cameron Taylor f98cb76c98 Merge branch 'shart' of https://github.com/ninjamuffin99/funkin-secret 2021-03-25 04:58:15 -04:00
Cameron Taylor 7cb1954718 lerp tweaks and shit more 2021-03-24 23:39:19 -04:00
Cameron Taylor 399da03591 camera movement lerp fix for high framerates 2021-03-24 22:41:41 -04:00
MtH 6ea92694b7 funny pico week touchups 2021-03-25 00:35:20 +01:00