1720 Commits

Author SHA1 Message Date
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
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
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
707b3c6217 change wheel 2019-11-04 22:08:54 +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
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
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
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
510a6932de v1.7.0 2019-10-31 17:23:47 +11:00
Mashy
5f2e73e373 formatting 2019-10-31 16:08:29 +10:00
Mashy
88194975ac setTutorial false 2019-10-31 16:07:45 +10:00
ntr
38177f84e9 disable tutorial via localstorage" 2019-10-31 16:59:26 +11:00
Mashy
1be37161ef info description fix 2019-10-31 15:34:05 +10:00
Mashy
b554464802 should comp updates 2019-10-31 11:50:27 +10:00
Mashy
d52efc6c01 refactor info.comp 2019-10-31 10:49:43 +10:00
Mashy
e4f091b2b8 more description improvements 2019-10-30 18:02:50 +10:00
Mashy
31bfffab26 remove inventory hover text again, buff hybridblast / hastestrike dmg 2019-10-30 15:34:58 +10:00
Mashy
0009e1fb5b tutorial text, vbox hover inventory 2019-10-30 13:17:06 +10:00
Mashy
83a87a64e3 add inventory info hover if you have 1 or less items in inventory 2019-10-29 17:49:32 +10:00
Mashy
8ce7edd841 actually fix curse (anime doesn't seem to reset 'reverse') 2019-10-29 17:32:22 +10:00
Mashy
188ae0de6a vbox demo generate random skill combos, disable part of broken curse anim 2019-10-29 16:11:00 +10:00
Mashy
0c3cd46ce2 speed up the demo 2019-10-29 13:33:24 +10:00