906 Commits

Author SHA1 Message Date
ntr
629c5f373e Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-03-15 15:24:28 +11:00
ntr
0013c6437d move combos to structs 2019-03-15 15:24:24 +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
2321450139 refunds 2019-03-15 14:57:45 +11:00
ntr
42b35f9d8c player names 2019-03-15 12:51:30 +11:00
Mashy
2486045333 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-03-14 22:41:37 +10:00
ntr
c2fe8f779e use balance to purchase 2019-03-14 23:40:06 +11:00
ntr
2c89db4f01 sort specs so they are applied properly 2019-03-14 22:16:33 +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
ntr
cf3dbaa6e9 global join better 2019-03-14 17:11:43 +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
ntr
43775ea23d shield specs 2019-03-14 16:04:18 +11:00
ntr
52cf570a70 update scores ignores phase 2019-03-06 18:35:22 +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
ntr
b4cf3f4eb4 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-03-06 12:48:50 +11:00
ntr
897ace6ed2 vbox split 2019-03-06 12:47:55 +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
ntr
9e16201f3d vbox wip 2019-03-05 17:59:10 +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
ntr
29c2781622 first round vbox 2019-03-04 14:04:35 +11:00
Mashy
a8ff3f0a23 Highlight lines on cryps on select 2019-03-04 12:52:53 +10:00
ntr
37acbaedfd Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-03-04 13:13:21 +11:00
ntr
8b18e7aa20 more drops 2019-03-04 13:12:22 +11:00
Mashy
2eb8318ae1 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-03-03 17:33:59 +10:00
Mashy
5dddb2a237 Vbox Economy 2019-03-03 17:33:45 +10:00
ntr
9dcb21eefa bot wins 2019-03-03 13:06:32 +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