Commit Graph

1308 Commits

Author SHA1 Message Date
Lucky56
858c0ce8f7 changed weekData from variable to function 2021-06-19 11:45:07 +02:00
Lucky56
62742a9f04 Merge remote-tracking branch 'upstream/master' into patch-3 2021-06-19 09:54:01 +02:00
Lucky56
3696b71d7a slight adjustments 2021-06-19 09:52:17 +02:00
Puyo
75dc2da7e5 https://github.com/KadeDev/Kade-Engine/pull/898#issuecomment-864140082 2021-06-19 08:34:11 +02:00
Lucky56
1de649d441 fixed crash occurring in freeplay when no weeks are unlocked 2021-06-19 08:16:40 +02:00
Lucky56
c4db591f09 due to freeplay songs unlocking aswell, default value is 'week 6 beat' 2021-06-19 07:44:14 +02:00
Lucky56
daf05521bc songs from weeks that are locked are no longer shown in freeplay 2021-06-19 07:32:37 +02:00
Lucky56
354fa20a74 added reset settings option 2021-06-19 00:41:13 +02:00
Lucky56
e13318ca13 better comprehensibility 2021-06-19 00:40:25 +02:00
Lucky56
ef3e0e135e renamed 'lock weeks' to 'reset story mode progress' + added reset score 2021-06-18 21:44:05 +02:00
Lucky56
6ebdcd4ff7 fix error (getWeeks() is from patch-4) 2021-06-18 21:40:50 +02:00
Lucky56
cccd2a4ddd Merge remote-tracking branch 'upstream/master' into patch-3 2021-06-18 07:49:20 +02:00
Kade M
5ae41959aa Merge pull request #891 from theDetourist/master
Offset info text now updates properly
2021-06-17 16:10:44 -07:00
Kade M
1471a15bbb Merge pull request #898 from Lucky-56/patch-1
the acquired combo will now be saved and seen in freeplay
2021-06-17 16:10:19 -07:00
Lucky56
3b3fedd981 code cleanup 2021-06-18 00:04:32 +02:00
Lucky56
af627cc241 the acquired combo will now be saved and seen in freeplay 2021-06-17 23:19:34 +02:00
Kade M
391a8d8984 Merge pull request #868 from Lucky-56/patch-1
since Kade hates HealthDisplay on ScoreBar, this only fixes NPS not showing if Accuracy is disabled
2021-06-17 12:06:22 -07:00
Lucky56
a940187af5 better TODO name 2021-06-17 18:18:27 +02:00
Lucky56
b6953ec111 brought back the week locking 2021-06-17 18:02:20 +02:00
Detoria
cf06003918 yeh pt.2 2021-06-17 08:17:38 -03:00
Detoria
255afc3ac8 yeh 2021-06-17 07:16:54 -03:00
Lucky56
7953e554eb Merge remote-tracking branch 'upstream/master' into patch-1 2021-06-17 05:38:06 +02:00
Kade M
19134e6694 update building 2021-06-16 13:57:39 -07:00
Kade M
15b3278514 Merge branch 'master' of https://github.com/KadeDev/Kade-Engine 2021-06-16 13:53:33 -07:00
Kade M
4454a25d5b some updates 2021-06-16 13:52:04 -07:00
Lucky56
cc32c8571d still gotta fix this 2021-06-15 20:51:39 +02:00
Kade M
c1bab29234 Merge pull request #647 from NeeEoo/flashing-distraction-lua
Added flashing and distractions as variables in modcharts
2021-06-15 11:22:41 -07:00
Kade M
24cc87f24b Merge pull request #829 from ActualMandM/kade-camzoom
add option for camera zooming
2021-06-15 11:20:18 -07:00
Kade M
67322768a8 Merge pull request #840 from Lucky-56/patch-1
REOPENED: #824 replay fix + modchart fix + stage, gf and noteStyle defaults to their corresponding style if none was found in chart
2021-06-15 11:19:30 -07:00
Lucky56
2acf1719c2 how tf did they get here 2021-06-15 01:22:20 +02:00
Lucky56
5d7e6811b0 if I find ONE more issue with Spaces... 2021-06-15 00:00:14 +02:00
Lucky56
d6dbdbf210 big oopsie 2021-06-13 11:36:16 +02:00
Lucky56
5a24fa6545 Merge remote-tracking branch 'upstream/master' into patch-1 2021-06-13 08:23:44 +02:00
Lucky56
052c8f10fb Merge branch 'KadeDev:stable' into patch-1 2021-06-13 08:06:25 +02:00
Puyo
d103f5f507 Merge pull request #852 from KadeDev/stable
Merge stable into master
2021-06-13 04:25:26 +02:00
Kade M
d667e2ef52 Merge pull request #844 from Lucky-56/new-logo-time
New logo time
2021-06-12 12:41:40 -07:00
Kade M
00e42733ac Merge branch 'stable' into new-logo-time 2021-06-12 12:41:35 -07:00
Kade M
aae148de66 Update README.md 2021-06-12 12:40:38 -07:00
Kade M
3ac6b7983c new logo 2021-06-12 12:40:15 -07:00
Lucky56
e04c426ae0 version 2 (by me) 2021-06-12 19:50:33 +02:00
Lucky56
d42d04f587 version 1 (from FNFPlayer101) 2021-06-12 19:50:33 +02:00
Lucky56
c628766fc0 formatting 2021-06-12 19:45:58 +02:00
Lucky56
c226c62d52 apparently I can't do that 2021-06-12 19:38:53 +02:00
Lucky56
ecbd82668e no replay? then don't tell me the time 2021-06-12 19:05:33 +02:00
Lucky56
a9b7959f1b when no song is found in replay menu it now says no song found instead of tutorial 2021-06-12 10:53:42 +02:00
Puyo
b9fd68c98f Here's some FNF lore: I do not like you 2021-06-12 04:06:47 +02:00
Puyo
1fb1a7377e :) 2021-06-12 00:46:26 +02:00
Puyo
4145dfb8d7 change the msvc thing [skip ci] 2021-06-11 23:34:39 +02:00
Puyo
ab66ba1e9e NONONONONO THATSNOT WHAT I MEANTTODO 2021-06-11 23:24:12 +02:00
Puyo
3f25ff165a ...
FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU FUCK YOU
2021-06-11 23:23:46 +02:00