Commit Graph

1730 Commits

Author SHA1 Message Date
aab589ff9f resolve conflicts 2021-06-26 12:49:12 +02:00
280828a06c Merge remote-tracking branch 'upstream/master' into patch-3 2021-06-26 12:45:39 +02:00
84d7b68af7 Merge pull request #1039 from KadeDev/stable
STOP MERGING INTO STABLE!!!!!!
2021-06-26 11:11:26 +02:00
57bf3f2767 whys that there twice 2021-06-26 10:19:47 +02:00
8222cd453c Merge pull request #1009 from Stylix58/patch-1 2021-06-26 10:10:00 +02:00
213b968887 Merge pull request #1035 from kem0x/stable
pause menu fix
2021-06-26 00:35:00 -07:00
8b2ee6bf27 oh fuck other way around 2021-06-25 21:59:12 -07:00
911bb9ddb5 fixes 2021-06-25 21:56:54 -07:00
b16237ab92 diff calculator 2021-06-25 21:26:29 -07:00
1e8129d08a pause menu fix
fixed pause menu not accepting input from keyboard if controller is connected
2021-06-26 03:37:06 +02:00
10d601ddc9 revert to default input on a non cpp target 2021-06-25 17:28:29 -07:00
0024798715 fix early judgements on jack held's 2021-06-25 17:23:03 -07:00
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
5105c95929 anti-dumbass protection 2021-06-25 15:06:06 -07:00
1af3e2ff22 Merge pull request #1031 from hdboye/patch-3
keybind fixing
2021-06-25 13:50:40 -07:00
5839a70b20 gwurgnkjgqrnkhjeargs
fucking
2021-06-25 13:55:47 -05: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
3a54c04266 fix highest combo counter 2021-06-24 22:14:49 -07:00
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
666c9651dd ayo the pizza here
overexploited meme
2021-06-25 11:01:31 +07:00
d9a2f08216 add new shit
when the annoying line is eliminated! :jermasus:
2021-06-25 10:59:58 +07:00
bac72effbf Delete NOTE_assets.xml 2021-06-25 10:59:09 +07:00
4104affce6 Delete NOTE_assets.png 2021-06-25 10:58:41 +07:00
07ee2acd4c Merge pull request #1014 from KadeDev/master
Version update
2021-06-24 20:25:14 -07:00
1093d7aee3 forgot dis 2021-06-24 20:17:43 -07:00
34ada16c8b bump update 2021-06-24 20:16:45 -07:00
58266f02a4 fix pause and disappearing notes 2021-06-24 20:10:16 -07:00
532093242a fix disappering notes on gp 2021-06-24 20:05:57 -07:00
a4b4aeeaf1 Merge pull request #1013 from KadeDev/master
WHO THE FUCK DIDN'T FIX THEIR MERGE CONFLICTS BEFORE PUSHING
2021-06-24 20:01:13 -07:00
1ea1fc36a4 fix results for gamepad 2021-06-24 19:59:44 -07:00
f611c5e255 Merge branch 'master' of https://github.com/KadeDev/Kade-Engine 2021-06-24 19:58:34 -07:00
06ca64b5d8 gamepad support and keybind cleaning up 2021-06-24 19:54:11 -07:00
328188ca67 Merge pull request #1010 from KadeDev/master
Master
2021-06-24 11:14:17 -07:00
1c2929b559 try to fix linux ci 2021-06-24 19:04:55 +02:00
7f8bb79efc Merge branch 'master' of https://github.com/KadeDev/Kade-Engine 2021-06-24 08:40:33 +02:00
805d2b592d Merge branch 'stable' 2021-06-24 08:39:54 +02:00
746fa0afba merge conflict thingy 2021-06-24 08:39:11 +02:00
5432d66601 blacklist numpad 2021-06-23 23:37:42 -07:00
313180c932 uh 2021-06-23 20:24:37 -07:00
e4040034dc fix app veyor??? 2021-06-23 20:16:11 -07:00
0356c02a6f arrow key support 2021-06-23 19:58:19 -07:00
6dc44091f9 Merge branch 'master' of https://github.com/KadeDev/Kade-Engine 2021-06-23 19:48:13 -07:00
3cb2d46e50 fix html compile issues 2021-06-23 19:48:05 -07:00
7b451201c2 Merge pull request #933 from Lucky-56/patch-2
all the little things 2
2021-06-23 19:37:35 -07:00
a1e2109f57 fix input drops (hopefully) + work on sm support 2021-06-23 01:51:37 -07:00
95c35190c5 fix input drops + work on sm support 2021-06-23 01:51:22 -07:00
41d42e0375 ok 2021-06-22 13:13:57 +02:00
6b4062c3e9 Merge branch 'master' into patch-3 2021-06-22 13:12:54 +02:00
40d31fbc0d Merge branch 'master' of https://github.com/KadeDev/Kade-Engine 2021-06-22 03:34:17 -07:00