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

533 commits

This branch
This branch
All branches
Author SHA1 Message Date
George FunBook 70409443d1 fix errors on mac 2021-03-29 23:05:21 -05: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 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
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
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
Cameron Taylor dd14af7499 Merge pull request #2 from ninjamuffin99/options 
Options
 2021-03-23 18:48:03 -04:00
Cameron Taylor 9397334792 outline shader in progress 2021-03-23 18:43:08 -04:00
George FunBook d5d484bfb2 fix remove defaultCamera refs 2021-03-23 17:30:58 -05:00
George FunBook e6c48ed56f fix back bug 2021-03-23 17:28:05 -05:00
George FunBook 5ccd073cad change discord to cpp 2021-03-23 14:17:04 -05:00
George FunBook 3476796cc6 Merge branch 'master' into options 2021-03-22 23:05:46 -05:00
George FunBook e6a5064845 fix camera 2021-03-22 22:41:37 -05:00
George FunBook b8ef4952cd fix type 2021-03-22 22:41:27 -05:00
George FunBook c545a6e090 fix AtlasText bug 2021-03-22 21:39:50 -05:00
George FunBook 9c6b3bf51d finalize options menu 2021-03-22 21:39:35 -05:00
George FunBook 8a515b63f5 allow run without discord stuff 2021-03-22 09:09:46 -05:00
George FunBook 34cb7f9982 more ui work 2021-03-22 08:40:32 -05:00
George FunBook 0ed0093fdd more work on controls menu 2021-03-22 07:48:52 -05:00
Cameron Taylor dd49ae7990 note color bullshit and also disabled 'stuns'?? 2021-03-21 16:29:47 -04:00
Cameron Taylor 75ed1d5231 color swap shit in progress 2021-03-21 14:45:46 -04:00
Cameron Taylor c80d8cc09e shader bullshit 2021-03-20 15:20:00 -04:00
Cameron Taylor 671046a6d5 SHADERRRR 2021-03-20 14:55:29 -04:00
Cameron Taylor 42991c5fdf shader dumbshit in progress IGNORE FOR NOW! 2021-03-20 04:33:44 -04:00
Cameron Taylor 2b61c81ff5 arrows stuff 2021-03-20 01:03:42 -04:00
Cameron Taylor 01065e54d5 new note spritesheets 2021-03-20 00:48:17 -04:00
Cameron Taylor be5907ba12 pixel icon bullshits 2021-03-19 00:03:29 -04:00
Cameron Taylor fdd8e0445e icon code redo for more modularity 2021-03-18 21:08:44 -04:00
Cameron Taylor 99407f07ab small organization/cleanup of Discord things 2021-03-18 20:26:17 -04:00
Cameron Taylor 619f7c8a22 Merge branch 'master' of https://github.com/ninjamuffin99/funkin 2021-03-18 19:12:39 -04:00
Cameron Taylor dbce0bffd8 Merge pull request #496 from Jakkzero/master 
Discord RPC (custom status)
 2021-03-18 19:08:55 -04:00
Cameron Taylor 744f6cc3f0 Merge branch 'shart' 2021-03-18 16:29:35 -04:00
Cameron Taylor ea6b7de62d fixed compiler conditional thingie 2021-03-18 16:26:39 -04:00
Cameron Taylor 2419af49d6 Merge branch 'shart' of https://github.com/ninjamuffin99/funkin-secret into shart 2021-03-18 16:24:58 -04:00
Cameron Taylor dc3098c3e1 Merge branch 'nitpix' 2021-03-18 16:22:53 -04:00