3125 Commits

Author SHA1 Message Date
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
ntr
9ce98fe81f chaos anim changes 2019-12-18 11:12:36 +10:00
Mashy
44fa6b8c6a redo all descriptions monakS 2019-12-17 11:48:41 +10:00
Mashy
c1aa592cd5 skill info init 2019-12-16 18:24:06 +10:00
Mashy
b630d0b76c group attack skills 2019-12-16 17:34:58 +10:00
Mashy
efd82f3cf2 make enum version of all skills for values 2019-12-16 17:24:19 +10:00
Mashy
0ed186cde3 Merge branch 'core' of ssh://git.mnml.gg:40022/~/mnml into core 2019-12-14 05:14:33 +10:00
Mashy
b033c719bc decay values enum Pog? 2019-12-14 05:13:38 +10:00
ntr
3e3e4040d3 cooldowns done as a reaction 2019-12-13 23:48:02 +10:00
ntr
a052e515ed comment 2019-12-13 20:18:16 +10:00
ntr
b7768e58bd counterattack immunity 2019-12-13 20:15:01 +10:00
ntr
f941feea6f Merge branch 'core' of ssh://git.mnml.gg:40022/~/mnml into core 2019-12-13 20:09:53 +10:00
ntr
8240c704a7 counterattack immunity 2019-12-13 20:08:31 +10:00
ntr
59b8c90496 fixme 2019-12-13 18:22:12 +10:00
ntr
db05505691 tick consistency 2019-12-13 18:21:29 +10:00
ntr
852f192ae7 fix siphon 2019-12-13 17:33:14 +10:00
ntr
48ebcf921f fix absorb test 2019-12-13 16:22:18 +10:00
ntr
5555c930e2 cooldown fix 2019-12-13 15:15:21 +10:00
ntr
f63a8b3f8f tests back 2019-12-13 15:05:18 +10:00
ntr
bf4038b09d big changeup innit 2019-12-13 14:57:17 +10:00