 Mashy
|
c8dddcc094
|
targetting arrow fr size change
|
2019-10-03 15:44:05 +10:00 |
|
|
Mashy
|
0f1ae4d17a
|
background for active skills
|
2019-10-03 15:21:19 +10:00 |
|
|
Mashy
|
962b72b85f
|
fix recharge show current red / blue life during combat, skip if 0 recharge and apply css
|
2019-10-02 16:06:39 +10:00 |
|
|
Mashy
|
16d319c706
|
reflect no longer triggers on ticks
|
2019-10-02 14:39:36 +10:00 |
|
|
Mashy
|
85ec220511
|
fix electrocute reflect
|
2019-10-02 12:37:11 +10:00 |
|
|
Mashy
|
86b73fc71a
|
match electric buff check
|
2019-10-01 17:16:18 +10:00 |
|
|
Mashy
|
d44acdffd5
|
Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop
|
2019-10-01 16:35:06 +10:00 |
|
|
Mashy
|
defcadbad2
|
remove double tick dots, lose electrify on application
|
2019-10-01 16:34:51 +10:00 |
|
|
Mashy
|
38e0a09a8a
|
catch null instance
|
2019-09-30 17:08:01 +10:00 |
|
|
Mashy
|
4da209fdc1
|
combat phase components
|
2019-09-30 16:38:36 +10:00 |
|
|
Mashy
|
1737f6de6c
|
show skill colour components during combat
|
2019-09-30 13:28:33 +10:00 |
|
|
Mashy
|
765d82bc62
|
skip co, remove absorb buff when you get absorption, don't trigger some effects when ko
|
2019-09-29 17:56:05 +10:00 |
|
|
Mashy
|
dab3b8da53
|
OSfrog tests
|
2019-09-25 20:22:53 +10:00 |
|
|
Mashy
|
124f144a2b
|
OSfrog Clap
|
2019-09-25 20:16:58 +10:00 |
|
|
Mashy
|
9af3fd3155
|
green power base, spec inconsistency
|
2019-09-24 13:34:01 +10:00 |
|
|
Mashy
|
58ff97a071
|
remove spec multi
|
2019-09-23 15:31:05 +10:00 |
|
|
Mashy
|
b57a076ac1
|
Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop
|
2019-09-23 14:23:37 +10:00 |
|
|
Mashy
|
6997a7a7c9
|
item descriptions and worklog
|
2019-09-23 14:23:22 +10:00 |
|
|
Mashy
|
1d778ecc17
|
null animTarget bug
|
2019-09-20 16:44:14 +10:00 |
|
|
Mashy
|
7cd6a0979c
|
Merge branch 'release/1.4.8' of ssh://git.mnml.gg:40022/~/mnml into release/1.4.8
|
2019-09-20 15:41:09 +10:00 |
|
|
Mashy
|
67654cbbab
|
use server calc speeds
|
2019-09-20 15:40:53 +10:00 |
|
|
Mashy
|
2e366e2eca
|
speed fix, counter fix, client side anim fix
|
2019-09-20 15:34:09 +10:00 |
|
|
Mashy
|
40f6073977
|
use cd pub type
|
2019-09-20 13:06:37 +10:00 |
|
|
Mashy
|
6fba9d9f4d
|
show skill delay on info
|
2019-09-20 13:03:13 +10:00 |
|
|
Mashy
|
3ad679cb02
|
vbox show costs, penalty for combo sale
|
2019-09-20 12:22:48 +10:00 |
|
|
Mashy
|
783429b5cf
|
fix purge description and dot
|
2019-09-19 16:07:35 +10:00 |
|
|
Mashy
|
f78496e681
|
spec info update
|
2019-09-19 16:01:46 +10:00 |
|
|
Mashy
|
f04d179023
|
tennis scoring -> str8 b05
|
2019-09-19 15:07:16 +10:00 |
|
|
Mashy
|
948c62f9ef
|
misc
|
2019-09-18 17:55:53 +10:00 |
|
|
Mashy
|
7817d28dab
|
help txt
|
2019-09-18 17:49:55 +10:00 |
|
|
Mashy
|
7b40316d9b
|
text changes sry not sry
|
2019-09-18 17:35:38 +10:00 |
|
|
Mashy
|
dedada5b14
|
Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop
|
2019-09-18 16:31:06 +10:00 |
|
|
Mashy
|
0cb5b8ccfa
|
banish rework
|
2019-09-18 16:30:52 +10:00 |
|
|
Mashy
|
d1b0072e63
|
Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop
|
2019-09-17 13:05:01 +10:00 |
|
|
Mashy
|
aa3b9badef
|
rework counter & sustain, update logs and tests
|
2019-09-17 13:04:48 +10:00 |
|
|
Mashy
|
b52b6a5334
|
delete hex (wasn't actually in game)
|
2019-09-16 17:04:41 +10:00 |
|
|
Mashy
|
a512bcb76c
|
nerf purge -> flat (2 / 3 / 4)T no lockout scaling
|
2019-09-16 16:47:57 +10:00 |
|
|
Mashy
|
660607dc60
|
Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop
|
2019-09-16 15:57:13 +10:00 |
|
|
Mashy
|
9ae7317f37
|
block skills ->> 1T duration / no cooldown
|
2019-09-16 15:56:21 +10:00 |
|
|
Mashy
|
6045a77bb6
|
link description & cleanup
|
2019-09-16 15:25:21 +10:00 |
|
|
Mashy
|
de17035ff7
|
Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop
|
2019-09-16 14:49:43 +10:00 |
|
|
Mashy
|
0b62a392f5
|
link rework
|
2019-09-16 14:49:36 +10:00 |
|
|
Mashy
|
d4ae38e733
|
Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop
|
2019-09-15 20:16:10 +10:00 |
|
|
Mashy
|
c027b2dec1
|
check for null objects
|
2019-09-15 17:56:51 +10:00 |
|
|
Mashy
|
21203ee06a
|
screen based translate for cast
|
2019-09-15 14:15:03 +10:00 |
|
|
Mashy
|
4558eeaee0
|
Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop
|
2019-09-15 13:21:19 +10:00 |
|
|
Mashy
|
dbe38a8815
|
anim simplified and fixed hopefully
|
2019-09-15 13:21:04 +10:00 |
|
|
Mashy
|
85f1a6bb33
|
ahhhhhhhhhhhhhhhhhhhh
|
2019-09-13 22:26:25 +10:00 |
|
|
Mashy
|
0296d9907b
|
actually fix anim bug
|
2019-09-13 22:25:07 +10:00 |
|
|
Mashy
|
6965bdb0e6
|
anim bug
|
2019-09-13 22:10:25 +10:00 |
|
|
Mashy
|
b1e18f68f2
|
item description speeds
|
2019-09-12 16:17:13 +10:00 |
|
|
Mashy
|
70e66d1916
|
misc
|
2019-09-12 15:33:48 +10:00 |
|
|
Mashy
|
58fa6a5734
|
actually requesting account instances when game end
|
2019-09-12 15:32:57 +10:00 |
|
|
Mashy
|
c82fb404d1
|
request account state when instance finished, remove account instances from socket
|
2019-09-12 15:24:16 +10:00 |
|
|
Mashy
|
075880d5a7
|
fix slay bug
|
2019-09-12 14:25:52 +10:00 |
|
|
Mashy
|
e8e63e0943
|
confirm abandon
|
2019-09-12 14:05:36 +10:00 |
|
|
Mashy
|
c45cf59f29
|
Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop
|
2019-09-12 13:25:27 +10:00 |
|
|
Mashy
|
2d16c8c91a
|
item base components for combo items
|
2019-09-12 13:25:11 +10:00 |
|
|
Mashy
|
2086badbdf
|
Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop
|
2019-09-12 12:10:01 +10:00 |
|
|
Mashy
|
0e2525689f
|
fix speed stat info hover
|
2019-09-12 12:08:37 +10:00 |
|
|
Mashy
|
7f6df40ea7
|
misc
|
2019-09-11 16:20:49 +10:00 |
|
|
Mashy
|
a38c603ec9
|
disable during anim
|
2019-09-11 15:53:51 +10:00 |
|
|
Mashy
|
4a13656b9d
|
abandon game
|
2019-09-11 15:49:36 +10:00 |
|
|
Mashy
|
60bd7f65ba
|
abandon rpc
|
2019-09-11 15:29:52 +10:00 |
|
|
Mashy
|
9874334fc3
|
screen width % for anims
|
2019-09-11 11:55:48 +10:00 |
|
|
Mashy
|
2cea9fd8fa
|
clear skills
|
2019-09-09 16:03:33 +10:00 |
|
|
Mashy
|
b633820ca1
|
fix tests with stat change
|
2019-09-06 14:28:42 +10:00 |
|
|
Mashy
|
547127b9eb
|
inc base dmg, reduce health, specs bonuses are purely threshold from team colour
|
2019-09-06 13:40:29 +10:00 |
|
|
Mashy
|
849a89ac4e
|
non item skill +
|
2019-09-05 23:02:01 +10:00 |
|
|
Mashy
|
21f3a80752
|
more ++ fixes, shows + during anims
|
2019-09-05 22:41:36 +10:00 |
|
|
Mashy
|
b5e09ba343
|
Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop
|
2019-09-04 17:06:58 +10:00 |
|
|
Mashy
|
fc73dadca5
|
horizontal align figcaption
|
2019-09-04 17:06:36 +10:00 |
|
|
Mashy
|
5c946c559b
|
spec combos preview
|
2019-09-04 16:40:53 +10:00 |
|
|
Mashy
|
1600ca6c82
|
fix ++ spec display in vbox
|
2019-09-04 16:25:28 +10:00 |
|
|
Mashy
|
2dc90db185
|
Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop
|
2019-09-04 15:35:00 +10:00 |
|
|
Mashy
|
285d574934
|
serde rename items
|
2019-09-04 15:34:43 +10:00 |
|
|
Mashy
|
ce72522314
|
show components for skills
|
2019-09-04 14:54:49 +10:00 |
|
|
Mashy
|
61528f7739
|
ternary format
|
2019-08-27 16:35:48 +10:00 |
|
|
Mashy
|
338a7e082c
|
construct page selection
|
2019-08-27 16:30:59 +10:00 |
|
|
Mashy
|
12ec8a4142
|
log
|
2019-08-19 18:21:33 +10:00 |
|
|
Mashy
|
d995e936ad
|
fix ko electrify (effect removal in post effect)
|
2019-08-19 18:21:01 +10:00 |
|
|
Mashy
|
a06f3a75ae
|
worklog
|
2019-08-18 21:46:30 +10:00 |
|
|
Mashy
|
9cc4995959
|
spec goal overflow
|
2019-08-15 15:37:32 +10:00 |
|
|
Mashy
|
fbf0eead04
|
tidy up info strings
|
2019-08-14 13:28:02 +10:00 |
|
|
Mashy
|
8a74d9e3c4
|
wip added svg icons into description strings
|
2019-08-14 00:51:01 +10:00 |
|
|
Mashy
|
c16bfab12a
|
nav to list after setting team
|
2019-07-30 20:49:16 +10:00 |
|
|
Mashy
|
f6f9b8c79e
|
fix stun rpc (dupe entry)
|
2019-07-30 19:06:43 +10:00 |
|
|
Mashy
|
6abc982fec
|
Merge branch 'mm' into develop
|
2019-07-30 18:48:55 +10:00 |
|
|
Mashy
|
c1b5f09d42
|
fix absorb, purge, electrocute, end of game bugs
|
2019-07-30 17:55:16 +10:00 |
|
|
Mashy
|
fb84e1becf
|
clear skills during anim phase
|
2019-07-27 11:23:55 +10:00 |
|
|
Mashy
|
84c0a187c2
|
pay for constructs
|
2019-07-27 11:12:00 +10:00 |
|
|
Mashy
|
f295235b52
|
fn names
|
2019-07-26 21:30:20 +10:00 |
|
|
Mashy
|
abd35b8bef
|
spawning constructs (no mtx yet)
|
2019-07-26 21:22:11 +10:00 |
|
|
Mashy
|
b72c819c63
|
Merge branch 'develop' into buy-constructs
|
2019-07-26 20:01:26 +10:00 |
|
|
Mashy
|
61fa990a15
|
wip team select back in
|
2019-07-26 14:00:01 +10:00 |
|
|
Mashy
|
a3a2cf9852
|
fix team nav bug
|
2019-07-25 14:29:05 +10:00 |
|
|
Mashy
|
441cf3bc47
|
fix buff and debuff
|
2019-07-23 18:29:19 +10:00 |
|
|
Mashy
|
2dc929de40
|
Merge remote-tracking branch 'origin/develop' into develop
|
2019-07-23 18:07:39 +10:00 |
|
|
Mashy
|
4c68d11a28
|
aoe targetting fixed
|
2019-07-23 18:04:33 +10:00 |
|
|
Mashy
|
ef11d14752
|
fix cb for banish/invert
|
2019-07-23 15:57:50 +10:00 |
|