884 Commits

Author SHA1 Message Date
ntr
7ab27d51d2 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-02-25 15:28:28 +11:00
ntr
404378ee88 demo fix 2019-02-25 15:28:19 +11: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
ntr
d0bc63a0de fix typo with isntance and timestamps 2019-02-22 16:34:57 +11: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
da21350fda comment zones: 2019-02-22 16:15:49 +11: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
ntr
d5d6254daf whew 2019-02-21 13:54:35 +11:00
ntr
613444d066 wip 2019-02-21 12:05:27 +11:00
Mashy
168cdd4104 Colour items 2019-02-21 11:03:50 +10:00
Mashy
21c657a1a2 More spec info 2019-02-21 10:29:38 +10:00
Mashy
3fc759f854 Merge branch 'combos' of ssh://cryps.gg:40022/~/cryps into combos 2019-02-20 18:49:11 +10:00
Mashy
e8a3011e85 Spec Info 2019-02-20 18:48:56 +10:00
ntr
94eb259409 remove some derives 2019-02-19 23:31:39 +11:00
ntr
3dfdaf2514 unreachable 2019-02-19 23:25:17 +11:00
ntr
8a06c8b976 can't make it 2019-02-19 23:14:39 +11:00
ntr
0b07e121ad rename siphon 2019-02-19 15:56:30 +11:00
Mashy
af20e9aae8 Merge branch 'combos' of ssh://cryps.gg:40022/~/cryps into combos 2019-02-19 14:55:45 +10:00
Mashy
54b1c8f1c0 vbox combos, keep items in combiner 2019-02-19 14:44:15 +10:00
ntr
eb9fd6e4af more colour codes 2019-02-19 14:24:17 +11: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
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