cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-01 12:24:27 +00:00
Code Issues Releases Wiki Activity
548 commits 3 branches 3 tags 3 GiB
Commit graph

548 commits

This branch
This branch
All branches
Author SHA1 Message Date
George FunBook 2da29bc5fb Merge branch 'master' into sans_discord 2021-03-23 18:07:02 -05:00
Cameron Taylor 699a77201b Merge pull request #2 from ninjamuffin99/options 
Options
 2021-03-23 18:48:03 -04:00
Cameron Taylor 03cc7d9099 outline shader in progress 2021-03-23 18:43:08 -04:00
George FunBook 15e52a4be0 fix remove defaultCamera refs 2021-03-23 17:30:58 -05:00
George FunBook cd46e2ef4d fix back bug 2021-03-23 17:28:05 -05:00
George FunBook c7ad5bd4b5 change discord to cpp 2021-03-23 14:17:04 -05:00
George FunBook aa85510496 Merge branch 'master' into options 2021-03-22 23:05:46 -05:00
George FunBook 03f735bd33 fix camera 2021-03-22 22:41:37 -05:00
George FunBook 125f7cc957 fix type 2021-03-22 22:41:27 -05:00
George FunBook b184ac96f9 fix AtlasText bug 2021-03-22 21:39:50 -05:00
George FunBook c87079fff5 finalize options menu 2021-03-22 21:39:35 -05:00
George FunBook bdb8042b83 allow run without discord stuff 2021-03-22 09:09:46 -05:00
George FunBook 1949a66d89 more ui work 2021-03-22 08:40:32 -05:00
George FunBook 3572cd9c47 more work on controls menu 2021-03-22 07:48:52 -05:00
Cameron Taylor cafc047da7 Merge branch 'shart' 2021-03-21 16:42:22 -04:00
Cameron Taylor e16b347606 stress bullshit in progress 2021-03-21 16:40:25 -04:00
Cameron Taylor 9d988a021f note color bullshit and also disabled 'stuns'?? 2021-03-21 16:29:47 -04:00
Cameron Taylor 08ccaef628 color swap shit in progress 2021-03-21 14:45:46 -04:00
MtH 7c4bd7b584 guns easier 2021-03-21 16:06:57 +01:00
MtH af43771093 ugh EVEN EASIER 2021-03-21 14:55:48 +01:00
MtH fa09126a0b ugh easy redo 2021-03-20 23:34:50 +01:00
Cameron Taylor 00cf2e5c6d shader bullshit 2021-03-20 15:20:00 -04:00
Cameron Taylor 3661a8cd8c SHADERRRR 2021-03-20 14:55:29 -04:00
Cameron Taylor 9aa59d679e shader dumbshit in progress IGNORE FOR NOW! 2021-03-20 04:33:44 -04:00
Cameron Taylor ba69b6f3be arrows stuff 2021-03-20 01:03:42 -04:00
Cameron Taylor 7f32d00647 new note spritesheets 2021-03-20 00:48:17 -04:00
Cameron Taylor 20cd370df5 creds thingie and week6 imgage fixin 2021-03-19 14:34:00 -04:00
Cameron Taylor 7ee1a735b4 pixel icon bullshits 2021-03-19 00:03:29 -04:00
Cameron Taylor 1af910c20e icon code redo for more modularity 2021-03-18 21:08:44 -04:00
Cameron Taylor fd7a46a90a small organization/cleanup of Discord things 2021-03-18 20:26:17 -04:00
Cameron Taylor 9d8cda5069 Merge branch 'master' of https://github.com/ninjamuffin99/funkin 2021-03-18 19:12:39 -04:00
Cameron Taylor 00395d9d39 Merge pull request #496 from Jakkzero/master 
Discord RPC (custom status)
 2021-03-18 19:08:55 -04:00
Cameron Taylor b9356fb543 Merge branch 'master' of https://github.com/ninjamuffin99/funkin 2021-03-18 19:01:08 -04:00
Cameron Taylor 81c3e20662 Merge pull request #542 from treacherousfiend/json-cleanup 
Remove garbage data from end of songs
 2021-03-18 19:00:38 -04:00
Cameron Taylor ad8b26cca0 Merge branch 'shart' 2021-03-18 16:29:35 -04:00
Cameron Taylor 155c334586 fixed compiler conditional thingie 2021-03-18 16:26:39 -04:00
Cameron Taylor 7f4218eabe Merge branch 'shart' of https://github.com/ninjamuffin99/funkin-secret into shart 2021-03-18 16:24:58 -04:00
Cameron Taylor 3a84984a3f Merge branch 'nitpix' 2021-03-18 16:22:53 -04:00
MtH 184a8cd9cd monster tweaks 
now he sings at the start (by popular request)
camera shit
 2021-03-18 19:33:47 +01:00
Cameron Taylor 21337c608f TANKMAN GAMEOVER SHIT 2021-03-18 14:15:54 -04:00
MtH a9b9d146b8 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into shart 
also update hard chart with partial new ninja muffin pattern (pretty good pattern)
 2021-03-18 17:51:15 +01:00
MtH 47952c7dcd bf pixel die offset fix & manual sparrow fix 2021-03-18 14:04:28 +01:00
MtH 4ef634ec2c title tweaks: 
fix crash when spamming enter,
force logo bump,
compensate for missed beats with intro text (ex. when window being dragged)
 2021-03-18 12:49:37 +01:00
MtH d662291f79 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-03-17 19:15:18 +01:00
MtH 5842a59e34 make pause actually use the pause control 2021-03-17 19:15:00 +01:00
MtH 69e51cb635 mitigate countdown dancing issues (might still fuck up on higher bpm) 2021-03-17 18:33:26 +01:00
Cameron Taylor 6f28bbe0a9 offsets and adjustemnts 2021-03-17 05:29:04 -04:00
Cameron Taylor 78dafab62f bf holding gf 2021-03-17 05:20:25 -04:00
George FunBook 7ce5bb40da add input groups 2021-03-16 10:20:40 -05:00
George FunBook 65e7add217 add rebind key prompt 2021-03-16 09:56:08 -05:00