2652 Commits

Author SHA1 Message Date
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
ntr
a2a251904f v1.8.0 2019-11-05 12:45:08 +11:00
ntr
06a62ca3ae Merge branch 'develop' into force-landscape 2019-11-05 12:35:27 +11:00
ntr
d270df8abb Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-11-05 12:25:14 +11:00
ntr
ce967109fb remove old hammer and swiping code 2019-11-05 12:24:41 +11:00
Mashy
6809e2016b add clear instance back 2019-11-05 11:01:52 +10:00
Mashy
165c0b82a3 vboxUnequipApply aka swap construct items 2019-11-05 10:39:12 +10:00
ntr
51bd39dc3d vbox stroke width 2019-11-05 11:38:26 +11:00
ntr
e8226ce1ee fix stuff that got broken 2019-11-05 11:30:45 +11:00
ntr
a13f67a573 wip 2019-11-05 11:22:34 +11:00
Mashy
e5314a2257 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-11-05 10:01:25 +10:00
Mashy
c4e42457be equip items from vbox 2019-11-05 10:00:40 +10:00
ntr
9144033f1d lint 2019-11-04 22:38:07 +11:00
ntr
707b3c6217 change wheel 2019-11-04 22:08:54 +11:00