849 Commits

Author SHA1 Message Date
Kade M
0bb2c88c7e Merge branch 'master' of https://github.com/KadeDev/Kade-Engine 2021-06-30 21:14:02 -07:00
Kade M
3e9d05d82f diff calc adjustments + stolen assets from fps plus 2021-06-30 21:13:53 -07:00
Kade M
89c6b60350
Merge pull request #894 from Lucky-56/patch-3
Locking weeks + settings/score reset option
2021-06-30 18:42:41 -07:00
M&M
8a8cf2cc78 fix mom camera
also:
- optimize switch case
- remove unnecessary code
2021-06-28 21:54:52 -07:00
Raltyro
2266a2923e
stupid wrong icon Health fix 2021-06-29 09:34:14 +07:00
ACardboardBox
d761779038
Redid my old pr 2021-06-28 18:24:42 -04:00
Lucky56
708215b362
Merge remote-tracking branch 'upstream/master' into patch-3 2021-06-28 00:58:23 +02:00
Lucky56
0fb7367118
I thought we removed hard coded stuff 2021-06-28 00:56:26 +02:00
ACardboardBox
9da6c8fa17
Fix spelling issue 2021-06-27 10:24:26 -04:00
ACardboardBox
aa581a2dd7
Go away senpai
No more black senpai portrait covering spirit (fixes #1022)
2021-06-26 20:21:13 -04:00
Kade M
eb33e85b65 Merge branch 'master' of https://github.com/KadeDev/Kade-Engine 2021-06-26 12:43:02 -07:00
Kade M
78f98eec80 removed stack note implemn 2021-06-26 12:42:52 -07:00
Lucky56
aab589ff9f
resolve conflicts 2021-06-26 12:49:12 +02:00
Lucky56
280828a06c
Merge remote-tracking branch 'upstream/master' into patch-3 2021-06-26 12:45:39 +02:00
Puyo
84d7b68af7
Merge pull request #1039 from KadeDev/stable
STOP MERGING INTO STABLE!!!!!!
2021-06-26 11:11:26 +02:00
Kade M
8b2ee6bf27 oh fuck other way around 2021-06-25 21:59:12 -07:00
Kade M
911bb9ddb5 fixes 2021-06-25 21:56:54 -07:00
Kade M
b16237ab92 diff calculator 2021-06-25 21:26:29 -07:00
kemo
1e8129d08a pause menu fix
fixed pause menu not accepting input from keyboard if controller is connected
2021-06-26 03:37:06 +02:00
Kade M
10d601ddc9 revert to default input on a non cpp target 2021-06-25 17:28:29 -07:00
Kade M
0024798715 fix early judgements on jack held's 2021-06-25 17:23:03 -07:00
Kade M
a18c6aea04
Merge pull request #1016 from trayfellow/trayfellow-week7NotePort
port the updated note assets from the week 7 update
2021-06-25 17:12:10 -07:00
Kade M
5105c95929 anti-dumbass protection 2021-06-25 15:06:06 -07:00
hd
6ad4bdb223
god im stupid 2021-06-25 19:42:27 +02:00
hd
dd80817229
keybind fixing
kadedev stop breaking ur keybind system
2021-06-25 19:39:46 +02:00
Kade M
3a54c04266 fix highest combo counter 2021-06-24 22:14:49 -07:00
trayfellouch
1b15a69209
You're a sneaky little impostor, (Aren't you, aren't you?)
But you're among us,
I can feel it, I can feel it in my bones, 
So why don't you show yourself,
And leave us all alone?
2021-06-25 11:04:24 +07:00
trayfellouch
666c9651dd
ayo the pizza here
overexploited meme
2021-06-25 11:01:31 +07:00
Kade M
34ada16c8b bump update 2021-06-24 20:16:45 -07:00
Kade M
58266f02a4 fix pause and disappearing notes 2021-06-24 20:10:16 -07:00
Kade M
532093242a fix disappering notes on gp 2021-06-24 20:05:57 -07:00
Kade M
1ea1fc36a4 fix results for gamepad 2021-06-24 19:59:44 -07:00
Kade M
f611c5e255 Merge branch 'master' of https://github.com/KadeDev/Kade-Engine 2021-06-24 19:58:34 -07:00
Kade M
06ca64b5d8 gamepad support and keybind cleaning up 2021-06-24 19:54:11 -07:00
daniel11420
7f8bb79efc Merge branch 'master' of https://github.com/KadeDev/Kade-Engine 2021-06-24 08:40:33 +02:00
daniel11420
746fa0afba merge conflict thingy 2021-06-24 08:39:11 +02:00
Kade M
5432d66601 blacklist numpad 2021-06-23 23:37:42 -07:00
Kade M
0356c02a6f arrow key support 2021-06-23 19:58:19 -07:00
Kade M
6dc44091f9 Merge branch 'master' of https://github.com/KadeDev/Kade-Engine 2021-06-23 19:48:13 -07:00
Kade M
3cb2d46e50 fix html compile issues 2021-06-23 19:48:05 -07:00
Kade M
7b451201c2
Merge pull request #933 from Lucky-56/patch-2
all the little things 2
2021-06-23 19:37:35 -07:00
Kade M
a1e2109f57 fix input drops (hopefully) + work on sm support 2021-06-23 01:51:37 -07:00
Kade M
95c35190c5 fix input drops + work on sm support 2021-06-23 01:51:22 -07:00
Lucky56
41d42e0375
ok 2021-06-22 13:13:57 +02:00
Lucky56
6b4062c3e9
Merge branch 'master' into patch-3 2021-06-22 13:12:54 +02:00
Kade M
b6f03dd225 optimization setting 2021-06-22 03:34:09 -07:00
Kade M
7932341de1 optimized the FUCK out of input 2021-06-21 16:50:14 -07:00
Kade M
4fca4f3c6d fix 2021-06-21 15:37:45 -07:00
M&M
0cb6614f9f move week names to file 2021-06-21 11:10:29 -07:00
Kade M
71573be905 fixed dropped inputs once and for all 2021-06-21 03:01:31 -07:00