2526 Commits

Author SHA1 Message Date
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
ntr
b82dee018a more smiley stuff 2019-11-04 21:42:44 +11:00
ntr
0042c6f432 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-11-04 20:47:26 +11:00
Mashy
d4169e86c3 clear drag on end 2019-11-04 18:19:32 +10:00
ntr
d767db40e9 fix link border 2019-11-04 18:53:36 +11:00
ntr
1fd7f15a3b add more smiley components 2019-11-04 18:47:20 +11:00
Mashy
02e739606c Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-11-04 17:36:55 +10:00
Mashy
e29ce1e30c firefox drag 2019-11-04 17:36:04 +10:00
ntr
f0c0ce7dd1 reminder msg 2019-11-04 18:02:51 +11:00
ntr
25b89da5c4 fix buttons after curse and invert swap 2019-11-04 18:00:40 +11:00
ntr
b743837870 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-11-04 17:59:46 +11:00
ntr
7ebd5e6768 Merge tag '1.7.1' into develop
1.7.1
2019-11-04 17:51:04 +11:00
ntr
1e24ab8cf2 Merge branch 'hotfix/1.7.1' 2019-11-04 17:50:59 +11:00
ntr
c3f28a3f1f don't panic when recharge event isn't found 2019-11-04 17:50:50 +11:00
Mashy
64ec68d823 fix recharge immunity bug 2019-11-04 16:35:28 +10:00
ntr
c036d97fbc v1.7.1 2019-11-04 17:29:21 +11:00
Mashy
bb50037e0e drag equipped items 2019-11-04 16:02:48 +10:00
Mashy
61b57827e3 label 2019-11-04 15:09:58 +10:00
Mashy
6f578f0747 init 2019-11-04 14:33:06 +10:00
Mashy
4fa13c20c2 misc 2019-11-04 13:25:23 +10:00
Mashy
7b1a6df40b landscape is the way 2019-11-04 10:27:22 +10:00
Mashy
a6473cb84c log 2019-11-04 10:22:44 +10:00
Mashy
18af9fb2c0 worklog 2019-11-04 09:42:20 +10:00
ntr
76fb591844 notifications added to events.notify 2019-11-02 15:52:50 +11:00
ntr
18f2ab5f7a player widths calc 2019-11-02 15:22:29 +11:00
ntr
9294471f47 combine mtx available list 2019-10-31 21:17:15 +11:00
ntr
ef5e5170cf remove molecular mtx 2019-10-31 20:43:09 +11:00