594 Commits

Author SHA1 Message Date
ntr
8a9fa4b6fb drop fix 2019-02-19 13:38:21 +11:00
ntr
fcb8bf779e fix statbar 2019-02-19 12:10:44 +11:00
ntr
53a54c2123 drop and apply 2019-02-19 11:59:13 +11:00
ntr
1beb53ec51 Merge branch 'combos' of ssh://cryps.gg:40022/~/cryps into combos 2019-02-19 11:45:42 +11:00
ntr
26950e886a apply var 2019-02-19 11:34:32 +11:00
Mashy
1baf5aba10 Fixed bug when moving items within combiner 2019-02-18 23:45:59 +10:00
Mashy
3f147b9fee Merge branch 'combos' of ssh://cryps.gg:40022/~/cryps into combos 2019-02-18 19:54:49 +10:00
Mashy
1179dce2ab Client side combos Pog 2019-02-18 19:54:35 +10:00
ntr
0db40b6fdc combo combos 2019-02-18 17:53:20 +11:00
Mashy
a3759f7568 added combos file 2019-02-18 14:19:36 +10:00
Mashy
d54180fc15 Merge branch 'combos' of ssh://cryps.gg:40022/~/cryps into combos 2019-02-18 14:16:38 +10:00
Mashy
1c1ff0cc0d Inventory scene now uses vbox 2019-02-18 14:16:23 +10:00
ntr
6f035d9839 Merge branch 'combos' of ssh://cryps.gg:40022/~/cryps into combos 2019-02-18 14:09:31 +11:00
ntr
b6408d5abe combos 2019-02-18 14:08:49 +11:00
Mashy
99cc144361 added bound 2019-02-17 12:02:32 +10:00
ntr
2c2e1dddbe vbox write 2019-02-17 00:21:47 +11:00
ntr
cf038f9626 Merge branch 'combos' of ssh://cryps.gg:40022/~/cryps into combos 2019-02-17 00:13:01 +11:00
ntr
4a28ecd3fc usize 2019-02-17 00:12:56 +11: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
Mashy
536414a227 666 2019-02-16 18:34:51 +10:00
ntr
01468c7081 remove item from server 2019-02-16 18:32:29 +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
8f12075d52 recalc stats on spec remove 2019-02-16 11:07:47 +11: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
ntr
3ae58318bf Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-02-15 15:33:34 +11:00
ntr
0851c03bd9 notes 2019-02-15 15:33:18 +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
Mashy
cda20d40db Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-02-01 13:35:15 +10:00
Mashy
24b7c538c3 combos.mod 2019-02-01 13:33:59 +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
ntr
95f37ab4b0 font load 2019-01-22 12:58:17 +11:00
ntr
29299a3100 random floors 2019-01-22 12:46:55 +11:00
Mashy
432a7eb6f6 Using the 3.16 scale manager 2019-01-22 11:44:49 +10:00
ntr
0da395d3d6 fix server 2019-01-19 20:28:11 +11:00
ntr
d102348d91 add a font 2019-01-19 20:24:19 +11:00