3115 Commits

Author SHA1 Message Date
Mashy
241467ec48 cleaning up ugly recharge code 2019-11-07 11:23:08 +10:00
Mashy
2792061186 rearrange worklog 2019-11-07 10:32:29 +10:00
Mashy
f7b86337d5 changelog 2019-11-07 10:17:31 +10:00
Mashy
e90320cc30 Merge branch 'text-background' into develop 2019-11-07 10:09:32 +10:00
Mashy
a220529ac7 Merge branch 'release/1.8.0' into develop 2019-11-07 10:09:24 +10:00
Mashy
efcc437985 ruin deals dmg to each construct and reduce cd 2019-11-07 10:08:25 +10:00
Mashy
e18356a554 text background 2019-11-06 19:02:15 +10:00
ntr
8f428f15a3 expo connect backoff and reloading 2019-11-06 19:05:28 +11:00
ntr
787fd8ac90 Merge branch 'release/1.8.0' of ssh://git.mnml.gg:40022/~/mnml into release/1.8.0 2019-11-06 18:15:09 +11:00
ntr
c86183eb4a recharge rb animation text 2019-11-06 18:15:06 +11:00
Mashy
4b6f3becd2 changelogs 2019-11-06 17:14:20 +10:00
Mashy
9e5bfea0ce remove decay cd, reduce banish cd 2019-11-06 17:11:44 +10:00
Mashy
b4a52576d2 hastestrike / hybridblast + triggers (Attack no longer triggers) 2019-11-06 17:08:31 +10:00
Mashy
b737d91f58 Amplify increases greenpower 2019-11-06 17:04:40 +10:00
ntr
62b20bed18 fix vbox 2019-11-06 17:27:48 +11:00
ntr
e86ef5c3dd Merge branch 'release/1.8.0' of ssh://git.mnml.gg:40022/~/mnml into release/1.8.0 2019-11-06 17:20:40 +11:00
Mashy
ec964de5f0 other key index 2019-11-06 16:20:22 +10:00
ntr
6dfdbd5722 Merge branch 'release/1.8.0' of ssh://git.mnml.gg:40022/~/mnml into release/1.8.0 2019-11-06 17:20:08 +11:00
Mashy
493aee4df8 index bound fix 2019-11-06 16:14:03 +10:00
ntr
9dd914a5d8 Merge branch 'release/1.8.0' of ssh://git.mnml.gg:40022/~/mnml into release/1.8.0 2019-11-06 17:06:23 +11:00
Mashy
1902c725ba Merge branch 'release/1.8.0' of ssh://git.mnml.gg:40022/~/mnml into release/1.8.0 2019-11-06 16:04:06 +10:00
Mashy
4cc42e305c combiner fixes 2019-11-06 16:03:39 +10:00
ntr
bdcb667a24 box -> d 2019-11-06 17:02:54 +11:00
ntr
79f1712864 fix vbox button flashing by adding key to mapped btns 2019-11-06 16:25:29 +11:00
ntr
8b4c616629 Merge branch 'release/1.8.0' of ssh://git.mnml.gg:40022/~/mnml into release/1.8.0 2019-11-06 14:48:04 +11:00
ntr
7761a85dfd styles + rotate prompt 2019-11-06 14:47:59 +11:00
Mashy
b3ba8825e4 absorb changes 2019-11-06 13:10:00 +10:00
Mashy
59e1c9673b changelog 2019-11-06 10:58:59 +10:00
Mashy
c50bb97aa9 mobile drag fixes 2019-11-06 09:51:58 +10:00
Mashy
439cea1999 Merge branch 'release/1.8.0' of ssh://git.mnml.gg:40022/~/mnml into release/1.8.0 2019-11-05 16:11:24 +10:00
Mashy
3dec7111ec normal mode reduce z-index of avatar (collision with buttons) 2019-11-05 16:11:10 +10:00
ntr
73220211bb fix squares 2019-11-05 16:57:12 +11:00
ntr
c0eb1821d4 hex points for score squares 2019-11-05 16:52:15 +11:00
ntr
e1e7fed838 Merge branch 'release/1.8.0' of ssh://git.mnml.gg:40022/~/mnml into release/1.8.0 2019-11-05 16:40:03 +11:00
ntr
990803583c gzip, exit tutorial auto on mobile 2019-11-05 16:39:31 +11:00
Mashy
61f35ef9a9 give 125 mitigation stats by default 2019-11-05 15:04:16 +10:00
ntr
74a6e70c37 ctrl buttons margins 2019-11-05 15:58:56 +11:00
ntr
fba5673983 opponent effect alignment 2019-11-05 15:50:48 +11:00
ntr
d2d1bd7a4b s y m m e t r y 2019-11-05 15:47:28 +11:00
ntr
c317627a14 fixes and mobile tweaks 2019-11-05 15:31:52 +11:00
Mashy
13bc69628d reudce intercept cd and duration 2019-11-05 13:58:48 +10:00
Mashy
8bce5fd285 fix link 2019-11-05 13:56:43 +10:00
Mashy
2bafc2eac6 skill description font size 2019-11-05 13:29:59 +10:00
Mashy
72dc10c3ea disable tutorial if info is hidden 2019-11-05 12:46:43 +10:00
ntr
dfb796fd50 Merge branch 'release/1.8.0' of ssh://git.mnml.gg:40022/~/mnml into release/1.8.0 2019-11-05 13:07:28 +11:00
Mashy
4a67cab2b3 combiner fix 2019-11-05 12:04:02 +10:00
ntr
7c3d8821c6 Merge branch 'develop' into release/1.8.0 2019-11-05 13:00:09 +11:00
ntr
ec24e3a194 uppercase READY prompt 2019-11-05 13:00:06 +11:00
Mashy
48ef08fd2a Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-11-05 11:46:33 +10:00
Mashy
1c574e1dca only clear combiner if 1 item 2019-11-05 11:45:51 +10:00