2395 Commits

Author SHA1 Message Date
Mashy
8ac1b964b8 changelog 2019-10-23 08:39:40 +10:00
Mashy
1ec43cd6b0 add inventory tutorial step 2019-10-23 08:26:15 +10:00
Mashy
ec3a2a0ce5 highlight colours for noobs 2019-10-22 20:07:33 +10:00
Mashy
4edeb6d315 change win text 2019-10-22 14:24:30 +10:00
Mashy
21d55e27b0 add back overflow to body 2019-10-22 14:11:01 +10:00
Mashy
c522180366 faceoff text for start, win, lose 2019-10-22 13:15:57 +10:00
Mashy
c05ad8637f stop idle construct movement causing overflow 2019-10-22 11:58:00 +10:00
Mashy
7dc22bca90 Merge branch 'home-page-change' of ssh://git.mnml.gg:40022/~/mnml into home-page-change 2019-10-22 11:12:48 +10:00
Mashy
56f3647025 clear mtxActive on nav and if you join game. put shop before reshape 2019-10-22 11:12:25 +10:00
ntr
e3f906ef19 fix siphon anim 2019-10-22 11:46:14 +11:00
Mashy
a304f003d0 added sub back to home, controls on reshape menu 2019-10-22 10:28:28 +10:00
Mashy
0c9c4a7692 add reshape tab, remove mtx from play page 2019-10-22 09:52:24 +10:00
Mashy
36c9236842 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-10-21 19:41:55 +10:00
Mashy
8e6048b912 fix tick speed bug with new application 2019-10-21 19:40:19 +10:00
ntr
6a0d03c49d 'fix' play ctrl styles 2019-10-21 17:03:53 +11:00
ntr
68eb2fa1b4 wip 2019-10-21 17:01:10 +11:00
ntr
44df93b028 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-10-21 15:17:56 +11:00
ntr
25cda59773 workog 2019-10-21 12:55:10 +11:00
Mashy
fa1135170b worklog 2019-10-21 10:43:14 +10:00
Mashy
fe177df80a improve copy link 2019-10-20 17:31:37 +10:00
Mashy
487bca473e Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-10-20 16:53:03 +10:00
Mashy
97f96a9fa2 misc log 2019-10-20 16:52:50 +10:00
ntr
7799b2d9a4 Merge tag '1.6.2' into develop
1.6.2
2019-10-20 17:44:26 +11:00
ntr
34a039f456 Merge branch 'release/1.6.2' 2019-10-20 17:44:22 +11:00
ntr
ded1a4cc06 Changelog 2019-10-20 17:44:14 +11:00
ntr
fb3fa6eaca v1.6.2 2019-10-20 17:09:40 +11:00
ntr
936bc7ac94 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-10-20 17:08:49 +11:00
ntr
2d0e564752 Merge tag '1.6.1' into develop
1.6.1
2019-10-20 17:08:09 +11:00
ntr
f398b6c925 Merge branch 'release/1.6.1' 2019-10-20 17:06:50 +11:00
ntr
d6487cdb07 don't reconnect 2019-10-20 17:06:39 +11:00
Mashy
cf7c3d1ac7 logs 2019-10-20 15:54:45 +10:00
ntr
79add6bf67 v1.6.1 2019-10-20 16:05:51 +11:00
ntr
2a14fbd3f5 update ctrls and add try catch for socket send 2019-10-20 16:05:40 +11:00
Mashy
53725e1522 proper combiner preview check, clear skill info on anim start 2019-10-20 12:57:56 +10:00
ntr
c111cfe2b8 Merge tag '1.6.0' into develop
1.6.0
2019-10-18 17:40:37 +11:00
ntr
0b55484c14 Merge branch 'release/1.6.0' 2019-10-18 17:40:31 +11:00
ntr
525ad57707 changelog 2019-10-18 17:40:18 +11:00
ntr
d1866a4fda only send chat clear after a msg 2019-10-18 17:21:01 +11:00
ntr
ff48288ae2 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into release/1.6.0 2019-10-18 17:19:05 +11:00
Mashy
8f99e07e81 flash quit / back button 2019-10-18 16:18:33 +10:00
ntr
0ee39111cb fix random broken styles 2019-10-18 17:14:11 +11:00
ntr
a2547f87b8 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into release/1.6.0 2019-10-18 16:17:49 +11:00
Mashy
0dc272df96 changelog 2019-10-18 15:16:59 +10:00
Mashy
05855af04a siphon & slay have green power scaling 2019-10-18 15:11:57 +10:00
ntr
c0be03f0e3 don't internal error msg spam 2019-10-18 16:08:05 +11:00
ntr
65bc2ac729 v1.6.0 2019-10-18 15:53:46 +11:00
ntr
aa5b76551f fix game btns 2019-10-18 15:51:45 +11:00
ntr
daa1b6214b Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-10-18 15:43:19 +11:00
ntr
4b216775cd game btns 2019-10-18 15:43:08 +11:00
ntr
ddca205f0c chat wheelu 2019-10-18 15:38:40 +11:00