422 Commits

Author SHA1 Message Date
ntr
0af3ea9d40 Merge branch 'master' into return-of-react 2019-03-30 17:52:40 +11:00
ntr
cfcbe1c7e1 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-03-29 21:59:37 +11:00
ntr
02fd57446a siphon in 2019-03-29 21:59:29 +11:00
Mashy
7be246ab0b team lengths 2019-03-29 20:41:27 +10:00
Mashy
c90d7afc9d Fix hitbox bug 2019-03-29 20:26:54 +10:00
ntr
4e1b1dd2cb pog 2019-03-28 15:23:03 +11:00
Mashy
efb55f6024 Show colours added by skills 2019-03-27 17:21:42 +10:00
Mashy
e7aee86aae Added skill descriptions, cleaned up some scenes 2019-03-27 15:40:17 +10:00
Mashy
2c8ddcd186 improved decay combat sequence 2019-03-26 17:04:06 +10:00
Mashy
d8c5d24a3d Add check for KO event, skill from events 2019-03-26 13:36:05 +10:00
Mashy
62b673ed1d Sync stat bars after combat turn 2019-03-26 13:24:27 +10:00
Mashy
df76d50a4e Fixed resolutions with new format 2019-03-25 15:08:12 +10:00
Mashy
f406b2251d Added new format dmg numbers don't work 2019-03-25 14:26:48 +10:00
ntr
3a20de13e8 frontend fixes 2019-03-24 22:47:47 +11:00
ntr
c452a4cd92 recharge 2019-03-21 00:01:42 +11:00
ntr
72f6e81d25 fix awful mm bug with bots 2019-03-20 19:03:36 +11:00
ntr
14c779f484 bot game result 2019-03-20 14:36:55 +11:00
ntr
4b848f1e02 scores 2019-03-19 19:57:49 +11:00
Mashy
1f39479085 FIXT RECTANGLES 2019-03-18 17:33:51 +10:00
Mashy
d22ea2a25d Added colours and specs to cryp avatar, click skills and dialog to unequip 2019-03-18 12:50:03 +10:00
Mashy
b83c824795 fixt button and other misc shit 2019-03-15 20:39:18 +10:00
Mashy
56e4c22e05 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-03-15 19:26:42 +10:00
Mashy
1e9f174e7b Added skills to cryp avatar 2019-03-15 19:26:22 +10:00
ntr
0b21a5090d unequip specs 2019-03-15 19:42:38 +11:00
ntr
9df24a8f07 unequip 2019-03-15 19:31:43 +11:00
ntr
037da44852 drop -> reclaim 2019-03-15 15:43:32 +11:00
Mashy
31060f681e Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-03-15 14:03:49 +10:00
Mashy
ddc48d1740 Reworking instance UI page 2019-03-15 14:02:14 +10:00
ntr
c2fe8f779e use balance to purchase 2019-03-14 23:40:06 +11:00
Mashy
50104e8421 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-03-14 18:31:09 +10:00
ntr
e6986d57cd shield specs 2019-03-14 19:29:31 +11:00
ntr
788c68c015 stam -> hp 2019-03-14 18:57:44 +11:00
ntr
9d02499c5a simplify spec and skill var checks 2019-03-14 18:03:21 +11:00
Mashy
258f6c866d Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-03-14 15:50:09 +10:00
Mashy
9a5f92cf7f join games in progress 2019-03-14 15:49:51 +10:00
ntr
61a2a7500b fix stamina and hp bug 2019-03-14 16:36:58 +11:00
ntr
2eae21f12f fix ready up clone 2019-03-14 16:22:49 +11:00
Mashy
c036750a4b Add specs 2019-03-06 17:19:31 +10:00
ntr
5ea6b911ad vbox specs 2019-03-06 18:08:39 +11:00
Mashy
9ba8c478cc fix deallocate bug 2019-03-06 15:28:49 +10:00
Mashy
b022845ff7 inv deallocate on click 2019-03-06 15:26:09 +10:00
Mashy
a455b2b1f3 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-03-06 11:59:58 +10:00
Mashy
c8b19d2875 Fixed varibox for new structure 2019-03-06 11:58:28 +10:00
ntr
1eb2f6084c socket update for vbox 2019-03-06 12:52:17 +11:00
Mashy
4afe114bdd Fixed item drag, added score 2019-03-05 20:35:07 +10:00
ntr
fd1c693f01 Revert "change to bitmap text"
This reverts commit 99d0231a9cc796f6e46abbf005843ab4e3c5033f.
2019-03-05 17:59:57 +11:00
Mashy
26250d5b74 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-03-05 14:57:42 +10:00
Mashy
99d0231a9c change to bitmap text 2019-03-05 14:52:59 +10:00
ntr
b04686495b leave properly 2019-03-05 15:45:26 +11:00
ntr
6dcab420fd Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-03-05 15:45:20 +11:00