505 Commits

Author SHA1 Message Date
ntr
34a5832bf4 remove bootstrap ref 2018-11-27 17:03:21 +11:00
ntr
0bb10a65ed reconnect clear prompt 2018-11-27 17:02:42 +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
ntr
c44d2d7d14 toasts 2018-11-27 14:41:26 +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
ntr
fe6585e925 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2018-11-27 13:51:14 +11:00
Mashy
7c7bb030ad refactoring stuff 2018-11-27 12:43:21 +10:00
ntr
f11ac72058 Merge branch 'resolutions' 2018-11-27 12:13:07 +11:00
ntr
b2507d706c logging back 2018-11-27 12:12:56 +11:00
ntr
4f0d349cd6 we're back, no logs 2018-11-27 11:55:39 +11:00
ntr
2a002d08d4 goddamn borrow checker 2018-11-26 23:07:07 +11: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
Mashy
f82a4167e1 skill refactor, random skills during combat 2018-11-24 16:09:53 +10:00
Mashy
81ff0e3663 COMBAT ANIMATIONZZZZ 2018-11-23 18:35:45 +10:00
Mashy
47547ed657 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2018-11-23 15:07:48 +10:00
Mashy
1785877afe Refactor combat page 2018-11-23 15:07:22 +10:00
ntr
fa603009a1 max skills 2018-11-23 13:40:44 +11:00
ntr
e566bbc7e9 handle auth early 2018-11-23 13:33:16 +11:00
ntr
c4be86b59f l2postgres 2018-11-22 18:47:31 +11:00
ntr
e62ba13b54 set team size correctly" 2018-11-22 18:41:03 +11:00
ntr
3b33ac517c rejoin games 2018-11-22 18:39:08 +11:00
Mashy
557925801b Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2018-11-22 16:13:29 +10:00
Mashy
9273f53432 Combat turns working 2018-11-22 16:12:42 +10:00
ntr
2261d9d6e0 remove unused pointerdown 2018-11-22 14:13:32 +11:00
ntr
784905cf24 use correct stats 2018-11-22 14:00:01 +11:00
ntr
601e617bfc cryp page updates 2018-11-22 13:48:35 +11:00
ntr
9651f57a78 removed redux 2018-11-22 12:34:39 +11:00
ntr
24d7fa99c6 Merge branch 'master' into game-list 2018-11-22 12:12:00 +11:00
ntr
992b6ecd7d sql stuff 2018-11-22 12:11:16 +11:00
Mashy
b8522e7085 Screen based positions and margins for battle 2018-11-22 11:07:24 +10:00
ntr
421987c53b Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2018-11-21 19:42:50 +11:00
ntr
6001e7dd2d game list 2018-11-21 19:34:10 +11:00
Mashy
0ca5ba170e refactor of cryp render 2018-11-21 18:17:30 +10:00
Mashy
dee1721380 Merged with log 2018-11-21 17:34:01 +10:00
Mashy
f54e2432dd Updated battle UI 2018-11-21 17:23:23 +10:00
ntr
1854ef86ad game log 2018-11-21 17:13:04 +11:00
ntr
41c7c790f2 pve and pvp back 2018-11-21 16:32:39 +11:00
ntr
4d648c8fe7 react linting 2018-11-21 15:07:49 +11:00
ntr
d699a9cfe8 react begone 2018-11-21 15:06:20 +11:00
ntr
ba56f424c4 buttons and doto colours 2018-11-21 14:54:05 +11:00