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

370 commits

Author SHA1 Message Date
MtH
5891bb7f16 custom camera for lerp fix 2021-05-06 14:08:51 +02:00
MtH
ba19234176 improve rating & combo visibility 2021-05-06 12:55:33 +02:00
MtH
5ee0ef8f4e big cleanup 2021-04-22 04:17:00 +02:00
MtH
d882d6568d move song end into debug block 2021-04-21 22:58:36 +02:00
MtH
adb41ce289 wocky slush 
debug shit, gf in animdebug, changesection
 2021-04-21 15:07:36 +02:00
MtH
b88ad022f2 fix susnotes after note miss changes oops 2021-04-20 22:25:38 +02:00
MtH
7c2cc40d7b smol move 2021-04-20 21:50:26 +02:00
MtH
1431b19e57 combo counter fixes & tweaks 2021-04-20 21:48:16 +02:00
MtH
788c4e6f1b combo counter fixes & tweaks 2021-04-20 20:38:07 +02:00
MtH
5aefe519e0 note miss stuff, clean up 'stunned' remnants 2021-04-20 17:55:42 +02:00
Cameron Taylor
fe4c61124e they hate to see a girlboss winning 2021-04-19 02:46:02 -04:00
Cameron Taylor
56cbb276fa touchups and shit 2021-04-18 17:28:10 -04:00
Cameron Taylor
c60bd8b12f optimiiiizeeee 2021-04-18 16:54:21 -04:00
Cameron Taylor
157769b41a that pussy be yankin 2021-04-18 13:23:09 -04:00
Cameron Taylor
08971e185d wtf cutscene shit 2021-04-18 06:53:23 -04:00
Cameron Taylor
5bc6bebb67 Merge branch 'nitpix' of https://github.com/ninjamuffin99/funkin-secret 2021-04-18 05:26:52 -04:00
Cameron Taylor
6f840a9b40 MOVING ANIMATIONS LOL 2021-04-18 05:25:44 -04:00
Cameron Taylor
e1a6325e02 cutscene shit in progress 2021-04-18 04:09:56 -04:00
Cameron Taylor
b501d620b8 tank rolling lol XD 2021-04-18 03:35:43 -04:00
Cameron Taylor
2f63837430 pico stage shader 2021-04-18 01:43:28 -04:00
Cameron Taylor
8f2b147d58 in-game animation cutscene type beat 2021-04-17 23:19:33 -04:00
MtH
76dbe40e11 sus cliprect frameWidth / Height 2021-04-15 04:24:32 +02:00
MtH
86e1aed2fa week6 cam center and move senpaiEvil 2021-04-15 03:56:42 +02:00
MtH
5cc9f5532b eggnog > winter-horrorland transiton FIX 2021-04-15 02:18:59 +02:00
Cameron Taylor
605c9066c1 Merge branch 'nitpix' of https://github.com/ninjamuffin99/funkin-secret 2021-04-11 19:08:46 -04:00
Cameron Taylor
c61529d40f sprite animation shit idk lol who cares loL! 2021-04-11 19:08:36 -04:00
MtH
b4274343c5 double gf on tutorial fix and inCutscene for week7 2021-04-12 00:53:37 +02:00
MtH
e4f21d9ba7 bf gf dead offsets 
also lets you enter anim debug from game over screen, and with player1 if holding shift
 2021-04-11 18:41:23 +02:00
Cameron Taylor
672e3d6970 ugh and stress animations 2021-04-10 18:23:56 -04:00
Cameron Taylor
0ed4f87bdb weird polish bullshit 2021-04-10 02:53:23 -04:00
Cameron Taylor
3df90b6777 recycling and groups i guess 2021-04-10 01:49:57 -04:00
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
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
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
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
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
Cameron Taylor
29a5802a5b cutscene shit in progress 2021-04-07 20:19:49 -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
08074f56a5 camera bullshit for menus a lil cooler 2021-04-04 10:17:46 -07:00
MtH
001794591f sort notes on countdown, fixes layering issue on thorns 2021-04-03 02:03:53 +02: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
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
0370f77dfe fixed bugs where game would crash if pressing R during cutscene or state transition 2021-03-30 18:43:07 +02:00
MtH
364b74c1c8 Merge branch 'scoreoutline' of https://github.com/ActualMandM/Funkin into nitpix 2021-03-30 16:39:10 +02:00
MtH
51db0d3d24 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-03-30 14:06:56 +02: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
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
c7097eae62 no camera zoom shit 2021-03-26 21:28:04 -04:00
Cameron Taylor
b470cfc83a preference toggling 2021-03-26 20:09:04 -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
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
George FunBook
c5888e44ed Merge branch 'master' into sans_discord 2021-03-23 18:07:02 -05:00
George FunBook
d5d484bfb2 fix remove defaultCamera refs 2021-03-23 17:30:58 -05:00
George FunBook
3476796cc6 Merge branch 'master' into options 2021-03-22 23:05:46 -05:00
George FunBook
8a515b63f5 allow run without discord stuff 2021-03-22 09:09:46 -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
MtH
80cac358c2 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-03-20 12:56:53 +01:00
Cameron Taylor
2b61c81ff5 arrows stuff 2021-03-20 01:03:42 -04: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
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