Cameron Taylor
|
1e903523fb
|
cutscene shit in progress
|
2021-04-07 20:19:49 -04:00 |
|
Cameron Taylor
|
a2ae9bbcd1
|
cutscene character work in progress
|
2021-04-06 18:12:31 -04:00 |
|
Cameron Taylor
|
b518fdad0a
|
lol mute debug thing!
|
2021-04-06 12:27:07 -04:00 |
|
Cameron Taylor
|
c643d4651f
|
drag and drop (commented out, for use later)
|
2021-04-05 16:42:04 -04:00 |
|
Cameron Taylor
|
de9ee7f6a9
|
gf holdup anims in progress
|
2021-04-05 12:59:22 -04:00 |
|
Cameron Taylor
|
c792739d7c
|
Merge branch 'nitpix' of https://github.com/ninjamuffin99/funkin-secret
|
2021-04-04 22:33:37 -04:00 |
|
Cameron Taylor
|
0b2a58ac5f
|
autopause bullshit
|
2021-04-04 20:37:23 -04:00 |
|
Cameron Taylor
|
436980361b
|
camera bullshit for menus a lil cooler
|
2021-04-04 10:17:46 -07:00 |
|
Cameron Taylor
|
ce9fac5fe0
|
Merge branch 'master' of https://github.com/ninjamuffin99/Funkin-secret
|
2021-04-03 21:38:00 -07:00 |
|
Cameron Taylor
|
150f314467
|
bf holding GF dead offset shit in progress
|
2021-04-03 21:37:57 -07:00 |
|
Cameron Taylor
|
b46d75883d
|
Merge pull request #3 from ninjamuffin99/mac_fixes
fix errors on mac
|
2021-04-03 09:43:40 -07:00 |
|
Cameron Taylor
|
0b7787fbd0
|
Merge branch 'shart'
|
2021-04-03 09:41:35 -07:00 |
MtH
|
5851d94b6c
|
sort notes on countdown, fixes layering issue on thorns
|
2021-04-03 02:03:53 +02:00 |
|
Cameron Taylor
|
3eff5398f4
|
dumbass sort maybe lol!
|
2021-04-01 19:28:20 -07:00 |
|
Cameron Taylor
|
3cdfee90f2
|
gf speaker placement tanky
|
2021-04-01 18:43:53 -07:00 |
|
Cameron Taylor
|
3030ca4392
|
placement shit for tnakstage again
|
2021-04-01 18:35:10 -07:00 |
|
Cameron Taylor
|
916d6437db
|
tank assets placements
|
2021-04-01 16:39:03 -07:00 |
|
Cameron Taylor
|
f1b65fa92d
|
smoke effects on tankstage
|
2021-03-31 12:41:45 -07:00 |
|
MtH
|
4a72828234
|
Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret
|
2021-03-31 19:11:42 +02:00 |
|
MtH
|
e16588af62
|
downscroll susnotes positioning
|
2021-03-31 19:11:05 +02:00 |
|
Cameron Taylor
|
a259716163
|
Merge branch 'master' of https://github.com/ninjamuffin99/Funkin-secret
|
2021-03-31 10:09:01 -07:00 |
|
Cameron Taylor
|
3d20c2fd12
|
bullshit for working mac build? lol
|
2021-03-31 10:08:55 -07:00 |
|
MtH
|
d1807afa7e
|
Merge branch 'nitpix' of github.com:ninjamuffin99/Funkin-secret
|
2021-03-31 14:43:43 +02:00 |
|
MtH
|
393ab7733d
|
clip rotated sus
|
2021-03-31 14:43:37 +02:00 |
|
Cameron Taylor
|
4518cbfbbc
|
pico note sort
|
2021-03-30 21:25:41 -07:00 |
|
Cameron Taylor
|
82d0490f16
|
lil options cleaning
|
2021-03-30 21:01:18 -07:00 |
|
Cameron Taylor
|
96e6226c04
|
FPS counter toggle
|
2021-03-30 20:51:17 -07:00 |
|
MtH
|
242443810c
|
susnote clip for downscroll still looks like shit tho
|
2021-03-31 03:02:12 +02:00 |
|
Cameron Taylor
|
b6e8cc93b8
|
basically down scroll
|
2021-03-30 15:10:15 -07:00 |
|
MtH
|
377feed549
|
Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix
|
2021-03-31 00:02:59 +02:00 |
|
MtH
|
82fba0eb8b
|
have notes show up properly on scroll speeds below 1
|
2021-03-31 00:02:09 +02:00 |
|
Cameron Taylor
|
5b2412cf6f
|
tankman/picospeaker better syncs
|
2021-03-30 13:58:05 -07:00 |
|
MtH
|
32e2f3ddf2
|
Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix
|
2021-03-30 21:04:21 +02:00 |
|
MtH
|
554dfbf60b
|
tighten main menu security to prevent weird crashes during transitions
|
2021-03-30 20:52:24 +02:00 |
|
Cameron Taylor
|
cb8c5ca7b7
|
moved animate bullshit into CoolUtil and gave up
|
2021-03-30 11:15:34 -07:00 |
|
MtH
|
4c301801c5
|
skip to end of dialogue if not finished
|
2021-03-30 18:59:14 +02:00 |
|
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
|
d136168a5a
|
resolve merge conflict with ActualMandM/pause
|
2021-03-30 16:47:50 +02:00 |
|
MtH
|
bbe6b739fe
|
Merge branch 'scoreoutline' of https://github.com/ActualMandM/Funkin into nitpix
|
2021-03-30 16:39:10 +02:00 |
|
MtH
|
c00a8dc75a
|
offset txts for all chars, move all chars to shared
|
2021-03-30 15:45:57 +02:00 |
|
MtH
|
d05fff1a42
|
Merge branch 'nitpix' of github.com:ninjamuffin99/Funkin-secret into nitpix
|
2021-03-30 14:07:38 +02:00 |
|
MtH
|
81ce710db6
|
Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix
|
2021-03-30 14:06:56 +02:00 |
|
MtH
|
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 |
George FunBook
|
38cc859bb4
|
fix errors on mac
|
2021-03-29 23:05:21 -05:00 |
|
MtH
|
c01a9f45a1
|
week6 touchups
|
2021-03-30 03:38:05 +02:00 |
|
Cameron Taylor
|
0f997c84af
|
spritemap atlas bullshit?
|
2021-03-29 18:06:35 -07:00 |
|
Cameron Taylor
|
593e70e4e0
|
Merge branch 'master' of https://github.com/ninjamuffin99/Funkin-secret
|
2021-03-29 18:00:37 -07:00 |
|
Cameron Taylor
|
519c187fd9
|
potential adobe animate texture atlas bullshit WIP
|
2021-03-29 18:00:30 -07:00 |
|
MtH
|
41232f4fa8
|
Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into shart
|
2021-03-30 02:18:28 +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 |