526 Commits

Author SHA1 Message Date
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
ntr
8f5a43219b remove webgl from combat 2019-03-05 15:42:29 +11:00
Mashy
5fa964c382 fix outline 2019-03-05 11:44:45 +10:00
ntr
7e2e44fc57 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-03-04 14:05:00 +11:00
Mashy
a8ff3f0a23 Highlight lines on cryps on select 2019-03-04 12:52:53 +10:00
ntr
8b18e7aa20 more drops 2019-03-04 13:12:22 +11:00
ntr
813972efb6 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-03-03 12:21:05 +11:00
Mashy
cb30ed8415 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-03-03 11:19:45 +10:00
Mashy
e032d0c44c waste of time line 2019-03-03 11:19:12 +10:00
ntr
228d64d73d various instance fixs 2019-03-03 12:17:40 +11:00
ntr
f4e1c368e0 instance game finished 2019-03-02 20:10:30 +11:00
ntr
c60f38716f hp stuff 2019-03-01 19:37:04 +11:00
Mashy
298c263a60 fix invalid item combiner box error 2019-03-01 16:05:21 +10:00
Mashy
92a249879d Update cryps on player update 2019-03-01 15:52:42 +10:00
Mashy
a59de136ac Instances shown by default on home 2019-03-01 13:56:34 +10:00
Mashy
750a81c29f Get playerlist on home page 2019-03-01 10:54:56 +10:00
Mashy
dafbf145f8 added instances to its own scene 2019-02-28 22:04:25 +10:00
Mashy
8abe18b0f1 Fixed player set 2019-02-28 20:51:45 +10:00
Mashy
8c89bd6841 Add instances from player list 2019-02-28 17:58:23 +10:00
ntr
7589ae84d4 instance game 2019-02-28 17:45:26 +11:00
Mashy
b093374391 unlearn skills, just need rpc call 2019-02-26 14:00:29 +10:00
Mashy
cdfa66fa72 Added multi scene to homepage, placeholder for rankings / news / shop 2019-02-25 16:09:10 +10:00
Mashy
6f2c42d460 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-02-25 13:44:16 +10:00
Mashy
0008b8e398 Return to home page 2019-02-25 13:43:59 +10:00
ntr
afe992d986 account players method 2019-02-25 14:06:41 +11:00
Mashy
c6329de8ab Added home page 2019-02-22 17:45:41 +10:00
Mashy
6d44a5de5e Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-02-22 15:26:19 +10:00
Mashy
161db2dc51 testing instance join 2019-02-22 15:25:36 +10:00