ntr
|
76a8db35e0
|
Merge tag '1.3.0' into develop
1.3.0
|
2019-09-06 17:45:22 +10:00 |
|
ntr
|
1b95e171a8
|
Merge branch 'release/1.3.0'
|
2019-09-06 17:45:17 +10:00 |
|
ntr
|
9358d0a99f
|
update info
|
2019-09-06 17:44:29 +10:00 |
|
ntr
|
c22c09a87b
|
greatly simplify recipes
|
2019-09-06 17:29:09 +10:00 |
|
ntr
|
fe04c0d2db
|
fix purge
|
2019-09-06 17:21:43 +10:00 |
|
ntr
|
6b84fe92d7
|
create and write construct skeletons
|
2019-09-06 16:40:03 +10:00 |
|
ntr
|
8a771240b1
|
fix welcome tabs sorta
|
2019-09-06 15:35:31 +10:00 |
|
ntr
|
c6cc7ddfe1
|
version bump
|
2019-09-06 15:21:16 +10:00 |
|
ntr
|
5da9c217d4
|
Merge branch 'menu-tabs' into develop
|
2019-09-06 15:20:48 +10:00 |
|
ntr
|
727c3ee6dc
|
delete unused components
|
2019-09-06 15:15:03 +10:00 |
|
ntr
|
a429f21367
|
tabbed menu
|
2019-09-06 15:13:10 +10:00 |
|
Mashy
|
b633820ca1
|
fix tests with stat change
|
2019-09-06 14:28:42 +10:00 |
|
Mashy
|
547127b9eb
|
inc base dmg, reduce health, specs bonuses are purely threshold from team colour
|
2019-09-06 13:40:29 +10:00 |
|
ntr
|
7af81c5252
|
woah
|
2019-09-06 12:13:54 +10:00 |
|
Mashy
|
849a89ac4e
|
non item skill +
|
2019-09-05 23:02:01 +10:00 |
|
Mashy
|
21f3a80752
|
more ++ fixes, shows + during anims
|
2019-09-05 22:41:36 +10:00 |
|
ntr
|
60d9ea5198
|
better vbox touches
|
2019-09-04 21:20:05 +10:00 |
|
ntr
|
db377ff7b2
|
Merge branch 'develop' into menu-tabs
|
2019-09-04 20:16:37 +10:00 |
|
ntr
|
968d0a01aa
|
icon svg info
|
2019-09-04 17:44:15 +10:00 |
|
ntr
|
2e37dc55ac
|
instance lobby timeout fixes
|
2019-09-04 17:37:54 +10:00 |
|
Mashy
|
b5e09ba343
|
Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop
|
2019-09-04 17:06:58 +10:00 |
|
Mashy
|
fc73dadca5
|
horizontal align figcaption
|
2019-09-04 17:06:36 +10:00 |
|
ntr
|
f9ccfb1fc2
|
Merge tag '1.2.0' into develop
1.2.0
|
2019-09-04 17:02:54 +10:00 |
|
ntr
|
9c395bf825
|
Merge branch 'release/1.2.0'
|
2019-09-04 17:02:49 +10:00 |
|
ntr
|
70eb982aca
|
Merge branch 'develop' into release/1.2.0
|
2019-09-04 16:45:37 +10:00 |
|
ntr
|
23b4fd7f76
|
Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop
|
2019-09-04 16:45:31 +10:00 |
|
Mashy
|
5c946c559b
|
spec combos preview
|
2019-09-04 16:40:53 +10:00 |
|
ntr
|
0ca193421e
|
version bump
|
2019-09-04 16:39:07 +10:00 |
|
ntr
|
d643884b2c
|
Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop
|
2019-09-04 16:38:14 +10:00 |
|
ntr
|
b910f99f89
|
improve pvp queue
|
2019-09-04 16:38:03 +10:00 |
|
Mashy
|
1600ca6c82
|
fix ++ spec display in vbox
|
2019-09-04 16:25:28 +10:00 |
|
Mashy
|
2dc90db185
|
Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop
|
2019-09-04 15:35:00 +10:00 |
|
Mashy
|
285d574934
|
serde rename items
|
2019-09-04 15:34:43 +10:00 |
|
ntr
|
a16369085c
|
do not kill listener threads on error
|
2019-09-04 15:23:35 +10:00 |
|
ntr
|
7a7b75a698
|
Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop
|
2019-09-04 15:15:23 +10:00 |
|
ntr
|
f0a6743238
|
remove title
|
2019-09-04 15:15:16 +10:00 |
|
Mashy
|
ce72522314
|
show components for skills
|
2019-09-04 14:54:49 +10:00 |
|
ntr
|
b8c1380f88
|
Merge branch 'develop' into menu-tabs
|
2019-09-03 17:02:18 +10:00 |
|
ntr
|
31f353153b
|
worklog dones
|
2019-09-03 17:01:59 +10:00 |
|
ntr
|
c83172ca3d
|
pvp queue join messages
|
2019-09-03 16:15:40 +10:00 |
|
ntr
|
e4a952ecbb
|
Merge tag '1.1.0' into develop
1.1.0
|
2019-09-03 16:15:03 +10:00 |
|
ntr
|
c25cdbe9e4
|
Merge branch 'release/1.1.0'
|
2019-09-03 16:14:50 +10:00 |
|
ntr
|
3056d08e71
|
version bump and version bin
|
2019-09-03 12:51:00 +10:00 |
|
ntr
|
7603497372
|
dev stripe checks
|
2019-09-03 11:29:05 +10:00 |
|
ntr
|
fbb7e58f3c
|
make socket url dynamic
|
2019-09-03 10:57:57 +10:00 |
|
ntr
|
2728be796e
|
fix pvp instance state push notification
|
2019-09-03 10:02:32 +10:00 |
|
ntr
|
3a382eb97d
|
Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop
|
2019-09-02 19:09:23 +10:00 |
|
ntr
|
ff2830fea3
|
Merge tag '1.0.1' into develop
1.0.1
|
2019-09-02 19:09:15 +10:00 |
|
ntr
|
5d4d78c390
|
Merge branch 'release/1.0.1'
|
2019-09-02 19:09:11 +10:00 |
|
ntr
|
f3237ffe51
|
fix plan id
|
2019-09-02 19:09:04 +10:00 |
|