2396 Commits

Author SHA1 Message Date
Mashy
d4169e86c3 clear drag on end 2019-11-04 18:19:32 +10: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
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
ntr
bfecea9a4e add smile mtx 2019-10-31 20:35:41 +11:00
ntr
9d2da3249a colour faces 2019-10-31 19:59:40 +11:00
ntr
200e4b4cb7 it's happening 2019-10-31 19:50:52 +11:00
ntr
210a6cfb64 Merge branch 'develop' into face-imgs 2019-10-31 18:10:30 +11:00
ntr
39972d6e3d Merge tag '1.7.0' into develop
1.7.0
2019-10-31 18:05:47 +11:00
ntr
1a9a645a46 Merge branch 'release/1.7.0' 2019-10-31 18:05:42 +11:00
ntr
26e69f6077 changelog 2019-10-31 18:05:37 +11:00
ntr
17af7ceb03 Merge branch 'develop' into face-imgs 2019-10-31 17:37:38 +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
0ce19240f7 increase buff duration 2T->3T 2019-10-31 15:41:20 +10: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
ea6936940a 50% slay self heal increase dmg, minor blast nerf 2019-10-30 15:45:59 +10:00
Mashy
31bfffab26 remove inventory hover text again, buff hybridblast / hastestrike dmg 2019-10-30 15:34:58 +10:00
Mashy
2c77d035bd moar haste / hybrid buffs 2019-10-30 14:14:57 +10:00
Mashy
0009e1fb5b tutorial text, vbox hover inventory 2019-10-30 13:17:06 +10:00
Mashy
39be7b952f don't sort vbox after combine 2019-10-29 18:36:15 +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
Mashy
75f4c6236a separate out demo tab 2019-10-29 13:05:19 +10:00
Mashy
d665eec8a7 changelog 2019-10-29 12:28:36 +10:00
Mashy
663faa2b24 replace single quotes with double quotes (was causing curse to bug out) 2019-10-29 12:14:20 +10:00
Mashy
a254c1d0a7 client side descriptions, add counterattack anim 2019-10-29 11:49:41 +10:00