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

673 commits

This branch
This branch
All branches
Author SHA1 Message Date
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 5b62681654 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-03-30 21:04:21 +02:00
MtH 9085eed598 tighten main menu security to prevent weird crashes during transitions 2021-03-30 20:52:24 +02:00
Cameron Taylor 32f1b509f4 moved animate bullshit into CoolUtil and gave up 2021-03-30 11:15:34 -07:00
MtH b7a76bdc8e skip to end of dialogue if not finished 2021-03-30 18:59:14 +02: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 720ae5d3cc resolve merge conflict with ActualMandM/pause 2021-03-30 16:47:50 +02:00
MtH 364b74c1c8 Merge branch 'scoreoutline' of https://github.com/ActualMandM/Funkin into nitpix 2021-03-30 16:39:10 +02:00
MtH 0b5809424f offset txts for all chars, move all chars to shared 2021-03-30 15:45:57 +02:00
MtH 65256b77fd Merge branch 'nitpix' of github.com:ninjamuffin99/Funkin-secret into testtrack 2021-03-30 14:10:04 +02:00
MtH 6b1cb1c541 Merge branch 'nitpix' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-03-30 14:07:38 +02:00
MtH 51db0d3d24 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-03-30 14:06:56 +02:00
MtH d63e132d71 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 b686bc73e1 Merge pull request #668 from VoltrexMaster/patch-2 
feat(extra): Remove extra imports
 2021-03-29 21:23:51 -07:00
George FunBook 70409443d1 fix errors on mac 2021-03-29 23:05:21 -05:00
MtH dd137dd0cc Merge branch 'nitpix' of github.com:ninjamuffin99/Funkin-secret into testtrack 2021-03-30 05:45:15 +02:00
MtH 9f1b18d8dc test song and added to freeplay (JUST FOR TESTING) 2021-03-30 05:45:04 +02:00
Cameron Taylor b388ea9064 spritemap atlas bullshit? 2021-03-29 18:06:35 -07:00
Cameron Taylor f93def6df1 Merge branch 'master' of https://github.com/ninjamuffin99/Funkin-secret 2021-03-29 18:00:37 -07:00
Cameron Taylor 8f25fb29ef potential adobe animate texture atlas bullshit WIP 2021-03-29 18:00:30 -07:00
Cameron Taylor 5425ae08cb Merge pull request #640 from VoltrexMaster/patch-1 
feat(performance): Use switch statement
 2021-03-29 13:45:54 -07:00
Cameron Taylor 006dc200f6 Merge pull request #500 from ActualMandM/she_cheers 
girlfriend cheering in tutorial
 2021-03-29 13:43:41 -07: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 934e45fa2a 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 03ed9bc2be resync by BOTH voices and inst 
also remove unnecessary includes in chartingstate
 2021-03-29 17:01:49 +02:00
Voltrex 0279da5026 Fix indentation 
2 -> 7 tabs.
 2021-03-29 18:17:41 +04:30
Voltrex c7d4f1d2ba feat(extra): Remove extra imports 
Remove 2 extra imports, `IOErrorEvent` was imported already.
 2021-03-29 04:16:32 +04:30
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 00bfd26703 checkbox thingie hehe 2021-03-27 20:01:53 -07:00
Cameron Taylor 17545fbc86 reverted the ng thingies 2021-03-27 16:11:14 -07:00
Cameron Taylor 32a73e7d70 checkbox fix in progress 2021-03-26 21:33:16 -04:00
Cameron Taylor c7097eae62 no camera zoom shit 2021-03-26 21:28:04 -04:00
Cameron Taylor 105c05f2e2 no flashing menu 2021-03-26 21:22:07 -04:00
Cameron Taylor b470cfc83a preference toggling 2021-03-26 20:09:04 -04:00
Cameron Taylor 27c410cb9d cutscene bullshit 2021-03-26 05:09:42 -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
Cameron Taylor 2fdea58951 mod menu thingie 2021-03-24 19:19:08 -04:00
Cameron Taylor 180c3db3c4 outline bullshit in progress 2021-03-24 18:41:54 -04:00
Cameron Taylor 985bd5374b converting shit to new options menu 2021-03-24 16:44:58 -04:00
Voltrex 65ec185c6b 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 6def44b83c lol fixed dumbass shader thinge oops 2021-03-23 21:33:17 -04:00
George FunBook c5888e44ed Merge branch 'master' into sans_discord 2021-03-23 18:07:02 -05:00