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
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
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
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
Cameron Taylor
dc3098c3e1
Merge branch 'nitpix'
2021-03-18 16:22:53 -04: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
Cameron Taylor
eba2639638
tnakmen in progres lol
2021-03-16 01:51:23 -04:00