1298 Commits

Author SHA1 Message Date
Mashy
fe177df80a improve copy link 2019-10-20 17:31:37 +10:00
ntr
936bc7ac94 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-10-20 17:08:49 +11:00
ntr
d6487cdb07 don't reconnect 2019-10-20 17:06:39 +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
Mashy
05855af04a siphon & slay have green power scaling 2019-10-18 15:11:57 +10: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
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
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
935d1d47ee fix combo highlighting (some rare case like 2 green) 2019-10-16 16:17:02 +10: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
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
ntr
15cde076de chaos filters 2019-10-16 11:14:31 +11:00
Mashy
1abe4ed08e button borders across the board 2019-10-15 22:06:41 +10:00
ntr
b386057326 animate borders 2019-10-15 17:44:05 +11:00
Mashy
b2e4570bfb coloured border experiment 2019-10-15 16:05:58 +10:00
ntr
7cab0a6f18 combo counts 2019-10-15 11:57:57 +11:00
ntr
eaf50c3a26 combiner fixes 2019-10-15 11:36:15 +11:00
ntr
f2a516b5f0 fix few bugs 2019-10-15 10:00:42 +11:00
ntr
dc7e8a91e6 better styles for effects and skills 2019-10-10 18:19:36 +11:00
ntr
d134bc8cf3 better demo 2019-10-10 18:04:25 +11:00
ntr
d8adff0203 Merge branch 'tos' into release/1.5.4 2019-10-10 15:33:24 +11:00
ntr
91f01ff799 update tos html 2019-10-10 15:33:12 +11:00
ntr
43a53e5651 various pax things 2019-10-10 15:00:45 +11:00
Mashy
4b7eecd4f4 misc var 2019-10-10 13:41:17 +10:00
Mashy
2a84ea2caf new tos 2019-10-10 08:33:29 +10:00
Mashy
d8ff256735 terms of service, pop up new html 2019-10-09 15:42:50 +10:00
ntr
60f767185d fix swipe issue 2019-10-09 13:21:04 +11:00
ntr
681162980f logrocket accounts 2019-10-09 08:35:05 +11:00
ntr
a28898cd82 mobile menu fixes 2019-10-08 16:05:42 +11:00
ntr
cf05487c6d good shit 2019-10-08 15:51:05 +11:00
ntr
7437111cac flat colour siphon 2019-10-08 15:32:56 +11:00
Mashy
e93b56541f timing sync fixes, block timer during animation, remove timeout for POST_ONLY 2019-10-08 13:35:39 +10:00
ntr
9c1f0ba9e9 position absolute game 2019-10-08 12:52:22 +11:00
ntr
8a41778c9d borders for mobile 2019-10-08 12:09:44 +11:00
Mashy
14bc1819ed Merge remote-tracking branch 'origin/pax' into develop 2019-10-08 11:08:26 +10:00
ntr
504b0826d1 gud 2019-10-07 18:48:47 +11:00