Cameron Taylor
1e903523fb
cutscene shit in progress
2021-04-07 20:19:49 -04:00
Cameron Taylor
c792739d7c
Merge branch 'nitpix' of https://github.com/ninjamuffin99/funkin-secret
2021-04-04 22:33:37 -04:00
Cameron Taylor
436980361b
camera bullshit for menus a lil cooler
2021-04-04 10:17:46 -07:00
MtH
5851d94b6c
sort notes on countdown, fixes layering issue on thorns
2021-04-03 02:03:53 +02:00
Cameron Taylor
3eff5398f4
dumbass sort maybe lol!
2021-04-01 19:28:20 -07:00
Cameron Taylor
3cdfee90f2
gf speaker placement tanky
2021-04-01 18:43:53 -07:00
Cameron Taylor
3030ca4392
placement shit for tnakstage again
2021-04-01 18:35:10 -07:00
Cameron Taylor
916d6437db
tank assets placements
2021-04-01 16:39:03 -07:00
Cameron Taylor
f1b65fa92d
smoke effects on tankstage
2021-03-31 12:41:45 -07:00
MtH
4a72828234
Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret
2021-03-31 19:11:42 +02:00
MtH
e16588af62
downscroll susnotes positioning
2021-03-31 19:11:05 +02:00
Cameron Taylor
a259716163
Merge branch 'master' of https://github.com/ninjamuffin99/Funkin-secret
2021-03-31 10:09:01 -07:00
Cameron Taylor
3d20c2fd12
bullshit for working mac build? lol
2021-03-31 10:08:55 -07:00
MtH
d1807afa7e
Merge branch 'nitpix' of github.com:ninjamuffin99/Funkin-secret
2021-03-31 14:43:43 +02:00
MtH
393ab7733d
clip rotated sus
2021-03-31 14:43:37 +02:00
Cameron Taylor
4518cbfbbc
pico note sort
2021-03-30 21:25:41 -07:00
MtH
242443810c
susnote clip for downscroll still looks like shit tho
2021-03-31 03:02:12 +02:00
Cameron Taylor
b6e8cc93b8
basically down scroll
2021-03-30 15:10:15 -07:00
MtH
377feed549
Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix
2021-03-31 00:02:59 +02:00
MtH
82fba0eb8b
have notes show up properly on scroll speeds below 1
2021-03-31 00:02:09 +02:00
Cameron Taylor
5b2412cf6f
tankman/picospeaker better syncs
2021-03-30 13:58:05 -07:00
MtH
1bd5cbf472
fixed bugs where game would crash if pressing R during cutscene or state transition
2021-03-30 18:43:07 +02:00
MtH
bbe6b739fe
Merge branch 'scoreoutline' of https://github.com/ActualMandM/Funkin into nitpix
2021-03-30 16:39:10 +02:00
MtH
81ce710db6
Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix
2021-03-30 14:06:56 +02:00
Cameron Taylor
482fd33f23
Merge pull request #1 from ninjamuffin99/sans_discord
...
allow run without discord stuff
2021-03-29 13:43:10 -07:00
Cameron Taylor
526f91fe5f
pico in progress
2021-03-29 10:24:49 -07:00
MtH
f067ebd8e9
resync by BOTH voices and inst
...
also remove unnecessary includes in chartingstate
2021-03-29 17:01:49 +02:00
MtH
6ccf1940cd
pixel countdown
2021-03-28 23:36:14 +02:00
MtH
8ae8aaec51
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
333cd2711b
Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix
2021-03-28 18:10:40 +02:00
Cameron Taylor
2717c6f0c7
no camera zoom shit
2021-03-26 21:28:04 -04:00
Cameron Taylor
113730e85c
preference toggling
2021-03-26 20:09:04 -04:00
Cameron Taylor
4247f82694
cool note thingies
2021-03-26 03:51:39 -04:00
Cameron Taylor
7cb1954718
lerp tweaks and shit more
2021-03-24 23:39:19 -04:00
Cameron Taylor
399da03591
camera movement lerp fix for high framerates
2021-03-24 22:41:41 -04:00
George FunBook
2da29bc5fb
Merge branch 'master' into sans_discord
2021-03-23 18:07:02 -05:00
George FunBook
15e52a4be0
fix remove defaultCamera refs
2021-03-23 17:30:58 -05:00
George FunBook
aa85510496
Merge branch 'master' into options
2021-03-22 23:05:46 -05:00
George FunBook
bdb8042b83
allow run without discord stuff
2021-03-22 09:09:46 -05:00
MtH
bb663f7c19
Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix
2021-03-22 01:55:17 +01:00
Cameron Taylor
9d988a021f
note color bullshit and also disabled 'stuns'??
2021-03-21 16:29:47 -04:00
MtH
930b565bc8
Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix
2021-03-20 12:56:53 +01:00
Cameron Taylor
ba69b6f3be
arrows stuff
2021-03-20 01:03:42 -04:00
MtH
77128f523e
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
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
3a84984a3f
Merge branch 'nitpix'
2021-03-18 16:22:53 -04: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