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
MtH
69e51cb635
mitigate countdown dancing issues (might still fuck up on higher bpm)
2021-03-17 18:33:26 +01:00
Cameron Taylor
6f28bbe0a9
offsets and adjustemnts
2021-03-17 05:29:04 -04:00
Cameron Taylor
78dafab62f
bf holding gf
2021-03-17 05:20:25 -04:00
Cameron Taylor
db3a4cc483
tnakmen in progres lol
2021-03-16 01:51:23 -04:00
MtH
98082b44cb
Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix
2021-03-14 20:49:28 +01:00
MtH
305df1f6ad
remove check if philly train sound playing
2021-03-14 20:48:02 +01:00
MtH
ca2b62d8ea
fix oppenent freezing when !mustHitSection and no notes, dance only on downbeat
2021-03-14 20:46:44 +01:00
George FunBook
878a118045
Merge branch 'master' into options
2021-03-13 22:41:29 -06:00
George FunBook
24bdea6a20
fix camera
2021-03-13 21:41:12 -06:00
George FunBook
430b6cbb7c
Merge branch 'master' into ng_login
2021-03-13 20:24:57 -06:00
George FunBook
b29a32e0c9
add options menu
2021-03-13 20:11:56 -06:00
Cameron Taylor
09792b745e
offset bullshit and pico
2021-03-13 20:53:57 -05:00
Cameron Taylor
8e95e79c3b
tankmen foreground in progress
2021-03-08 18:38:58 -05:00
Cameron Taylor
d5e6985024
tank guy and quality of life shit
2021-03-07 15:34:21 -05:00
Cameron Taylor
847ec80f07
assets, and switch statement so i dont get roasted
2021-03-07 01:59:22 -05:00
Cameron Taylor
4d27422c40
charts an shit and death counter
2021-03-04 14:30:35 -05:00
M&M
bdce46d067
Merge branch 'master' into scoreoutline
2021-02-28 19:45:56 -08:00
WorstAquaPlayer
9bb673be5c
Added missing #if to RPC call
2021-02-28 18:50:06 -03:00
WorstAquaPlayer
df7c18f64a
Changed RPC !html and added Debug Status
2021-02-27 21:06:30 -03:00
WorstAquaPlayer
f416f6c1f4
Alt+Tab and Game Over updates RPC
2021-02-27 20:49:53 -03:00
WorstAquaPlayer
d7b91bb4cc
Pausing and unpausing updates RPC
2021-02-27 20:23:50 -03:00