1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-09-20 01:00:53 +00:00
Commit graph

275 commits

Author SHA1 Message Date
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
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
Cameron Taylor 7c75bfaf31 tank cutscene GUNS 2021-04-08 12:33:19 -04:00
Cameron Taylor 29a5802a5b cutscene shit in progress 2021-04-07 20:19:49 -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 08074f56a5 camera bullshit for menus a lil cooler 2021-04-04 10:17:46 -07:00
MtH 001794591f sort notes on countdown, fixes layering issue on thorns 2021-04-03 02:03:53 +02: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
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
Cameron Taylor 643ce8a350 bullshit for working mac build? lol 2021-03-31 10:08:55 -07:00
MtH c6cc9a73de Merge branch 'nitpix' of github.com:ninjamuffin99/Funkin-secret 2021-03-31 14:43:43 +02:00
MtH d2cd5e82ad clip rotated sus 2021-03-31 14:43:37 +02:00
Cameron Taylor bd771261e1 pico note sort 2021-03-30 21:25:41 -07:00
MtH 6b979e50cb susnote clip for downscroll still looks like shit tho 2021-03-31 03:02:12 +02:00
Cameron Taylor 95e53ebc38 basically down scroll 2021-03-30 15:10:15 -07:00
MtH 5f8a3241ca Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-03-31 00:02:59 +02:00
MtH 01288631ff have notes show up properly on scroll speeds below 1 2021-03-31 00:02:09 +02:00
Cameron Taylor fe91708b9b tankman/picospeaker better syncs 2021-03-30 13:58:05 -07:00
MtH 0370f77dfe fixed bugs where game would crash if pressing R during cutscene or state transition 2021-03-30 18:43:07 +02:00
MtH 364b74c1c8 Merge branch 'scoreoutline' of https://github.com/ActualMandM/Funkin into nitpix 2021-03-30 16:39:10 +02:00
MtH 51db0d3d24 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-03-30 14:06:56 +02: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 bdb74d29bc pico in progress 2021-03-29 10:24:49 -07:00
MtH 03ed9bc2be resync by BOTH voices and inst
also remove unnecessary includes in chartingstate
2021-03-29 17:01:49 +02:00
MtH 627226dca9 pixel countdown 2021-03-28 23:36:14 +02:00
MtH 484ad359a4 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 09676d88f0 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-03-28 18:10:40 +02:00
Cameron Taylor c7097eae62 no camera zoom shit 2021-03-26 21:28:04 -04:00
Cameron Taylor b470cfc83a preference toggling 2021-03-26 20:09:04 -04:00
Cameron Taylor 45652399c3 cool note thingies 2021-03-26 03:51:39 -04:00
Cameron Taylor 85e181bc80 lerp tweaks and shit more 2021-03-24 23:39:19 -04:00
Cameron Taylor 7766ddf9bd camera movement lerp fix for high framerates 2021-03-24 22:41:41 -04:00
George FunBook c5888e44ed Merge branch 'master' into sans_discord 2021-03-23 18:07:02 -05:00
George FunBook d5d484bfb2 fix remove defaultCamera refs 2021-03-23 17:30:58 -05:00
George FunBook 3476796cc6 Merge branch 'master' into options 2021-03-22 23:05:46 -05:00
George FunBook 8a515b63f5 allow run without discord stuff 2021-03-22 09:09:46 -05:00
MtH 532e2f18ae Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-03-22 01:55:17 +01:00
Cameron Taylor dd49ae7990 note color bullshit and also disabled 'stuns'?? 2021-03-21 16:29:47 -04:00