Commit Graph

1465 Commits

Author SHA1 Message Date
ee21040835 merge into master 2021-06-21 01:22:54 -07:00
32d2f58349 Delete week6.png 2021-06-21 01:19:32 -07:00
31fcb2575b Merge branch 'master' of https://github.com/KadeDev/Kade-Engine 2021-06-21 01:17:32 -07:00
b88a777e71 fixed 2021-06-21 01:17:23 -07:00
34b84373ad Merge remote-tracking branch 'upstream/master' into patch-3 2021-06-21 10:15:54 +02:00
a21ee9fbe1 Merge remote-tracking branch 'upstream/master' into patch-2 2021-06-21 10:14:55 +02:00
ddf2567032 Merge pull request #958 from Lucky-56/un-revert
revert Kade's (unintentional) reverts
2021-06-21 01:09:02 -07:00
ed5d48567a input drop fix - poco 2021-06-21 01:08:28 -07:00
ca20b5ce4d git gud 2021-06-21 00:34:44 -07:00
b7d848a28f revert (unintentional) reverts 2021-06-21 09:01:50 +02:00
fcc6ae72a5 fixes the chart editor 2021-06-20 18:03:37 -07:00
a717bd1de9 Merge branch 'master' of https://github.com/KadeDev/Kade-Engine 2021-06-20 18:01:05 -07:00
40601171ab fixes even more crap (replay stuff mostly) 2021-06-20 17:59:39 -07:00
98e96e4348 some fixes 2021-06-20 17:59:28 -07:00
ada6bb28b8 Merge pull request #930 from Sector03/master
result screen loop fix
2021-06-20 02:32:41 -07:00
daa200263c Merge pull request #931 from Lucky-56/patch-1
Do you like not being able to build ?
2021-06-20 02:32:17 -07:00
7c84132258 change Song Info a bit
as wished by https://github.com/KadeDev/Kade-Engine/pull/890#issuecomment-864386914
2021-06-20 09:47:03 +02:00
1d73a920d0 little crucial fix 2021-06-20 09:39:12 +02:00
2dcd5145b8 Merge remote-tracking branch 'upstream/master' into patch-3 2021-06-20 08:54:32 +02:00
fc5f5f6218 result screen loop fix
if result screen was turned off and played under freeplay it would load up the playstate again instead of sending the player directly back to the freeplay menu
2021-06-20 02:08:57 -04:00
5d3327f024 fix webm (3/3) (please work) 2021-06-20 06:58:09 +02:00
7301d49c18 fix webm (2/3) [skip ci] 2021-06-20 06:57:48 +02:00
0747ad9331 fix webm (1/3) [skip ci] 2021-06-20 06:57:25 +02:00
729cc55b9d Merge pull request #918 from trayfellow/trayfellow-week2monsterupdate
update week 2 monster with his updated design
2021-06-19 20:35:10 -07:00
913bab5996 Merge pull request #917 from trayfellow/trayfellow-week6texture
update week 6's storymenu texture
2021-06-19 20:34:54 -07:00
074e08650f Merge pull request #890 from Lucky-56/patch-2
all the little things
2021-06-19 20:34:43 -07:00
acd3836dd2 Merge branch 'master' into patch-2 2021-06-19 20:34:38 -07:00
075e082c13 Merge pull request #908 from ACardboardBox1/ACardboardBox1-donatefix
Fix the donate link
2021-06-19 20:33:21 -07:00
2af79acb57 add webm ext (3/3) (THIS ONE GOOD KADE) 2021-06-20 02:16:11 +02:00
2f66d32def add webm ext (2/3) 2021-06-20 02:10:25 +02:00
29cc4db65c add webm ext (1/3) [skip ci] 2021-06-20 02:09:18 +02:00
9697bf0163 fix this lolololololo [skip ci] 2021-06-20 01:56:18 +02:00
48e6a0597d Merge pull request #923 from KadeDev/master
Master
2021-06-19 16:12:53 -07:00
d621d1dc52 oops 2021-06-19 16:02:34 -07:00
43136c6139 fix this too 2021-06-19 15:59:01 -07:00
1786ec436f other 2021-06-19 15:52:52 -07:00
451bf58b04 fixedw options 2021-06-19 15:51:41 -07:00
2c59c26ef6 version 2021-06-19 15:47:56 -07:00
b02d5f440e version bump and update 2021-06-19 15:47:40 -07:00
b4ba8403e0 fix some bugs 2021-06-19 15:41:14 -07:00
f55c2c14d8 Merge branch 'master' of https://github.com/KadeDev/Kade-Engine 2021-06-19 15:07:20 -07:00
f3cfec3ea4 Rewrote hit window, score screen, fixed replays. 2021-06-19 15:05:22 -07:00
fdde7f2767 give me your fohken credit card information 2021-06-19 18:15:47 +07:00
ce07415ae3 neil cecreg 2021-06-19 18:14:25 +07:00
257d2fdc77 neil cecreg 2021-06-19 18:13:55 +07:00
2cd59f47ab neil circrega 2021-06-19 18:13:23 +07:00
172eb8d214 ugly worm 2021-06-19 18:11:59 +07:00
daa28b075f ugly worm 2021-06-19 18:11:21 +07:00
40b2b08590 update docs 2021-06-19 11:52:07 +02:00
858c0ce8f7 changed weekData from variable to function 2021-06-19 11:45:07 +02:00