Mashy
|
122c385f1c
|
Merge branch 'release/1.11.0' of ssh://git.mnml.gg:40022/~/mnml into release/1.11.0
|
2019-12-20 12:13:19 +10:00 |
|
Mashy
|
550e1123ad
|
cast event for single target fix
|
2019-12-20 12:12:19 +10:00 |
|
ntr
|
ba5a5c7cfb
|
Merge branch 'release/1.11.0' of ssh://git.mnml.gg:40022/~/mnml into release/1.11.0
|
2019-12-20 12:08:26 +10:00 |
|
ntr
|
267a4ef742
|
remove demo
|
2019-12-20 12:08:20 +10:00 |
|
ntr
|
86b0ba7f17
|
remove demo
|
2019-12-20 12:03:13 +10:00 |
|
ntr
|
883e3c551d
|
Merge branch 'release/1.11.0' of ssh://git.mnml.gg:40022/~/mnml into release/1.11.0
|
2019-12-20 11:54:16 +10:00 |
|
ntr
|
90a1e9577a
|
trim slay anim
|
2019-12-20 11:54:12 +10:00 |
|
Mashy
|
c9acab9def
|
add - for effect removal, anim text clean up
|
2019-12-20 11:42:54 +10:00 |
|
Mashy
|
ecc6eebdbb
|
only trigger wiggle on damage / ko, fixes wiggle issue also
|
2019-12-20 11:23:53 +10:00 |
|
Mashy
|
d307241f75
|
fix electrocute action order
|
2019-12-20 11:06:33 +10:00 |
|
Mashy
|
49bf35970b
|
Merge branch 'release/1.11.0' of ssh://git.mnml.gg:40022/~/mnml into release/1.11.0
|
2019-12-19 18:20:06 +10:00 |
|
Mashy
|
89a09e5ebc
|
link damage fix + test
|
2019-12-19 18:18:51 +10:00 |
|
ntr
|
4fc33eef4b
|
fixme rm
|
2019-12-19 16:32:04 +10:00 |
|
ntr
|
913b463112
|
rm printlns
|
2019-12-19 16:29:01 +10:00 |
|
ntr
|
132d270634
|
fixme rms
|
2019-12-19 16:28:22 +10:00 |
|
Mashy
|
13b8c5b766
|
ln
|
2019-12-19 16:23:50 +10:00 |
|
Mashy
|
4c26f911ab
|
move down single hit animation to before cast.resolve()
|
2019-12-19 16:23:14 +10:00 |
|
ntr
|
5b5b8d3740
|
Merge branch 'release/1.11.0' of ssh://git.mnml.gg:40022/~/mnml into release/1.11.0
|
2019-12-19 15:43:24 +10:00 |
|
ntr
|
34b575fefc
|
fix triage
|
2019-12-19 15:41:03 +10:00 |
|
Mashy
|
a55fd9834a
|
animation construct ko
|
2019-12-19 15:35:10 +10:00 |
|
Mashy
|
e4adb83060
|
Merge branch 'release/1.11.0' of ssh://git.mnml.gg:40022/~/mnml into release/1.11.0
|
2019-12-19 15:05:37 +10:00 |
|
Mashy
|
77510c1c8f
|
test fixes
|
2019-12-19 15:05:10 +10:00 |
|
ntr
|
0f7ce528c8
|
fix electrify
|
2019-12-19 14:58:59 +10:00 |
|
Mashy
|
8e03564b46
|
Merge branch 'release/1.11.0' of ssh://git.mnml.gg:40022/~/mnml into release/1.11.0
|
2019-12-19 14:51:33 +10:00 |
|
ntr
|
d0dec463e5
|
fix electrocute
|
2019-12-19 14:49:20 +10:00 |
|
ntr
|
dd8d67c2c0
|
Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop
|
2019-12-19 14:46:28 +10:00 |
|
ntr
|
9a5a93ce24
|
fix ruin cooldown
|
2019-12-19 14:42:42 +10:00 |
|
Mashy
|
7ff5d9585c
|
add back effects descriptions
|
2019-12-19 14:03:54 +10:00 |
|
ntr
|
16488ee0ee
|
log panics
|
2019-12-19 13:50:26 +10:00 |
|
Mashy
|
24b1de7724
|
fixme
|
2019-12-19 13:37:40 +10:00 |
|
Mashy
|
b26ce047f2
|
Merge branch 'develop' into release/1.11.0
|
2019-12-19 13:04:07 +10:00 |
|
Mashy
|
3372595313
|
construct green power
|
2019-12-19 13:03:28 +10:00 |
|
Mashy
|
f3c0471a80
|
old combo and spec values
|
2019-12-19 12:59:08 +10:00 |
|
ntr
|
7520be7cf2
|
v1.11.0
|
2019-12-19 12:19:55 +10:00 |
|
ntr
|
deda4af94b
|
version script update for core
|
2019-12-19 12:18:53 +10:00 |
|
ntr
|
c878a2cd4e
|
MMerge branch 'core' of ssh://git.mnml.gg:40022/~/mnml into core
|
2019-12-18 17:17:27 +10:00 |
|
ntr
|
35ed1359e4
|
fix chaos centering
|
2019-12-18 17:17:21 +10:00 |
|
Mashy
|
669de50fb6
|
Merge branch 'core' of ssh://git.mnml.gg:40022/~/mnml into core
|
2019-12-18 17:14:49 +10:00 |
|
Mashy
|
188701da96
|
slay siphon
|
2019-12-18 17:14:28 +10:00 |
|
ntr
|
8c966653ec
|
fix sustain numbers and remove scale thing
|
2019-12-18 17:13:54 +10:00 |
|
ntr
|
711650b08c
|
fix heal duration
|
2019-12-18 17:09:32 +10:00 |
|
ntr
|
c70c4584a6
|
MMerge branch 'core' of ssh://git.mnml.gg:40022/~/mnml into core
|
2019-12-18 17:07:32 +10:00 |
|
ntr
|
de0372e359
|
change chaos anim
|
2019-12-18 17:07:21 +10:00 |
|
Mashy
|
24b5857d86
|
sleep fix
|
2019-12-18 17:03:30 +10:00 |
|
Mashy
|
a8ec31fc97
|
absorption targetting fix
|
2019-12-18 16:59:18 +10:00 |
|
Mashy
|
375612042d
|
Merge branch 'core' of ssh://git.mnml.gg:40022/~/mnml into core
|
2019-12-18 16:46:12 +10:00 |
|
Mashy
|
388cf2400c
|
electrocute effect, move decay effect first
|
2019-12-18 16:44:53 +10:00 |
|
ntr
|
0563add0cb
|
absorption anim
|
2019-12-18 16:44:49 +10:00 |
|
ntr
|
90bffcb6b7
|
reimplement animations
|
2019-12-18 16:32:29 +10:00 |
|
ntr
|
14ddc0b237
|
short circuit when game is finished
|
2019-12-18 11:14:35 +10:00 |
|