cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-09-04 20:58:03 +00:00
Code Issues Releases Wiki Activity
784 commits 30 branches 30 tags 4.1 GiB
Commit graph

574 commits

Author SHA1 Message Date
Cameron Taylor e3ea518e7d colors wip 2021-04-10 11:21:04 -04:00
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 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 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 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
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 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
MtH 5851d94b6c sort notes on countdown, fixes layering issue on thorns 2021-04-03 02:03:53 +02: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
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
Cameron Taylor 82d0490f16 lil options cleaning 2021-03-30 21:01:18 -07:00
Cameron Taylor 96e6226c04 FPS counter toggle 2021-03-30 20:51:17 -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 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 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
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
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
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
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
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 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
Cameron Taylor 6f2302cbbc mod menu thingie 2021-03-24 19:19:08 -04:00
Cameron Taylor 6fed4b5f16 outline bullshit in progress 2021-03-24 18:41:54 -04:00
Cameron Taylor 6c2101fa6f converting shit to new options menu 2021-03-24 16:44:58 -04:00
Voltrex efbb29ad28 feat(performance): Use switch statement 
Use a `switch` statement instead of a huge `if .. else if` chains.
 2021-03-24 18:43:17 +04:30
Cameron Taylor a7a15cc6b9 lol fixed dumbass shader thinge oops 2021-03-23 21:33:17 -04:00
George FunBook 2da29bc5fb Merge branch 'master' into sans_discord 2021-03-23 18:07:02 -05:00