 Mashy
|
e7aee86aae
|
Added skill descriptions, cleaned up some scenes
|
2019-03-27 15:40:17 +10:00 |
|
|
Mashy
|
075680a667
|
Merge branch 'master' of ssh://cryps.gg:40022/~/cryps
|
2019-03-26 17:04:22 +10:00 |
|
|
Mashy
|
2c8ddcd186
|
improved decay combat sequence
|
2019-03-26 17:04:06 +10:00 |
|
|
Mashy
|
514b9b0b53
|
Merge branch 'master' of ssh://cryps.gg:40022/~/cryps
|
2019-03-26 13:36:17 +10:00 |
|
|
Mashy
|
d8c5d24a3d
|
Add check for KO event, skill from events
|
2019-03-26 13:36:05 +10:00 |
|
|
Mashy
|
dda728bfb8
|
Merge branch 'master' of ssh://cryps.gg:40022/~/cryps
|
2019-03-26 13:24:40 +10:00 |
|
|
Mashy
|
62b673ed1d
|
Sync stat bars after combat turn
|
2019-03-26 13:24:27 +10:00 |
|
|
Mashy
|
806e32e485
|
Merge branch 'master' of ssh://cryps.gg:40022/~/cryps
|
2019-03-25 15:08:26 +10:00 |
|
|
Mashy
|
df76d50a4e
|
Fixed resolutions with new format
|
2019-03-25 15:08:12 +10:00 |
|
|
Mashy
|
d2669cfb9e
|
Merge branch 'master' of ssh://cryps.gg:40022/~/cryps
|
2019-03-25 14:27:03 +10:00 |
|
|
Mashy
|
f406b2251d
|
Added new format dmg numbers don't work
|
2019-03-25 14:26:48 +10:00 |
|
|
Mashy
|
9a81a68a48
|
Merge branch 'master' of ssh://cryps.gg:40022/~/cryps
|
2019-03-25 10:43:27 +10:00 |
|
|
Mashy
|
07e6fd6df3
|
misc
|
2019-03-25 10:43:15 +10:00 |
|
|
Mashy
|
4ead60a947
|
Added remaining speed / dmg / hp specs
|
2019-03-22 12:32:54 +10:00 |
|
|
Mashy
|
3dcb0a3533
|
back to sq 1
|
2019-03-21 17:49:22 +10:00 |
|
|
Mashy
|
f62c3e6767
|
Base as part of bonus calc
|
2019-03-21 16:45:16 +10:00 |
|
|
Mashy
|
2a4adb4ef7
|
Added percents
|
2019-03-21 16:33:58 +10:00 |
|
|
Mashy
|
5fab9e6936
|
changed dmg bonus
|
2019-03-21 15:45:25 +10:00 |
|
|
Mashy
|
21988ccc77
|
Merge branch 'master' of ssh://cryps.gg:40022/~/cryps
|
2019-03-21 15:28:03 +10:00 |
|
|
Mashy
|
33941657f8
|
Flat health spec and bonus fn
|
2019-03-21 15:27:47 +10:00 |
|
|
Mashy
|
1f39479085
|
FIXT RECTANGLES
|
2019-03-18 17:33:51 +10:00 |
|
|
Mashy
|
d22ea2a25d
|
Added colours and specs to cryp avatar, click skills and dialog to unequip
|
2019-03-18 12:50:03 +10:00 |
|
|
Mashy
|
b83c824795
|
fixt button and other misc shit
|
2019-03-15 20:39:18 +10:00 |
|
|
Mashy
|
56e4c22e05
|
Merge branch 'master' of ssh://cryps.gg:40022/~/cryps
|
2019-03-15 19:26:42 +10:00 |
|
|
Mashy
|
1e9f174e7b
|
Added skills to cryp avatar
|
2019-03-15 19:26:22 +10:00 |
|
|
Mashy
|
31060f681e
|
Merge branch 'master' of ssh://cryps.gg:40022/~/cryps
|
2019-03-15 14:03:49 +10:00 |
|
|
Mashy
|
ddc48d1740
|
Reworking instance UI page
|
2019-03-15 14:02:14 +10:00 |
|
|
Mashy
|
2486045333
|
Merge branch 'master' of ssh://cryps.gg:40022/~/cryps
|
2019-03-14 22:41:37 +10:00 |
|
|
Mashy
|
50104e8421
|
Merge branch 'master' of ssh://cryps.gg:40022/~/cryps
|
2019-03-14 18:31:09 +10:00 |
|
|
Mashy
|
258f6c866d
|
Merge branch 'master' of ssh://cryps.gg:40022/~/cryps
|
2019-03-14 15:50:09 +10:00 |
|
|
Mashy
|
9a5f92cf7f
|
join games in progress
|
2019-03-14 15:49:51 +10:00 |
|
|
Mashy
|
c036750a4b
|
Add specs
|
2019-03-06 17:19:31 +10:00 |
|
|
Mashy
|
9ba8c478cc
|
fix deallocate bug
|
2019-03-06 15:28:49 +10:00 |
|
|
Mashy
|
b022845ff7
|
inv deallocate on click
|
2019-03-06 15:26:09 +10:00 |
|
|
Mashy
|
a455b2b1f3
|
Merge branch 'master' of ssh://cryps.gg:40022/~/cryps
|
2019-03-06 11:59:58 +10:00 |
|
|
Mashy
|
c8b19d2875
|
Fixed varibox for new structure
|
2019-03-06 11:58:28 +10:00 |
|
|
Mashy
|
4afe114bdd
|
Fixed item drag, added score
|
2019-03-05 20:35:07 +10:00 |
|
|
Mashy
|
26250d5b74
|
Merge branch 'master' of ssh://cryps.gg:40022/~/cryps
|
2019-03-05 14:57:42 +10:00 |
|
|
Mashy
|
99d0231a9c
|
change to bitmap text
|
2019-03-05 14:52:59 +10:00 |
|
|
Mashy
|
5fa964c382
|
fix outline
|
2019-03-05 11:44:45 +10:00 |
|
|
Mashy
|
a8ff3f0a23
|
Highlight lines on cryps on select
|
2019-03-04 12:52:53 +10:00 |
|
|
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 |
|