Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-24 00:27:59 -05:00
Code Issues Projects Releases Packages Wiki Activity
740 commits 30 branches 20 tags 3 GiB
Commit graph

621 commits

Author SHA1 Message Date
Cameron Taylor
26f690a264 quieter trailer and GF doin shit 2021-04-09 22:49:25 -04:00
Cameron Taylor
3f1552be6e tankman shit maybe 2021-04-09 20:34:25 -04:00
Cameron Taylor
0e373a0d42 video, and load screenshit 2021-04-09 19:17:14 -04:00
Cameron Taylor
1f45a072c0 cutscenes, menu, story shit 2021-04-09 16:37:54 -04:00
Cameron Taylor
d9612ebb2b Merge branch 'nitpix' of https://github.com/ninjamuffin99/funkin-secret 2021-04-09 15:48:16 -04:00
Cameron Taylor
7fa9700664 jeff gameover censor 2021-04-09 11:38:09 -04:00
Cameron Taylor
80c6609ef9 load screen and censors 2021-04-09 03:03:27 -04:00
Cameron Taylor
7f80550598 tanky 2021-04-08 22:50:29 -04:00
Cameron Taylor
462734d87b tankman anims song 2 lil thing 2021-04-08 22:02:49 -04:00
Cameron Taylor
b06cc7b105 pico asset re export 2021-04-08 21:52:21 -04:00
Cameron Taylor
e85f883fa3 thingie LOL 2021-04-08 20:58:07 -04:00
MtH
f10a935a75 menu scroll sound on pause screen 2021-04-09 02:56:17 +02:00
MtH
af5abd27d1 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-04-09 02:52:41 +02:00
Cameron Taylor
f696c0909c pico offsets 2021-04-08 20:48:11 -04:00
Cameron Taylor
11d9998539 stress cunt cutscene stuff 2021-04-08 18:59:37 -04:00
Cameron Taylor
ea430156e2 cutscene polish in progress 2021-04-08 17:31:08 -04:00
MtH
662711b787 freeplay 2021-04-08 23:29:31 +02:00
MtH
ab6cd0e34e Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-04-08 18:51:01 +02:00
MtH
35516cb8f9 discord rpc ignore unfocus if autopause disabled 2021-04-08 18:45:59 +02:00
Cameron Taylor
7c75bfaf31 tank cutscene GUNS 2021-04-08 12:33:19 -04:00
MtH
cdd93d8e48 merge from PUBLIC 2021-04-08 14:44:13 +02:00
MtH
729d48707d don't try to resync vocals after vocals already ended or song fading out 2021-04-08 14:17:21 +02:00
MtH
10bb5d8a30 im dumb 2021-04-08 13:33:36 +02:00
MtH
ba62e4cb0e NEEDS TESTING: delay note miss by one frame to fix lag causing misses 2021-04-08 03:29:32 +02:00
Cameron Taylor
29a5802a5b cutscene shit in progress 2021-04-07 20:19:49 -04:00
Cameron Taylor
3db5184b71 cutscene character work in progress 2021-04-06 18:12:31 -04:00
Cameron Taylor
c99297cc14 lol mute debug thing! 2021-04-06 12:27:07 -04:00
Cameron Taylor
c72a238782 drag and drop (commented out, for use later) 2021-04-05 16:42:04 -04:00
Cameron Taylor
f474459ef9 Merge branch 'nitpix' of https://github.com/ninjamuffin99/funkin-secret 2021-04-04 22:33:37 -04:00
Cameron Taylor
6205470907 autopause bullshit 2021-04-04 20:37:23 -04:00
Cameron Taylor
08074f56a5 camera bullshit for menus a lil cooler 2021-04-04 10:17:46 -07:00
Cameron Taylor
6cd6f9b0f7 Merge branch 'master' of https://github.com/ninjamuffin99/Funkin-secret 2021-04-03 21:38:00 -07:00
Cameron Taylor
3451be5943 bf holding GF dead offset shit in progress 2021-04-03 21:37:57 -07:00
Cameron Taylor
e45446bbe4 Merge pull request #3 from ninjamuffin99/mac_fixes 
fix errors on mac
 2021-04-03 09:43:40 -07:00
MtH
001794591f sort notes on countdown, fixes layering issue on thorns 2021-04-03 02:03:53 +02:00
Kade M
c07533c0c3 add the fucntioln 2021-04-02 14:37:58 -07:00
Kade M
76ebfef571 close the thing on the dead 2021-04-02 14:35:14 -07:00
Cameron Taylor
e25f528e24 dumbass sort maybe lol! 2021-04-01 19:28:20 -07:00
Cameron Taylor
7e17d2a673 gf speaker placement tanky 2021-04-01 18:43:53 -07:00
Cameron Taylor
d4abfcda6a placement shit for tnakstage again 2021-04-01 18:35:10 -07:00
Cameron Taylor
e3c473f65b tank assets placements 2021-04-01 16:39:03 -07:00
Cameron Taylor
1cde68cc91 smoke effects on tankstage 2021-03-31 12:41:45 -07:00
MtH
5e74a0ea44 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret 2021-03-31 19:11:42 +02:00
MtH
2d48435b3b downscroll susnotes positioning 2021-03-31 19:11:05 +02:00
Cameron Taylor
eae5b1888c Merge branch 'master' of https://github.com/ninjamuffin99/Funkin-secret 2021-03-31 10:09:01 -07:00
Cameron Taylor
643ce8a350 bullshit for working mac build? lol 2021-03-31 10:08:55 -07:00
MtH
c6cc9a73de Merge branch 'nitpix' of github.com:ninjamuffin99/Funkin-secret 2021-03-31 14:43:43 +02:00
MtH
d2cd5e82ad clip rotated sus 2021-03-31 14:43:37 +02:00
Cameron Taylor
bd771261e1 pico note sort 2021-03-30 21:25:41 -07:00
Cameron Taylor
60e3facc22 lil options cleaning 2021-03-30 21:01:18 -07:00
Cameron Taylor
fb7ad03083 FPS counter toggle 2021-03-30 20:51:17 -07:00
MtH
6b979e50cb susnote clip for downscroll still looks like shit tho 2021-03-31 03:02:12 +02:00
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
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
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
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
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
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
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
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
eba2639638 tnakmen in progres lol 2021-03-16 01:51:23 -04:00
MtH
49d060d9f2 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-03-14 20:49:28 +01:00
MtH
1467335ac7 remove check if philly train sound playing 2021-03-14 20:48:02 +01:00
MtH
c3710025e1 fix oppenent freezing when !mustHitSection and no notes, dance only on downbeat 2021-03-14 20:46:44 +01:00
George FunBook
9ffa28dd21 Merge branch 'master' into options 2021-03-13 22:41:29 -06:00
Cameron Taylor
a55dcdc69c offsets for bf and gf 2021-03-13 23:02:14 -05:00
George FunBook
307150d3e2 fix camera 2021-03-13 21:41:12 -06:00
George FunBook
95f8d65972 Merge branch 'master' into ng_login 2021-03-13 20:24:57 -06:00
George FunBook
43b0d5ac78 add options menu 2021-03-13 20:11:56 -06:00
Cameron Taylor
15f7b5e2d2 offset bullshit and pico 2021-03-13 20:53:57 -05:00