3135 Commits

Author SHA1 Message Date
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
ntr
7b359f7fb4 active fill 2018-11-20 22:48:26 +11:00
ntr
e4c9efc4ec Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2018-11-20 22:35:47 +11:00
ntr
6980e1cf8b active cryps 2018-11-20 22:28:41 +11:00
Mashy
d0292f8f05 Changed click handlers 2018-11-20 16:22:28 +10:00
Mashy
6c04a03145 Merge and refactor 2018-11-20 16:03:24 +10:00
Mashy
d1f2676e0f refactor scenes into classes 2018-11-20 14:49:28 +10:00
ntr
70eca5580d merge 2018-11-20 15:36:41 +11:00
ntr
cd346252cc Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2018-11-20 15:34:17 +11:00
ntr
3e4cb096a5 forget and learn 2018-11-20 14:33:40 +11:00
Mashy
ab0aebc49f Added back my passives, f to show g to hide 2018-11-20 00:36:37 +10:00
ntr
9327b4381c foreach fail 2018-11-20 00:31:59 +11:00
ntr
552639809f Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2018-11-20 00:26:18 +11:00
ntr
d9b25e0fc6 shits fucked 2018-11-20 00:21:52 +11:00
Mashy
a67cd1521c Merge branch 'battleui' 2018-11-19 22:21:07 +10:00
ntr
7c74018dbf no more scene restarts monkaS 2018-11-19 23:15:49 +11:00
Mashy
3c5199d710 grep 2018-11-19 22:09:47 +10:00
ntr
d4bcaa244c clean up text 2018-11-19 23:09:31 +11:00
Mashy
bd3ffdc123 merged and removed components 2018-11-19 22:07:46 +10:00
ntr
6907cf17e0 cryps list click 2018-11-19 20:23:40 +11:00
Mashy
0d439b3ef2 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps into battleui 2018-11-19 17:56:25 +10:00