1670 Commits

Author SHA1 Message Date
Mashy
e6e7713539 remove inversion event 2019-10-23 19:17:57 +10:00
Mashy
14cb075161 fix animCb logic from stalling 2019-10-23 15:49:46 +10:00
Mashy
b120fdc08e Merge branch 'develop' into ko-anims 2019-10-23 15:23:35 +10:00
ntr
06b987e877 big play rework 2019-10-23 16:11:04 +11:00
ntr
82da5da23e Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-10-23 13:10:00 +11:00
ntr
9b1cb34e7b bold winner text 2019-10-23 13:09:56 +11:00
Mashy
2e1b298bbf remove client from deciding event stages wip 2019-10-23 12:08:21 +10:00
ntr
0aed7cfe73 remove old scoreboard and fadein faceoff text 2019-10-23 13:01:53 +11:00
Mashy
6371e02672 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-10-23 11:13:25 +10:00
Mashy
bd518e1613 fix background highlighted on dbl click 2019-10-23 11:13:09 +10:00
ntr
088098daa4 npm updates and password hints 2019-10-23 11:41:53 +11:00
Mashy
9590f1668d Plus -> + for specs 2019-10-23 09:06:49 +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
c522180366 faceoff text for start, win, lose 2019-10-22 13:15:57 +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
ntr
6a0d03c49d 'fix' play ctrl styles 2019-10-21 17:03:53 +11:00
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