Commit graph

567 commits

Author SHA1 Message Date
MtH
2d48435b3b downscroll susnotes positioning 2021-03-31 19:11:05 +02: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
6b1cb1c541 Merge branch 'nitpix' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-03-30 14:07:38 +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
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
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
934e45fa2a 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
MtH
03ed9bc2be resync by BOTH voices and inst
also remove unnecessary includes in chartingstate
2021-03-29 17:01:49 +02:00
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
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