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 |
|
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
|
d102348d91
|
add a font
|
2019-01-19 20:24:19 +11:00 |
|
Mashy
|
b9ebf89c19
|
Click to forget specs
|
2019-01-17 13:22:49 +10:00 |
|
Mashy
|
d833b10ded
|
Added spec display
|
2019-01-16 23:51:12 +10:00 |
|
ntr
|
661678ce60
|
Merge branch 'master' of ssh://cryps.gg:40022/~/cryps
|
2019-01-16 23:51:23 +11:00 |
|
ntr
|
a525522de7
|
press r
|
2019-01-16 23:51:06 +11:00 |
|
Mashy
|
a9dd2e76cc
|
Moved menu context switching out of main cryps
|
2019-01-16 17:58:15 +10:00 |
|
Mashy
|
31f48c0663
|
Placeholder scene for holding specs
|
2019-01-16 16:43:43 +10:00 |
|
Mashy
|
2a82404a48
|
Added error handling toasts
|
2019-01-16 13:59:22 +10:00 |
|
Mashy
|
f887a6e4ca
|
Simplified navigation, load zone on pve and game list on pvp
|
2019-01-16 12:57:15 +10:00 |
|
Mashy
|
6b4662dd2f
|
Reduce armour and spellshield bars during combat
|
2019-01-15 12:02:30 +10:00 |
|
ntr
|
2d918af744
|
fix zone tag join
|
2019-01-14 22:26:06 +11:00 |
|