1623 Commits

Author SHA1 Message Date
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
ntr
909af4c9e3 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-02-22 16:00:48 +11:00
ntr
967b316e37 recovery for get_cryp 2019-02-22 16:00:39 +11:00
Mashy
5135882423 Bug fixes 2019-02-22 14:07:32 +10:00
Mashy
8c3a2f1438 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-02-22 13:37:29 +10:00
Mashy
29772ad3ae UI updates 2019-02-22 13:35:47 +10:00
ntr
96f31346c5 fix bug and make scaling look tight 2019-02-22 14:34:55 +11:00
Mashy
caf827e42b Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-02-22 13:00:38 +10:00
Mashy
b542efda25 Client changes 2019-02-22 13:00:17 +10:00
ntr
ab11c2109e remove some unused fns 2019-02-22 12:40:09 +11:00
Mashy
36af689c7b Merge branch 'combos' 2019-02-21 14:58:56 +10:00
Mashy
0edad81ec6 More SPECS info 2019-02-21 14:57:03 +10:00
ntr
a76543b456 Merge branch 'instances' 2019-02-21 15:03:36 +11:00
ntr
9b68fd0a09 Merge branch 'combos' 2019-02-21 15:03:21 +11:00
ntr
e8fa2aec30 players on join 2019-02-21 15:02:19 +11:00
Mashy
168cdd4104 Colour items 2019-02-21 11:03:50 +10:00
ntr
8a06c8b976 can't make it 2019-02-19 23:14:39 +11:00
Mashy
54b1c8f1c0 vbox combos, keep items in combiner 2019-02-19 14:44:15 +10:00
Mashy
23188f53f0 Merge branch 'combos' of ssh://cryps.gg:40022/~/cryps into combos 2019-02-19 12:43:04 +10:00
Mashy
a4b91065ff Delete, apply and single click combine 2019-02-19 12:42:51 +10:00
ntr
fcb8bf779e fix statbar 2019-02-19 12:10:44 +11:00
Mashy
1baf5aba10 Fixed bug when moving items within combiner 2019-02-18 23:45:59 +10:00
Mashy
1179dce2ab Client side combos Pog 2019-02-18 19:54:35 +10:00