484 Commits

Author SHA1 Message Date
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
ntr
dfe290a132 proxy timeout 2018-12-21 19:41:38 +11:00
ntr
b9e74f1d0d item list 2018-12-21 19:21:09 +11:00
ntr
114a6d505c pve enum 2018-12-21 13:18:08 +11:00
ntr
a6e91a1442 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2018-12-20 19:03:13 +11:00
ntr
5b4e189079 rerolls 2018-12-20 19:03:07 +11: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
ntr
9b180971ce imports 2018-12-20 14:41:40 +11:00
ntr
e768c267f4 drops 2018-12-20 14:40:36 +11:00
ntr
c5d7a72fdc reemove test field 2018-12-18 15:18:57 +11:00
ntr
7424472ddb cryp recover 2018-12-18 15:17:44 +11:00
ntr
950cc6fbad logging 2018-12-17 23:56:16 +11:00
ntr
065af62a15 fix blast cd 2018-12-17 23:44:52 +11:00
ntr
9f5a736cf8 big skill rework simplification 2018-12-17 23:23:23 +11:00
ntr
9c3264cdb1 add effect method 2018-12-17 22:44:42 +11: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
ntr
47b8182cfb skill descriptions 2018-12-17 17:45:53 +11:00
ntr
783fa736d4 move durations onto effect 2018-12-17 17:13:04 +11:00
ntr
0d833f9b7d quick skill rework 2018-12-17 17:05:19 +11:00
ntr
6bacdb9181 snare 2018-12-17 16:30:35 +11:00
ntr
11de6afd00 text and results early return 2018-12-17 14:53:13 +11:00
ntr
6a5ecb1b2f self targeting fix 2018-12-16 16:27:49 +11:00
ntr
92c6da39bf evade 2018-12-16 15:52:56 +11:00
ntr
0883d7233c demo 2018-12-15 14:13:50 +11:00
ntr
3a367ebe6a flip x 2018-12-15 12:45:31 +11: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
ntr
558fede298 fix aztec 2018-12-15 11:52:39 +11:00
ntr
ddc009f80e transparent aztec img 2018-12-15 11:14:11 +11:00
ntr
9746712992 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2018-12-15 11:00:23 +11:00
ntr
18d4c33bda resize fix 2018-12-15 11:00:12 +11:00
Mashy
f78cf7ffff Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2018-12-14 16:10:03 +10:00
Mashy
dedb9d8b96 Added block animation 2018-12-14 16:07:20 +10:00
ntr
870d74b7eb renmae to basecd 2018-12-14 13:57:32 +11:00
ntr
e20aabb6e4 fix cooldown bug 2018-12-14 13:52:00 +11:00
ntr
d225843e35 static size ;( 2018-12-14 12:52:39 +11:00
ntr
f770e2fbf8 clean 2018-12-14 12:49:38 +11:00
ntr
35d4f11881 wip 2018-12-14 12:43:24 +11:00
ntr
4b1585aeff wip 2018-12-14 12:33:14 +11:00
ntr
4d97eaa949 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2018-12-14 11:12:42 +11:00
ntr
bfb721b5ee add select button to cryp list for mobile" 2018-12-14 11:12:30 +11:00
Mashy
aca21d267d Added heals and removed enemy hitbox in target phase 2018-12-13 18:12:44 +10:00
ntr
b43fc44303 Merge branch 'newskills' 2018-12-13 15:29:15 +11:00
ntr
9220e09e15 worklog 2018-12-13 15:22:50 +11:00
Mashy
0c8258d895 added ko 2018-12-13 14:19:01 +10:00
Mashy
c832f92adf skill rework 2018-12-13 13:31:28 +10:00
ntr
40caa6ab37 fix logs for immunity and make bots target smarter 2018-12-13 14:25:50 +11:00