2280 Commits

Author SHA1 Message Date
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
ntr
15171f97e2 move abandon btn 2019-09-22 13:16:59 +10:00
ntr
47135836b4 styles 2019-09-21 17:35:13 +10:00
ntr
bec7685f7b solidify controls 2019-09-21 17:22:50 +10:00
ntr
0ec6bdaad5 Merge branch 'develop' into msg-pane 2019-09-21 16:23:03 +10:00
ntr
dffbbcc5eb Merge tag '1.4.8' into develop
1.4.8
2019-09-21 16:22:38 +10:00
ntr
ae57f6fedb Merge branch 'release/1.4.8' 2019-09-21 16:22:33 +10:00
ntr
b7253d930a Merge branch 'release/1.4.8' of ssh://git.mnml.gg:40022/~/mnml into release/1.4.8 2019-09-20 21:11:43 +10:00
Mashy
1d778ecc17 null animTarget bug 2019-09-20 16:44:14 +10:00
ntr
f6a4f87446 itemspeed 2019-09-20 16:23:45 +10:00
ntr
54c2dc728d Merge branch 'release/1.4.8' of ssh://git.mnml.gg:40022/~/mnml into release/1.4.8 2019-09-20 16:14:17 +10:00
ntr
6e1a0a6ad2 set account id on fetch 2019-09-20 16:14:12 +10:00
Mashy
7cd6a0979c Merge branch 'release/1.4.8' of ssh://git.mnml.gg:40022/~/mnml into release/1.4.8 2019-09-20 15:41:09 +10:00
Mashy
67654cbbab use server calc speeds 2019-09-20 15:40:53 +10:00
Mashy
2e366e2eca speed fix, counter fix, client side anim fix 2019-09-20 15:34:09 +10:00
ntr
14070ac5c4 fix game skill clear 2019-09-20 15:32:21 +10:00
ntr
1b71c79bb9 name max len of 20 2019-09-20 14:56:49 +10:00
ntr
2894e346e3 v1.4.8 2019-09-20 14:09:09 +10:00
ntr
c34958d000 logo cleanout 2019-09-20 14:08:31 +10:00
Mashy
40f6073977 use cd pub type 2019-09-20 13:06:37 +10:00
Mashy
6fba9d9f4d show skill delay on info 2019-09-20 13:03:13 +10:00
Mashy
3ad679cb02 vbox show costs, penalty for combo sale 2019-09-20 12:22:48 +10:00
ntr
ee21d7ee06 boxes wit msgs 2019-09-20 12:16:37 +10:00