2516 Commits

Author SHA1 Message Date
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
Mashy
fb8b4a159c changelog 2019-10-18 13:23:41 +10:00
Mashy
1a0f427715 worklog 2019-10-18 10:24:08 +10:00
Mashy
8753d97650 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-10-18 10:09:46 +10:00
Mashy
b54c394316 mobile description text 2019-10-18 10:09:02 +10:00
Mashy
06897e0e43 safety in case null combo (shouldn't happen anyway) 2019-10-18 09:37:58 +10:00
Mashy
85497bfbf2 preview combiner 2019-10-18 09:30:01 +10:00
ntr
189d1023c6 remove nav 2019-10-18 10:16:20 +11:00
Mashy
b71cc8fc0f effect descriptions, skill speed in game info, fix block stages 2019-10-17 21:47:55 +10:00
Mashy
38899d31d0 disable hover info during anim 2019-10-17 17:44:05 +10:00
Mashy
b896a7ee42 skill info on hover in effect box 2019-10-17 16:25:31 +10:00
ntr
3104c841df chat wip 2019-10-17 15:14:38 +11:00
ntr
057ea9b528 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-10-17 13:54:46 +11:00
ntr
dd1085a6d4 redact game and instance states 2019-10-17 13:54:30 +11:00
Mashy
b0537d758b changelog 2019-10-17 11:30:00 +10:00
ntr
924a7d40ac Merge tag '1.5.6' into develop
1.5.6
2019-10-17 11:56:03 +11:00
ntr
cf39e006cd Merge branch 'release/1.5.6' 2019-10-17 11:55:47 +11:00
ntr
47d060432c v1.5.6 2019-10-17 11:24:29 +11:00
Mashy
245cb603fc improve check 2019-10-17 09:33:26 +10:00
Mashy
ea5d908893 vbox highlight for combiner 2019-10-16 18:27:06 +10:00
Mashy
03a0953b46 background highlight equip slots 2019-10-16 17:26:03 +10:00
Mashy
c444ae7d78 Merge branch 'border-colours' of ssh://git.mnml.gg:40022/~/mnml into border-colours 2019-10-16 16:17:22 +10:00
Mashy
935d1d47ee fix combo highlighting (some rare case like 2 green) 2019-10-16 16:17:02 +10:00
ntr
f2ae3e5212 fade to gray to prevent rainbowing 2019-10-16 16:18:24 +11:00
ntr
f167ff82bb don't double up combo highlight check and make backgrounds so you can always see colours 2019-10-16 16:16:17 +11:00
Mashy
62aa801692 Merge branch 'border-colours' of ssh://git.mnml.gg:40022/~/mnml into border-colours 2019-10-16 14:21:02 +10:00
Mashy
5dbdc3762f highlight potential inv combos 2019-10-16 14:20:44 +10:00
ntr
4ed8be2fc0 disable animations on disabled buttons 2019-10-16 12:10:38 +11:00
ntr
66f80629cd pimp siphon 2019-10-16 12:06:22 +11:00
ntr
972923a0c9 Merge branch 'border-colours' of ssh://git.mnml.gg:40022/~/mnml into border-colours 2019-10-16 11:16:18 +11:00