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 |
|
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 |
|