 Mashy
|
2eb8318ae1
|
Merge branch 'master' of ssh://cryps.gg:40022/~/cryps
|
2019-03-03 17:33:59 +10:00 |
|
|
Mashy
|
5dddb2a237
|
Vbox Economy
|
2019-03-03 17:33:45 +10:00 |
|
|
Mashy
|
cb30ed8415
|
Merge branch 'master' of ssh://cryps.gg:40022/~/cryps
|
2019-03-03 11:19:45 +10:00 |
|
|
Mashy
|
e032d0c44c
|
waste of time line
|
2019-03-03 11:19:12 +10:00 |
|
|
Mashy
|
298c263a60
|
fix invalid item combiner box error
|
2019-03-01 16:05:21 +10:00 |
|
|
Mashy
|
904a1e8a56
|
Merge branch 'master' of ssh://cryps.gg:40022/~/cryps
|
2019-03-01 15:52:58 +10:00 |
|
|
Mashy
|
92a249879d
|
Update cryps on player update
|
2019-03-01 15:52:42 +10:00 |
|
|
Mashy
|
a59de136ac
|
Instances shown by default on home
|
2019-03-01 13:56:34 +10:00 |
|
|
Mashy
|
750a81c29f
|
Get playerlist on home page
|
2019-03-01 10:54:56 +10:00 |
|
|
Mashy
|
dafbf145f8
|
added instances to its own scene
|
2019-02-28 22:04:25 +10:00 |
|
|
Mashy
|
8abe18b0f1
|
Fixed player set
|
2019-02-28 20:51:45 +10:00 |
|
|
Mashy
|
8c89bd6841
|
Add instances from player list
|
2019-02-28 17:58:23 +10:00 |
|
|
Mashy
|
b093374391
|
unlearn skills, just need rpc call
|
2019-02-26 14:00:29 +10:00 |
|
|
Mashy
|
c4453a6934
|
Merge branch 'master' of ssh://cryps.gg:40022/~/cryps
|
2019-02-25 16:09:28 +10:00 |
|
|
Mashy
|
cdfa66fa72
|
Added multi scene to homepage, placeholder for rankings / news / shop
|
2019-02-25 16:09:10 +10: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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
Mashy
|
536414a227
|
666
|
2019-02-16 18:34:51 +10:00 |
|
|
Mashy
|
b9b5132d67
|
more combos
|
2019-02-16 11:36:34 +10: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 |
|
|
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 |
|
|
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 |
|
|
Mashy
|
432a7eb6f6
|
Using the 3.16 scale manager
|
2019-01-22 11:44:49 +10: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 |
|
|
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
|
a44b9bc929
|
Node types
|
2019-01-15 13:32:41 +10:00 |
|
|
Mashy
|
c6cd0afd15
|
Merge branch 'master' of ssh://cryps.gg:40022/~/cryps
|
2019-01-15 12:03:07 +10:00 |
|
|
Mashy
|
6b4662dd2f
|
Reduce armour and spellshield bars during combat
|
2019-01-15 12:02:30 +10:00 |
|
|
Mashy
|
cd3f4a83be
|
take zone x&y from server
|
2019-01-14 20:57:58 +10:00 |
|
|
Mashy
|
4c9b8300bc
|
Vertical skill bars
|
2019-01-14 12:26:01 +10:00 |
|
|
Mashy
|
5776b1371f
|
Moved variables into constants file
|
2019-01-14 11:56:20 +10:00 |
|
|
Mashy
|
593a2da7b0
|
Moved stat bar into components
|
2019-01-14 11:45:22 +10:00 |
|
|
Mashy
|
e0660c31a3
|
Merge branch 'master' of ssh://cryps.gg:40022/~/cryps
|
2019-01-13 18:49:40 +10:00 |
|
|
Mashy
|
478906da4f
|
Added bars for defenses
|
2019-01-13 18:40:57 +10:00 |
|
|
Mashy
|
eb9544e4cb
|
New button hpye
|
2019-01-11 18:44:50 +10:00 |
|
|
Mashy
|
4d79f987d3
|
Added glowy box to combat scene as a test 'ok_hand'
|
2019-01-09 14:48:45 +10:00 |
|
|
Mashy
|
19dd5aa87e
|
Center game window
|
2019-01-08 18:53:25 +10:00 |
|
|
Mashy
|
bdd8997141
|
Added block animations, misc ui fixes
|
2019-01-05 12:08:10 +10:00 |
|
|
Mashy
|
2ae764a3a3
|
Added cryp avatar hash and fixed some animations
|
2019-01-04 18:24:01 +10:00 |
|
|
Mashy
|
d9645b7a1d
|
Misc frontend fixes
|
2019-01-03 10:48:26 +10:00 |
|
|
Mashy
|
af29d1c959
|
Merge branch 'menu'
|
2019-01-02 11:38:44 +10:00 |
|
|
Mashy
|
b20b3422a3
|
Statsheet and item request
|
2019-01-02 11:37:32 +10:00 |
|
|
Mashy
|
d31c8775d6
|
new year, new menu
|
2019-01-01 16:15:43 +10:00 |
|
|
Mashy
|
3f208bb29c
|
Remove edge search
|
2018-12-30 15:22:21 +10:00 |
|
|
Mashy
|
d041bcd9bb
|
Rename Missions -> Zones, cleaned up zone classes
|
2018-12-30 15:14:14 +10:00 |
|
|
Mashy
|
c46c74cb7e
|
Merge branch 'zones' of ssh://cryps.gg:40022/~/cryps into zones
|
2018-12-30 14:43:35 +10:00 |
|
|
Mashy
|
119d4d8c9a
|
zone mission update
|
2018-12-30 14:25:22 +10:00 |
|
|
Mashy
|
856a554488
|
gen graph from server data
|
2018-12-28 17:13:13 +10:00 |
|
|
Mashy
|
964447818c
|
Merge branch 'zones'
|
2018-12-28 15:53:29 +10:00 |
|
|
Mashy
|
3527d3faa0
|
Mission UI stuff
|
2018-12-28 15:41:47 +10:00 |
|
|
Mashy
|
b36559ae9f
|
fixed statsheet
|
2018-12-23 23:48:36 +10:00 |
|
|
Mashy
|
e3dd8cfad7
|
fixed some stuff and really basic mission selection
|
2018-12-21 20:53:04 +10:00 |
|
|
Mashy
|
7eceeaf759
|
Merge branch 'master' of ssh://cryps.gg:40022/~/cryps
|
2018-12-21 19:32:23 +10:00 |
|
|
Mashy
|
58641b57f3
|
refactor menu
|
2018-12-21 19:31:59 +10:00 |
|
|
Mashy
|
f71c8ed8e1
|
Merge branch 'master' of ssh://cryps.gg:40022/~/cryps
|
2018-12-20 15:11:12 +10:00 |
|
|
Mashy
|
2cac857f2c
|
Trying to join the big leagues
|
2018-12-20 15:10:58 +10:00 |
|
|
Mashy
|
2b1fc76f58
|
Merge branch 'master' of ssh://cryps.gg:40022/~/cryps
|
2018-12-17 18:02:19 +10:00 |
|
|
Mashy
|
596e9968c0
|
Team animations come from source, skill buttons
|
2018-12-17 18:02:05 +10:00 |
|
|
Mashy
|
f2cf67fa0f
|
Merge branch 'master' of ssh://cryps.gg:40022/~/cryps
|
2018-12-15 11:30:50 +10:00 |
|
|
Mashy
|
9087b9bebc
|
Atlas and random aztec cryp loading
|
2018-12-15 11:30:22 +10:00 |
|
|
Mashy
|
f78cf7ffff
|
Merge branch 'master' of ssh://cryps.gg:40022/~/cryps
|
2018-12-14 16:10:03 +10:00 |
|