4c301801c5
skip to end of dialogue if not finished
2021-03-30 18:59:14 +02:00
1bd5cbf472
fixed bugs where game would crash if pressing R during cutscene or state transition
2021-03-30 18:43:07 +02:00
d136168a5a
resolve merge conflict with ActualMandM/pause
2021-03-30 16:47:50 +02:00
bbe6b739fe
Merge branch 'scoreoutline' of https://github.com/ActualMandM/Funkin into nitpix
2021-03-30 16:39:10 +02:00
c00a8dc75a
offset txts for all chars, move all chars to shared
2021-03-30 15:45:57 +02:00
d05fff1a42
Merge branch 'nitpix' of github.com:ninjamuffin99/Funkin-secret into nitpix
2021-03-30 14:07:38 +02:00
81ce710db6
Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix
2021-03-30 14:06:56 +02:00
04ad093ef0
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
0f997c84af
spritemap atlas bullshit?
2021-03-29 18:06:35 -07:00
593e70e4e0
Merge branch 'master' of https://github.com/ninjamuffin99/Funkin-secret
2021-03-29 18:00:37 -07:00
519c187fd9
potential adobe animate texture atlas bullshit WIP
2021-03-29 18:00:30 -07:00
482fd33f23
Merge pull request #1 from ninjamuffin99/sans_discord
...
allow run without discord stuff
2021-03-29 13:43:10 -07:00
526f91fe5f
pico in progress
2021-03-29 10:24:49 -07:00
cfa0128db7
week score lerp fix INSPIRED BY PR #447 BY @jvc
...
https://github.com/ninjamuffin99/Funkin/pull/447
2021-03-29 17:18:25 +02:00
f067ebd8e9
resync by BOTH voices and inst
...
also remove unnecessary includes in chartingstate
2021-03-29 17:01:49 +02:00
6ccf1940cd
pixel countdown
2021-03-28 23:36:14 +02:00
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
333cd2711b
Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix
2021-03-28 18:10:40 +02:00
f1325d31e5
checkbox thingie hehe
2021-03-27 20:01:53 -07:00
5408781804
reverted the ng thingies
2021-03-27 16:11:14 -07:00
9e236c91ac
checkbox fix in progress
2021-03-26 21:33:16 -04:00
2717c6f0c7
no camera zoom shit
2021-03-26 21:28:04 -04:00
7516134f5d
no flashing menu
2021-03-26 21:22:07 -04:00
113730e85c
preference toggling
2021-03-26 20:09:04 -04:00
d6821142ea
cutscene bullshit
2021-03-26 05:09:42 -04:00
4247f82694
cool note thingies
2021-03-26 03:51:39 -04:00
f98cb76c98
Merge branch 'shart' of https://github.com/ninjamuffin99/funkin-secret
2021-03-25 04:58:15 -04:00
7cb1954718
lerp tweaks and shit more
2021-03-24 23:39:19 -04:00
399da03591
camera movement lerp fix for high framerates
2021-03-24 22:41:41 -04:00
6ea92694b7
funny pico week touchups
2021-03-25 00:35:20 +01:00
6f2302cbbc
mod menu thingie
2021-03-24 19:19:08 -04:00
6fed4b5f16
outline bullshit in progress
2021-03-24 18:41:54 -04:00
6c2101fa6f
converting shit to new options menu
2021-03-24 16:44:58 -04:00
1800a5a174
Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into shart
2021-03-24 21:03:45 +01:00
38cf7fa51a
whatev lol!
2021-03-24 15:06:39 -04:00
a7a15cc6b9
lol fixed dumbass shader thinge oops
2021-03-23 21:33:17 -04:00
2da29bc5fb
Merge branch 'master' into sans_discord
2021-03-23 18:07:02 -05:00
0f985267f2
week2 chart touchups
2021-03-23 23:53:16 +01:00
699a77201b
Merge pull request #2 from ninjamuffin99/options
...
Options
2021-03-23 18:48:03 -04:00
03cc7d9099
outline shader in progress
2021-03-23 18:43:08 -04:00
15e52a4be0
fix remove defaultCamera refs
2021-03-23 17:30:58 -05:00
cd46e2ef4d
fix back bug
2021-03-23 17:28:05 -05:00
c7ad5bd4b5
change discord to cpp
2021-03-23 14:17:04 -05:00
f7869d61a4
bopeebo speeds n shit
2021-03-23 17:55:39 +01:00
aa85510496
Merge branch 'master' into options
2021-03-22 23:05:46 -05:00
03f735bd33
fix camera
2021-03-22 22:41:37 -05:00
125f7cc957
fix type
2021-03-22 22:41:27 -05:00
b184ac96f9
fix AtlasText bug
2021-03-22 21:39:50 -05:00
c87079fff5
finalize options menu
2021-03-22 21:39:35 -05:00
0718739801
week1 chart touchups
2021-03-23 02:41:09 +01:00
MtH
Cameron Taylor
George FunBook