2252 Commits

Author SHA1 Message Date
Mashy
0f1ae4d17a background for active skills 2019-10-03 15:21:19 +10:00
Mashy
962b72b85f fix recharge show current red / blue life during combat, skip if 0 recharge and apply css 2019-10-02 16:06:39 +10:00
Mashy
16d319c706 reflect no longer triggers on ticks 2019-10-02 14:39:36 +10:00
Mashy
85ec220511 fix electrocute reflect 2019-10-02 12:37:11 +10:00
Mashy
86b73fc71a match electric buff check 2019-10-01 17:16:18 +10:00
Mashy
d44acdffd5 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-10-01 16:35:06 +10:00
Mashy
defcadbad2 remove double tick dots, lose electrify on application 2019-10-01 16:34:51 +10:00
ntr
2cab610575 meta tags 2019-10-01 15:54:48 +10:00
ntr
0ac6629624 logrocket 2019-09-30 21:18:48 +10:00
ntr
494b572cb9 Merge tag '1.5.2' into develop
1.5.2
2019-09-30 21:15:15 +10:00
ntr
87ffb48b7e Merge branch 'release/1.5.2' 2019-09-30 21:15:11 +10:00
ntr
0c7d9fea98 v1.5.2 2019-09-30 19:29:24 +10:00
ntr
b9dae8e1b5 logo 2019-09-30 19:28:52 +10:00
Mashy
38e0a09a8a catch null instance 2019-09-30 17:08:01 +10:00
Mashy
4da209fdc1 combat phase components 2019-09-30 16:38:36 +10:00
Mashy
1737f6de6c show skill colour components during combat 2019-09-30 13:28:33 +10:00
Mashy
765d82bc62 skip co, remove absorb buff when you get absorption, don't trigger some effects when ko 2019-09-29 17:56:05 +10:00
Mashy
dab3b8da53 OSfrog tests 2019-09-25 20:22:53 +10:00
Mashy
124f144a2b OSfrog Clap 2019-09-25 20:16:58 +10:00
ntr
ed716f43b6 footer return false 2019-09-25 12:30:52 +10:00
ntr
c6853674a7 uhhh 2019-09-25 12:18:19 +10:00
ntr
7235ae6dca fixed pos 2019-09-25 12:16:04 +10:00
ntr
3fc53b282a Merge tag '1.5.1' into develop
1.5.1
2019-09-24 15:10:53 +10:00
ntr
771a2aad53 Merge branch 'release/1.5.1' 2019-09-24 15:10:49 +10:00
ntr
39e9e7493d v1.5.1 2019-09-24 14:34:06 +10:00
ntr
460a25c81a scrolling fix 2019-09-24 14:32:37 +10:00
ntr
c19e8ac30e Merge branch 'develop' into mobile-fixes 2019-09-24 13:50:06 +10:00
ntr
0d3c4374ba swiping pog 2019-09-24 13:49:34 +10:00
Mashy
9af3fd3155 green power base, spec inconsistency 2019-09-24 13:34:01 +10:00
ntr
b681c9218a ??? 2019-09-24 12:29:05 +10:00
ntr
5fb44ee226 vbox 2019-09-23 21:42:54 +10:00
ntr
c2120a602b mobile styles 2019-09-23 21:30:01 +10:00
Mashy
58ff97a071 remove spec multi 2019-09-23 15:31:05 +10:00
Mashy
b57a076ac1 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-09-23 14:23:37 +10:00
Mashy
6997a7a7c9 item descriptions and worklog 2019-09-23 14:23:22 +10:00
ntr
f6ff6d37e3 patch uuid generator into migrations 2019-09-23 14:11:40 +10:00
ntr
8992fed591 don't create account img on register 2019-09-23 13:54:06 +10:00
ntr
7bfe40f3b9 Merge tag '1.5.0' into develop
1.5.0
2019-09-22 20:29:03 +10:00
ntr
2d4e6ef22a Merge branch 'release/1.5.0' 2019-09-22 20:28:59 +10:00
ntr
babbeae3e0 big leave btn 2019-09-22 20:03:31 +10:00
ntr
c4f95d57f2 fix game btns 2019-09-22 19:29:34 +10:00
ntr
1bb741f885 v1.5.0 2019-09-22 19:10:36 +10:00
ntr
c8d4744836 remove placeholders 2019-09-22 18:54:44 +10:00
ntr
8ce54cfaf1 player box 2019-09-22 18:54:17 +10:00
ntr
9bf700bd75 mtx images 2019-09-22 18:45:30 +10:00
ntr
c4a291e890 account apply 2019-09-22 18:36:03 +10:00
ntr
8151c37f96 account box 2019-09-22 18:10:05 +10:00
ntr
05e1b19d11 account and player img 2019-09-22 17:25:28 +10:00
ntr
a81f3323ba availabe mtx btn fix 2019-09-22 15:24:21 +10:00
ntr
6d769ba26d cleanup 2019-09-22 13:22:14 +10:00