cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-14 19:05:15 +00:00
Code Issues Releases Wiki Activity
1025 commits 30 branches 20 tags 6.8 GiB
Commit graph

1025 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
MtH daef9e0759 DECIMAL BPM support for da charters out there, 
also changes to HealthIcon to better work in ChartingState
 2021-03-20 17:33:29 +01:00
MtH 80cac358c2 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-03-20 12:56:53 +01: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
MtH db9d497460 hair blowing idle loop for week4 2021-03-19 19:02:42 +01:00
MtH 7e52a76329 quickAnimAdd() for all, fixes looping anims 
dad, pico looping idle fixed, they now dance on beat instead
also adds animation.finish() after initial anims, so their anims on create don't get in the way of anims during countdown
commented-out idea for senpai idle, as it's currently 2 beats long but not properly on beat
 2021-03-19 18:13:41 +01:00
Cameron Taylor 9ec63f41d7 Merge pull request #608 from TentaRJ/master 
Update README.md
 2021-03-19 01:47:50 -04:00
Cameron Taylor be5907ba12 pixel icon bullshits 2021-03-19 00:03:29 -04:00
Tenta 4bfa84a8c3 Update README.md 2021-03-18 22:26:23 -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
Cameron Taylor eefae64c0c TANKMAN GAMEOVER SHIT 2021-03-18 14:15:54 -04:00
MtH ab1a89783c bf pixel die offset fix & manual sparrow fix 2021-03-18 14:04:28 +01:00
MtH 6e23041d8c 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 87ec716ade Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-03-17 19:15:18 +01:00
MtH 3107d62053 make pause actually use the pause control 2021-03-17 19:15:00 +01:00
MtH 91409b67c9 mitigate countdown dancing issues (might still fuck up on higher bpm) 2021-03-17 18:33:26 +01:00
Cameron Taylor 48411894e2 offsets and adjustemnts 2021-03-17 05:29:04 -04:00
Cameron Taylor d8f0297675 bf holding gf 2021-03-17 05:20:25 -04:00
George FunBook a75e6ecb38 add input groups 2021-03-16 10:20:40 -05:00
George FunBook 9c1866dbdb add rebind key prompt 2021-03-16 09:56:08 -05:00
Cameron Taylor 40318587a1 swag 2021-03-16 01:59:54 -04:00
Cameron Taylor eba2639638 tnakmen in progres lol 2021-03-16 01:51:23 -04:00