Cameron Taylor
33ed47bbf5
made fft stuff less copypastiues
2021-10-07 21:06:45 -04:00
Cameron Taylor
09bb68f7ad
a bot FFT stuf fin progress MESSY LOL
2021-10-07 21:01:46 -04:00
Cameron Taylor
478818a4c1
almost sorta properly exponent bullshit for frequencies
2021-10-06 19:27:45 -04:00
Cameron Taylor
3a3d68424d
sorta seperated out some vis / audio data stuff
2021-10-06 18:46:14 -04:00
Cameron Taylor
02973078df
wacky zany shit idk lol!
2021-09-28 18:12:32 -04:00
Cameron Taylor
e8a3b901c2
FFT IN PROGRESS LOL
2021-09-27 22:30:38 -04:00
Cameron Taylor
c5bca599ad
song reset redo to make shit reload faster
2021-09-24 11:51:15 -04:00
Cameron Taylor
707c7b6f0a
lil healthbar polsih hehe
2021-09-24 11:21:34 -04:00
Cameron Taylor
f060e6689c
removed unused gameoverstate
2021-09-24 11:09:49 -04:00
Cameron Taylor
65bbee0e36
easy quick reset stuff in progres
2021-09-24 10:56:05 -04:00
Cameron Taylor
dc74a434c0
lil HTML5 multivoice fixins
2021-09-22 21:09:28 -04:00
Cameron Taylor
43f43f6f6f
evil mf shit
2021-09-22 16:04:34 -04:00
Cameron Taylor
91f1c816b9
TWEAKIN, and pico game over music
2021-09-22 15:33:30 -04:00
Cameron Taylor
52f9155ef9
2Hot in progress
2021-09-22 15:09:32 -04:00
Cameron Taylor
db561adbc7
lit up charted, and lil cleanups
2021-09-21 15:39:30 -04:00
Cameron Taylor
4fb8342103
head muting lol!
2021-09-20 22:08:24 -04:00
Cameron Taylor
dc050f2040
chart editor imporvements and whatnot
2021-09-20 13:21:25 -04:00
Cameron Taylor
ac2d0d2a38
more voice group stuff in progress
2021-09-20 11:50:52 -04:00
Cameron Taylor
466181bbbd
sound grouping in progress
2021-09-20 11:32:35 -04:00
Cameron Taylor
b8cc6d5df6
less noisy spectogram
2021-09-17 14:56:57 -04:00
Cameron Taylor
38e8b80ed9
charting section visulizer stuff
2021-09-17 14:12:36 -04:00
Cameron Taylor
2eedd1a20f
more cool spectogram shit
2021-09-16 15:28:29 -04:00
Cameron Taylor
4212e59937
slightly diff spectogram / optimize
2021-09-16 14:50:02 -04:00
Cameron Taylor
a2eeaf5c3c
more bro charting in progres
2021-09-16 14:21:11 -04:00
Cameron Taylor
d00f2268f9
spectogram visulizer in progress
2021-09-16 12:04:46 -04:00
Cameron Taylor
39404d35c7
more charting editor noises
2021-09-16 00:56:49 -04:00
Cameron Taylor
cfc3febccf
charting UI sounds in progress
2021-09-16 00:34:51 -04:00
Cameron Taylor
39dac70c01
chart push / bro song update
2021-09-15 15:33:05 -04:00
Cameron Taylor
d2f638302e
nene before u get a whoopin
2021-09-14 17:12:11 -04:00
Cameron Taylor
60e0076642
moved shader camera stuff to CoolUtil, for use later?
2021-09-14 16:40:20 -04:00
Cameron Taylor
f3bf578d4e
screen wipe shader stuff testing
2021-09-11 14:08:34 -04:00
Cameron Taylor
d13aa24fc8
even more cleanup
2021-09-11 11:55:31 -04:00
Cameron Taylor
b1a4bc29de
FlxSymbol cleanup, and other shit in PROGRESS
2021-09-11 11:54:38 -04:00
Cameron Taylor
7ed4405ec3
Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret
2021-09-11 09:38:28 -04:00
Cameron Taylor
a6a4ed2c44
new wacky matrix stuff lil messy teehee
2021-09-11 09:37:04 -04:00
George FunBook
696835c90b
polymod compiler checks instead of cpp
2021-09-11 00:33:50 -05:00
George FunBook
20c32acda1
remove import
2021-09-11 00:32:44 -05:00
Cameron Taylor
2bd4a91e7e
odds and ends
2021-09-10 10:07:55 -04:00
Cameron Taylor
3c03e06a39
shader tweeak
2021-09-08 20:09:30 -04:00
Cameron Taylor
713a3dd623
SHADER SHIT FOR EVIL SCHOOL LOL!
2021-09-08 20:01:55 -04:00
Cameron Taylor
144a526f1c
lol stream stuff lol
2021-09-08 18:10:06 -04:00
Cameron Taylor
8e8b121663
Merge pull request #6 from ninjamuffin99/nitpix
...
aight yolo merge
2021-09-08 17:21:55 -04:00
MtH
908372d296
lil oopsies and random cleanup of old shit
2021-09-08 22:28:30 +02:00
MtH
187706c71c
note hit, scoring windows & stricter sustain note holding
...
this is some big impact shit so feel it out first
2021-09-08 19:28:11 +02:00
Cameron Taylor
c1f000644e
pico player offset stuff
2021-09-08 12:40:51 -04:00
Cameron Taylor
40233679c7
DARNELL MOSTLY CHARTED
2021-09-08 11:53:20 -04:00
MtH
63341f0bc9
fix imports for stagebuild in init/title, also GPG test like cam?
2021-09-08 17:16:16 +02:00
Cameron Taylor
b470fee1b0
GPG test / lil cleanup
2021-09-08 00:06:49 -04:00
MtH
ba4793cef4
allow shared lib to be used without needing to have a level selected
2021-09-07 23:10:43 +02:00
MtH
d0800fcd39
titlestate spring cleaning, move shit into new initstate
...
this is a huge ass commit so cam pls dont merge until u thoroughly check it and know what changed and moved and whatever. got rid of a lot of ludum dare era commented out shit as well. feel free to ask for clarification or add shit back if it's better suited here
2021-09-07 23:09:34 +02:00
MtH
1033754ad3
notesplash framerate & use finishCallback instead of checking every frame
2021-09-07 22:14:14 +02:00
Cameron Taylor
624cc4b3fa
matrix group recycle fix
2021-09-06 15:44:11 -04:00
Cameron Taylor
f94f1d1d98
FlxAnimate drawing optimizations
2021-09-06 15:30:19 -04:00
Cameron Taylor
a5ed25fc31
darnell and other stuf in progress lol
2021-09-06 14:50:04 -04:00
Cameron Taylor
1480335bcb
lil code comments for FlxAnimate and ParseAnimate
2021-09-02 19:00:01 -04:00
Cameron Taylor
49a5c30b90
chart editor save improvements
2021-09-02 18:51:08 -04:00
Cameron Taylor
237114c877
darnell in progress
2021-09-02 18:39:40 -04:00
Cameron Taylor
2705ae3e16
darnell looping and sustain note holding anim stuf
2021-09-02 17:32:50 -04:00
Cameron Taylor
ab501cc533
no icon warning
2021-09-02 17:07:32 -04:00
Cameron Taylor
380241bc6a
darnell character
2021-09-02 16:56:46 -04:00
Cameron Taylor
d108f7c39d
seperated / cleaned up?
2021-09-01 23:39:37 -04:00
Cameron Taylor
fdd28336c1
LIP SYNC
2021-09-01 20:37:37 -04:00
Cameron Taylor
84c2185027
slowly fixing it up
2021-09-01 20:04:07 -04:00
Cameron Taylor
720b428bcf
animate atlas overhaul stuff
2021-09-01 15:34:20 -04:00
Cameron Taylor
fad3af327f
no more body thingie
2021-08-29 15:56:46 -04:00
Cameron Taylor
9694defa8d
volume save data finally fixed lol
2021-08-28 18:10:32 -04:00
Cameron Taylor
9a801b43ad
removed unused imports in playstate
2021-08-28 13:22:31 -04:00
Cameron Taylor
de052ddbee
evilschool "ported"
2021-08-28 13:01:17 -04:00
Cameron Taylor
2747de79cb
anim shit for stages
2021-08-28 12:41:15 -04:00
Cameron Taylor
7ef82bd1d3
stage stuff in progress, seeing whats needed
2021-08-27 21:56:23 -04:00
Cameron Taylor
a032109efd
stage loading rework
2021-08-27 18:08:01 -04:00
Cameron Taylor
d1871761d9
blend lol
2021-08-27 13:55:18 -04:00
Cameron Taylor
5baae3ad58
overlay wit sunset background
2021-08-27 13:16:31 -04:00
Cameron Taylor
f6729592bf
multiply shader in progres
2021-08-27 02:42:23 -04:00
Cameron Taylor
0308de6110
haxedef for android
2021-08-25 20:11:31 -04:00
Cameron Taylor
c21961c156
swipe length default stuff
2021-08-25 20:03:58 -04:00
Cameron Taylor
5579d92f21
fix swipe on left side of screen thingie
2021-08-25 13:21:55 -04:00
Cameron Taylor
84a2b980a5
multi touch / swipe (very buggy)
2021-08-25 13:18:45 -04:00
Cameron Taylor
27da6fdba9
swipe cleanup
2021-08-25 12:18:12 -04:00
Cameron Taylor
e20814cefa
swipe prototype stuf pt 2 lol
2021-08-24 15:28:04 -04:00
Cameron Taylor
a50eeee259
swiping prototype stuff
2021-08-24 15:27:53 -04:00
Cameron Taylor
d77a983ff2
FlxActions/Controls.hx stuf for Android keys
2021-08-23 18:52:38 -04:00
Cameron Taylor
f40b3a8fe3
FlxAction/Controls.hx accomodations for Android keys
2021-08-23 18:52:07 -04:00
Cameron Taylor
4d97591e30
android pause and controls tweaks
2021-08-22 16:54:22 -04:00
Cameron Taylor
61ba71d3db
touch controls in progres
2021-08-22 10:37:06 -04:00
Cameron Taylor
1992d5363e
camera zoom fixes for mobile
2021-08-21 20:45:03 -04:00
Cameron Taylor
d25b81e1dc
touch in progres
2021-08-21 19:53:08 -04:00
Cameron Taylor
d4e955ce79
slowly chippin away
2021-08-21 13:19:56 -04:00
Cameron Taylor
0a0a1c4e2f
more timeline shit in progress
2021-08-20 11:01:37 -04:00
Cameron Taylor
b48685519a
timeline viewer in progress
2021-08-19 14:53:18 -04:00
Cameron Taylor
8b172ac99d
moving shader stuff in progress
2021-08-18 23:00:39 -04:00
Cameron Taylor
21e05b72c6
outline shader thing in progress
2021-08-16 23:20:00 -06:00
Cameron Taylor
0e15495796
Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret
2021-08-10 02:40:50 -04:00
Cameron Taylor
3c211b4756
shit in progress that i dont know, lol dont worry bout it
2021-08-10 02:40:47 -04:00
MtH
3c538395fa
Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret
2021-08-09 13:32:43 +02:00
MtH
ec139ce562
moving default RESET button on gamepad to right shoulder instead of Y bc Y is also UP
2021-08-09 13:30:55 +02:00
Cameron Taylor
3fe28602d3
chart shit cooler (hashlink saving workaround)
2021-08-02 14:11:43 -04:00
Cameron Taylor
122545405b
chart editor slight fixins in progress
2021-08-02 13:54:19 -04:00
MtH
00ec466c76
sustain note scaling FIXED (imo)
...
clipping is still wack. also i made it round instead of floor for the number of sus notes to place because that also just makes sense imo
thanks to @cuckydev again for good ideas
2021-08-02 03:40:40 +02:00
MtH
c9f31226e6
fix HealthIcon issues (expand for details)
...
explicitly enable antialiasing (for switching to & from bf-old)
consistently apply scaling (for ChartingState)
2021-07-16 04:30:19 +02:00
Cameron Taylor
471ffd7989
min timing shit in progres
2021-07-15 18:45:25 -04:00
Cameron Taylor
f314fe3a4b
wombo combo
2021-07-15 18:22:15 -04:00
Cameron Taylor
98a77811be
new combo stuf
2021-07-14 20:32:09 -04:00
Cameron Taylor
9cb1c6b0ea
combo stuf in progress, lil cleanups
2021-07-14 19:00:22 -04:00
Cameron Taylor
85bff686a4
WACKY HTML FILE LOADING TESTS??
2021-06-24 03:15:14 -04:00
Cameron Taylor
fcc7a91597
flxg import.hx thing lol
2021-06-23 04:15:44 -04:00
Cameron Taylor
39d93616d2
comment support for CoolUtil.cooltextFile()
2021-06-22 21:15:40 -04:00
Cameron Taylor
6add378535
pure pixel icon support done
2021-06-22 21:11:06 -04:00
Cameron Taylor
f4c3d826f2
lil antialiasing bullshit
2021-06-22 20:32:37 -04:00
Cameron Taylor
11b35adecd
pixel icon code in progress
2021-06-22 20:21:54 -04:00
Cameron Taylor
94d805136c
pixel icon shit in progress
2021-06-22 20:18:22 -04:00
Cameron Taylor
e2fbf5a300
Revert "in-engine shit for new chart format"
...
This reverts commit 4b5173f9b7
.
2021-06-22 16:06:40 -04:00
Cameron Taylor
4b5173f9b7
in-engine shit for new chart format
2021-06-22 15:54:53 -04:00
Cameron Taylor
e49a3c9b03
songFormmatting shit in progress
2021-06-22 15:41:15 -04:00
Cameron Taylor
819d6d570d
fix layering jitter
2021-06-18 14:18:56 -04:00
Cameron Taylor
1927be79f8
animation fixing for FlxSymbol in progress
2021-06-17 01:42:31 -04:00
Cameron Taylor
4137687f26
proper layering
2021-06-15 21:15:06 -04:00
Cameron Taylor
e120578642
ANIMATION SHIT MORE IN PROGRESS LOL
2021-06-15 17:43:46 -04:00
Cameron Taylor
6b595165be
lil files cleanup
2021-06-14 19:36:56 -04:00
Cameron Taylor
7ebc7e4ffb
quick title screen optimize
2021-06-08 23:05:38 -04:00
Cameron Taylor
2db47b1ba9
memory optimizations
2021-06-07 21:14:50 -04:00
Cameron Taylor
2323000381
nice lil control shti
2021-06-05 00:58:10 -04:00
Cameron Taylor
7e213cb5cb
different offset view shit
2021-06-05 00:46:03 -04:00
Cameron Taylor
44ba266b88
offset view thingie
2021-06-05 00:24:55 -04:00
Cameron Taylor
8aa50b9d47
remvoed animationdebug shit
2021-06-05 00:01:15 -04:00
Cameron Taylor
820ee969d0
AnimationDebug removed, replaced by DebugBoundingState
2021-06-05 00:00:30 -04:00
Cameron Taylor
4211bc7344
mouse movement for offset shit
2021-06-04 17:39:28 -04:00
Cameron Taylor
699a89198e
onion skinning when pressing F
2021-06-04 16:45:08 -04:00
Cameron Taylor
1301cf3ab6
WASD controls for animation
2021-06-04 12:53:53 -04:00
Cameron Taylor
2a2fd39d1c
new offset shit in progress
2021-06-04 03:06:15 -04:00
Cameron Taylor
78e205d60f
offset moving shit
2021-06-04 02:57:43 -04:00
Cameron Taylor
accbae3c80
anim swapping easier
2021-06-04 02:43:05 -04:00
Cameron Taylor
52b0f17ac7
animation playing dropdown menu
2021-06-04 02:31:27 -04:00
Cameron Taylor
ae37e98cdf
anim debug bullshit
2021-06-04 02:01:34 -04:00
Cameron Taylor
1fa00fab9b
lil keyboard control shit
2021-06-02 21:12:23 -04:00
Cameron Taylor
58cede8706
undo of movements
2021-06-02 21:04:43 -04:00
Cameron Taylor
1f91c3bdef
undo/redo selections
2021-06-02 20:41:06 -04:00
Cameron Taylor
65d187f511
cursor shit and tool shit i duno lol!
2021-06-01 02:39:30 -04:00
Cameron Taylor
6c47686ee8
the friday night funkin creepypasta
2021-05-27 22:45:23 -04:00
Cameron Taylor
bab7c0130d
drag n drop layer type beat
2021-05-27 19:56:56 -04:00
Cameron Taylor
3f53371f30
dragging shit
2021-05-27 19:15:03 -04:00
Cameron Taylor
be4b35938b
debug anim shit in progress
2021-05-26 19:22:15 -04:00
Cameron Taylor
a2360dde70
stage build drag and drop, and removed FAXE bullshiiiit
2021-05-23 23:20:57 -04:00
Cameron Taylor
20f627b98e
Merge branches 'master' and 'master' of https://github.com/ninjamuffin99/funkin-secret
2021-05-22 12:54:33 -04:00
Cameron Taylor
30a6db615b
middle click drag
2021-05-16 19:17:58 -04:00
MtH
123a7ae59b
boopin boppers.. head lerp
2021-05-15 23:39:13 +02:00
MtH
d49858217e
Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix
2021-05-15 23:28:17 +02:00
Cameron Taylor
bd6936734a
polymooooood shoutouts laaarsssss
2021-05-15 12:00:21 -04:00
Cameron Taylor
dd41cc19e1
polymod IN PROGRESS
2021-05-15 10:30:09 -04:00
Cameron Taylor
47102b2431
cache shit idk lol
2021-05-14 18:21:34 -04:00
MtH
63cdbc84ee
easteregg crash fix
2021-05-15 00:02:29 +02:00
Cameron Taylor
72e6a47716
NG logo easter egg shit
2021-05-14 17:53:34 -04:00
Cameron Taylor
9df52f2982
Merge branch 'master' of https://github.com/ninjamuffin99/funkin
2021-05-14 17:33:00 -04:00
Cameron Taylor
592204bfa7
Merge branch 'swf'
2021-05-14 17:21:50 -04:00
Cameron Taylor
6f0b0fc6bb
cheat code bullshit oops im on swf branch LOL!
2021-05-14 17:20:01 -04:00
PurpleButNotALight
3d78fa2e7e
Delete BeatBattle.hx
...
this file was annoying me
2021-05-08 17:15:29 +02:00
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
2bce5151ba
test in freeplay if debug
2021-05-06 12:54:57 +02:00
MtH
a1b927175a
just pushin b4 i switch branch
2021-04-23 19:15:40 +02:00
MtH
356a9ad337
dope sprite bounds
2021-04-23 13:30:39 +02:00
MtH
41e66b5d69
Merge branch 'nitpix' of github.com:ninjamuffin99/Funkin-secret
2021-04-22 22:02:02 +02:00
MtH
c5d33192a4
fix crash when going back to title
2021-04-22 21:36:56 +02:00
MtH
fea40412ec
swf shit
2021-04-22 17:19:55 +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
MtH
e6f115dbfe
cam lerp on gameover
2021-04-19 19:11:30 +02:00
MtH
5dddfd7160
bf old icon switch switches back to proper player1
2021-04-19 18:19:40 +02:00
MtH
e005ac382c
don't play game over music if already ending
2021-04-19 10:43:21 +02:00
MtH
ece27cd23a
load songs from reload json button
2021-04-19 10:35:39 +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
75fa0dcada
number thing
2021-04-18 04:29:01 -04:00
Cameron Taylor
7c120efc66
loading screen interactivity
2021-04-18 04:28:50 -04:00
Cameron Taylor
e1a6325e02
cutscene shit in progress
2021-04-18 04:09:56 -04:00
Cameron Taylor
ac8a8aef42
seen video save data shit
2021-04-18 03:47:48 -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
Cameron Taylor
8db0a2cced
SKEW SHIT I THINK
2021-04-15 23:13:52 -04:00
Cameron Taylor
3b4129921c
guns and animation shit in progress
2021-04-15 11:57:59 -04:00
MtH
f7bb96c49c
menu back sounds on all menus
2021-04-15 16:19:02 +02:00
MtH
366b6242c0
Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix
2021-04-15 15:29:08 +02: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
Cameron Taylor
75c1cbdbd3
animation playback wip
2021-04-14 21:52:43 -04:00
MtH
5cc9f5532b
eggnog > winter-horrorland transiton FIX
2021-04-15 02:18:59 +02:00
Cameron Taylor
8524f244c7
animation rotations
2021-04-14 11:31:52 -04:00
MtH
b2cff72608
Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix
2021-04-14 04:06:08 +02:00
MtH
84be474f15
framerate adjusted lerps for all menu shit that isnt cameras
2021-04-14 04:02:21 +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
8b1fa3fb31
colors wip
2021-04-10 11:21:04 -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
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