781 Commits

Author SHA1 Message Date
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
8d17bf71b1 svgs 2019-02-22 13:59:46 +11: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
Mashy
1c1ff0cc0d Inventory scene now uses vbox 2019-02-18 14:16:23 +10:00
Mashy
99cc144361 added bound 2019-02-17 12:02:32 +10:00
Mashy
71d317c985 addex vbox scene 2019-02-16 20:32:18 +10:00
ntr
08e48d983e socket fns for vbox 2019-02-16 19:46:00 +11:00
ntr
04714dfdfd vbox accept 2019-02-16 19:45:04 +11:00
ntr
d0525a56bd vbox init 2019-02-16 17:45:28 +11:00
Mashy
b9b5132d67 more combos 2019-02-16 11:36:34 +10:00
ntr
a822177fb8 dmg -> damage 2019-02-16 10:58:10 +11:00
ntr
8a78528c80 rename to red and blue 2019-02-15 19:01:07 +11:00
Mashy
08cc37e2b7 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-02-15 16:12:44 +10:00
Mashy
e77a948745 unfucked 1,2,3 keys 2019-02-15 16:12:18 +10:00
ntr
aca6b61126 audit 2019-02-15 16:02:08 +11:00
Mashy
a748e4710b Changed main avatars to vertical + stats 2019-02-15 11:51:28 +10:00
Mashy
139cf58e5b item list cleanup 2019-02-13 13:30:41 +10:00
Mashy
400d972aa5 Changed inventory to grid and added combiner box for combos 2019-02-13 13:11:38 +10:00
Mashy
4e0d6cc053 change scale mode 2019-02-05 10:35:40 +10:00
ntr
9d005a26e5 rollback 2019-02-01 13:01:54 +11:00
ntr
d5565ef3c9 phase version 2019-02-01 11:56:09 +11:00
Mashy
aefcc5bd32 fix for case when player joins game before zones scene loads 2019-01-22 17:15:14 +10:00
Mashy
d022b27503 Hover text in constants 2019-01-22 14:47:37 +10:00
Mashy
f3d7037abb Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-01-22 14:15:33 +10:00
Mashy
68db6e28a2 Merge branch 'scaler' 2019-01-22 14:15:15 +10:00