Commit Graph

1663 Commits

Author SHA1 Message Date
db63b0a19a Update weeks.md
update 1 small info on adding a new boolean for the weeks to play or smth
2021-07-02 13:43:09 +07:00
M&M
e3ae9f3e0e remove desktop check for appearance and fps counter options 2021-07-01 20:52:53 -07:00
M&M
89c4140df9 Implement code to load character offset file 2021-07-01 19:32:15 -07:00
M&M
460d072c78 unhardcode data folder from Paths.txt 2021-07-01 19:31:14 -07:00
530668b66b Merge branch 'KadeDev:master' into master 2021-07-01 14:25:08 -05:00
2cd24cadc9 fix freeplay locking thing 2021-06-30 21:23:09 -07:00
0bb2c88c7e Merge branch 'master' of https://github.com/KadeDev/Kade-Engine 2021-06-30 21:14:02 -07:00
3e9d05d82f diff calc adjustments + stolen assets from fps plus 2021-06-30 21:13:53 -07:00
89c6b60350 Merge pull request #894 from Lucky-56/patch-3
Locking weeks + settings/score reset option
2021-06-30 18:42:41 -07:00
67ce7abcfa Merge pull request #1097 from KadeDev/revert-1064-idle-stuff
Revert "fix opponent idle anims desyncing/freezing on camera focus"
2021-06-29 15:17:55 -07:00
59eb890bac Revert "fix opponent idle anims desyncing/freezing on camera focus" 2021-06-29 15:17:37 -07:00
9b8a484035 Merge pull request #1064 from ArfieCat/idle-stuff
fix opponent idle anims desyncing/freezing on camera focus
2021-06-29 15:17:32 -07:00
995cf9a3cb Merge pull request #1083 from ActualMandM/kade-nyaa
fix mom camera
2021-06-29 15:17:11 -07:00
M&M
8a8cf2cc78 fix mom camera
also:
- optimize switch case
- remove unnecessary code
2021-06-28 21:54:52 -07:00
0f73f070f7 Merge pull request #1082 from Raltyro/patch-1
stupid wrong icon Health fix
2021-06-28 20:22:24 -07:00
2266a2923e stupid wrong icon Health fix 2021-06-29 09:34:14 +07:00
eaea7e0b85 Merge pull request #1080 from ACardboardBox1/ACardboardBox1-portrait-fix
portrait fix + spelling fix in main.hx [skip ci]
2021-06-28 19:24:30 -07:00
d761779038 Redid my old pr 2021-06-28 18:24:42 -04:00
d29d6b375b Merge branch 'KadeDev:master' into master 2021-06-28 18:19:25 -04:00
4f4d14b45c Merge branch 'KadeDev:master' into master 2021-06-28 08:49:15 -05:00
708215b362 Merge remote-tracking branch 'upstream/master' into patch-3 2021-06-28 00:58:23 +02:00
0fb7367118 I thought we removed hard coded stuff 2021-06-28 00:56:26 +02:00
5332c80401 Merge pull request #1068 from toxichead/patch-1
attempt to fix linux build (appveyor)
2021-06-27 14:16:30 -07:00
c53eacc2aa why here's dublicate lmao 2021-06-27 22:11:44 +03:00
ffa186dc1b LOOKS LIKE I FIXED THIS 2021-06-27 22:02:52 +03:00
9da6c8fa17 Fix spelling issue 2021-06-27 10:24:26 -04:00
3c68c91366 fix idle desync/freeze
i think this might have been deleted unintentionally...?
2021-06-27 03:14:47 -07:00
2aa1056884 Merge pull request #2 from ACardboardBox1/ACardboardBox1-senpai-die
Go away senpai!
2021-06-26 20:29:55 -04:00
aa581a2dd7 Go away senpai
No more black senpai portrait covering spirit (fixes #1022)
2021-06-26 20:21:13 -04:00
eb33e85b65 Merge branch 'master' of https://github.com/KadeDev/Kade-Engine 2021-06-26 12:43:02 -07:00
78f98eec80 removed stack note implemn 2021-06-26 12:42:52 -07:00
92a33348f0 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA 2021-06-26 17:13:58 +02:00
42838750ea WHO THE FUCK. [skip ci] 2021-06-26 17:13:05 +02:00
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