f1b65fa92d
smoke effects on tankstage
2021-03-31 12:41:45 -07:00
4a72828234
Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret
2021-03-31 19:11:42 +02:00
e16588af62
downscroll susnotes positioning
2021-03-31 19:11:05 +02:00
a259716163
Merge branch 'master' of https://github.com/ninjamuffin99/Funkin-secret
2021-03-31 10:09:01 -07:00
3d20c2fd12
bullshit for working mac build? lol
2021-03-31 10:08:55 -07:00
d1807afa7e
Merge branch 'nitpix' of github.com:ninjamuffin99/Funkin-secret
2021-03-31 14:43:43 +02:00
393ab7733d
clip rotated sus
2021-03-31 14:43:37 +02:00
4518cbfbbc
pico note sort
2021-03-30 21:25:41 -07:00
82d0490f16
lil options cleaning
2021-03-30 21:01:18 -07:00
96e6226c04
FPS counter toggle
2021-03-30 20:51:17 -07:00
242443810c
susnote clip for downscroll still looks like shit tho
2021-03-31 03:02:12 +02:00
b6e8cc93b8
basically down scroll
2021-03-30 15:10:15 -07:00
377feed549
Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix
2021-03-31 00:02:59 +02:00
82fba0eb8b
have notes show up properly on scroll speeds below 1
2021-03-31 00:02:09 +02:00
5b2412cf6f
tankman/picospeaker better syncs
2021-03-30 13:58:05 -07:00
32e2f3ddf2
Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix
2021-03-30 21:04:21 +02:00
554dfbf60b
tighten main menu security to prevent weird crashes during transitions
2021-03-30 20:52:24 +02:00
cb8c5ca7b7
moved animate bullshit into CoolUtil and gave up
2021-03-30 11:15:34 -07:00
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
df1e5bb37f
Merge branch 'nitpix' of github.com:ninjamuffin99/Funkin-secret into testtrack
2021-03-30 14:10:04 +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
2c03f4f507
Merge pull request #668 from VoltrexMaster/patch-2
...
feat(extra): Remove extra imports
2021-03-29 21:23:51 -07:00
38cc859bb4
fix errors on mac
2021-03-29 23:05:21 -05:00
f92b803e24
test chart oopsy
2021-03-30 05:58:59 +02:00
b82fdc257f
Merge branch 'nitpix' of github.com:ninjamuffin99/Funkin-secret into testtrack
2021-03-30 05:45:15 +02:00
e18cb1d5c2
test song and added to freeplay (JUST FOR TESTING)
2021-03-30 05:45:04 +02:00
c01a9f45a1
week6 touchups
2021-03-30 03:38:05 +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
41232f4fa8
Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into shart
2021-03-30 02:18:28 +02:00
23e6f9b972
Merge pull request #640 from VoltrexMaster/patch-1
...
feat(performance): Use switch statement
2021-03-29 13:45:54 -07:00
217521860e
Merge pull request #500 from ActualMandM/she_cheers
...
girlfriend cheering in tutorial
2021-03-29 13:43:41 -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
da91d35ebc
Fix indentation
...
2 -> 7 tabs.
2021-03-29 18:17:41 +04:30
59ba23c46e
feat(extra): Remove extra imports
...
Remove 2 extra imports, `IOErrorEvent` was imported already.
2021-03-29 04:16:32 +04:30
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
51e537b245
week5 touchups
2021-03-28 18:09:06 +02:00
905f6c707b
Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into shart
2021-03-28 17:41:09 +02:00
Cameron Taylor
MtH
George FunBook
Voltrex