242 Commits

Author SHA1 Message Date
Mashy
b98067db86 logs skip KO 2018-12-05 18:42:56 +10:00
ntr
16c838db8b wip 2018-12-05 19:41:13 +11:00
Mashy
91ceaff9ed -x 2018-12-05 17:07:56 +10:00
Mashy
e622e03e03 Logs and combat working again 2018-12-05 17:07:26 +10:00
ntr
e1acdc6fa7 fixt 2018-12-05 16:05:16 +11:00
ntr
c226e8b933 qds bullshit 2018-12-05 15:48:53 +11:00
Mashy
797cdf47e2 -x 2018-12-05 14:19:26 +10:00
Mashy
f857b55198 Split combat scenes 2018-12-05 14:18:41 +10:00
Mashy
6892a58341 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2018-12-04 20:29:18 +10:00
Mashy
681b9dab4e remove team check fixed scene swap 2018-12-04 20:26:17 +10:00
ntr
58636922c2 create cryp images when not found 2018-12-04 20:55:22 +11:00
ntr
8df814d1a6 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2018-12-04 20:18:50 +11:00
ntr
63a0309bb8 resolutions stuff 2018-12-04 20:18:37 +11:00
Mashy
89355075a4 button refactor 2018-12-04 19:08:58 +10:00
Mashy
6e5b6c2c80 Added skill scene and some info / forget / learn handlers 2018-12-04 18:15:07 +10:00
Mashy
f1d6c8d17d Merge branch 'playerscene' 2018-12-04 15:20:50 +10:00
Mashy
8610039e58 Added statsheet scene 2018-12-04 15:16:16 +10:00
ntr
b38be6d7bb cleanup and check for enemy team in pvp 2018-12-03 13:33:54 +11:00
ntr
ba1e909d89 https particles 2018-11-30 00:30:53 +11:00
ntr
b3823388ba log res 2018-11-30 00:15:20 +11:00
ntr
d9470fa74d game title 2018-11-29 23:53:56 +11:00
Mashy
4c184106fd testing scene swaps 2018-11-29 17:29:04 +10:00
Mashy
0a9040b427 scene restart stuff, doesn't spam rerender 2018-11-29 01:48:13 +10:00
ntr
5c9af086bd put clicks abck in 2018-11-28 22:29:18 +11:00
ntr
6f44ada3d9 redraw games and join new ones 2018-11-28 22:18:44 +11:00
Mashy
342394ddfa Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2018-11-28 11:47:12 +10:00
Mashy
c74782502f Cryps no longer constantly rerender, only update on phase change 2018-11-28 11:34:04 +10:00
ntr
9f4f9c96be hurrrrrrr 2018-11-28 00:03:40 +11:00
ntr
e6e93b776e line endings =" 2018-11-27 23:57:13 +11:00
ntr
fa4793f5eb rename skills -> animations 2018-11-27 23:40:47 +11:00
ntr
bd7e56e8cc rename 2018-11-27 23:35:23 +11:00
ntr
5d71a014d4 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2018-11-27 23:31:30 +11:00
ntr
cc60c1f003 rework combat animations cycle 2018-11-27 23:26:34 +11:00
Mashy
05f8c8b6ba Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2018-11-27 19:48:10 +10:00
Mashy
63966ee59c misc function changes 2018-11-27 19:47:53 +10:00
ntr
c0eac36e9f added cooldowns back to skill text 2018-11-27 20:43:46 +11:00
ntr
57780416c8 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2018-11-27 16:56:32 +11:00
ntr
995eae0e4d logins back 2018-11-27 16:56:16 +11:00
Mashy
72cd7fc635 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2018-11-27 13:40:08 +10:00
Mashy
898cb1cad6 Cleaned up tweening functions 2018-11-27 13:39:45 +10:00
ntr
a222d87830 ko checks 2018-11-27 14:10:45 +11:00
Mashy
7c7bb030ad refactoring stuff 2018-11-27 12:43:21 +10:00
Mashy
98d8c7e29b Cryps move for combat 2018-11-26 21:26:34 +10:00
Mashy
ab7de7d77d Added keybinds 2018-11-26 18:13:38 +10:00
Mashy
99ff116e2d cryp arrangement 2018-11-26 15:25:59 +10:00
ntr
af1c06289d fix ko cryps requiring a skill 2018-11-25 21:31:12 +11:00
Mashy
c677e90f42 Added dynamic health bar 2018-11-25 18:20:27 +10:00
Mashy
e530dcf5f1 health bars 2018-11-25 12:35:18 +10:00
Mashy
feec35fa3a highlight cryp when taking dmg 2018-11-25 11:41:59 +10:00
Mashy
e537e052ca render from resolved log 2018-11-25 00:54:57 +10:00