1374 Commits

Author SHA1 Message Date
ntr
437eaf8039 Merge branch 'develop' of ssh://mnml.gg:40022/~/mnml into develop 2019-08-09 15:40:15 +10:00
ntr
490cc358c0 margins 2019-08-09 15:39:48 +10:00
ntr
b8d1c78f61 remove resolution 2019-08-09 15:38:09 +10:00
ntr
ee032696da transition 2019-08-09 14:47:12 +10:00
ntr
64101786cf fix info 2019-08-09 14:34:54 +10:00
ntr
11ac600300 names' 2019-08-08 21:07:02 +10:00
ntr
65503c6800 few styles 2019-08-08 20:43:41 +10:00
ntr
4b5aa62140 game controls 2019-08-08 20:20:11 +10:00
ntr
d74ca61d57 vbox bottom 2019-08-08 18:05:08 +10:00
ntr
4906eb3e39 init 2019-08-08 16:27:23 +10:00
Mashy
c16bfab12a nav to list after setting team 2019-07-30 20:49:16 +10:00
Mashy
6abc982fec Merge branch 'mm' into develop 2019-07-30 18:48:55 +10:00
Mashy
c1b5f09d42 fix absorb, purge, electrocute, end of game bugs 2019-07-30 17:55:16 +10:00
ntr
a960c71e76 version 2019-07-30 15:05:25 +10:00
ntr
17c2c9708c team update 2019-07-30 13:25:06 +10:00
ntr
3fcbedb5e3 join play and account team change' 2019-07-30 13:18:47 +10:00
ntr
97b3943d18 join buttons 2019-07-30 13:17:31 +10:00
ntr
8a24019ff6 blue 2019-07-30 01:08:44 +10:00
ntr
c94b6f134c sheeeeeeeeeeeeeeeeeeeeeeeeeeit 2019-07-30 00:48:40 +10:00
ntr
8cd0f1af36 team setting and postgres constraint 2019-07-29 00:11:46 +10:00
ntr
9fdda7c52c remove instance list 2019-07-27 21:01:58 +10:00
ntr
66223033b0 practice rpc 2019-07-27 19:24:52 +10:00
Mashy
fb84e1becf clear skills during anim phase 2019-07-27 11:23:55 +10:00
Mashy
f295235b52 fn names 2019-07-26 21:30:20 +10:00
Mashy
abd35b8bef spawning constructs (no mtx yet) 2019-07-26 21:22:11 +10:00
Mashy
61fa990a15 wip team select back in 2019-07-26 14:00:01 +10:00
Mashy
a3a2cf9852 fix team nav bug 2019-07-25 14:29:05 +10:00
ntr
384cdb2de5 better decay 2019-07-24 13:35:03 +10:00
ntr
d431ada7a9 reclaim button fixes 2019-07-24 12:21:04 +10:00
ntr
9dc840765c styles and blast 2019-07-24 12:04:18 +10:00
ntr
16c83a529b vbox actions 2019-07-23 20:42:54 +10:00
ntr
3bb0dcca3e vbox second buy method 2019-07-23 20:19:43 +10:00
ntr
0c8f0f819c mad circles 2019-07-23 19:09:35 +10:00
ntr
8e8a6a3673 Merge branch 'develop' of ssh://mnml.gg:40022/~/mnml into develop 2019-07-23 19:09:30 +10:00
ntr
bce277d28b worklog and vbox circles 2019-07-23 19:04:20 +10:00
Mashy
441cf3bc47 fix buff and debuff 2019-07-23 18:29:19 +10:00
Mashy
2dc929de40 Merge remote-tracking branch 'origin/develop' into develop 2019-07-23 18:07:39 +10:00
Mashy
4c68d11a28 aoe targetting fixed 2019-07-23 18:04:33 +10:00
ntr
12ff5aec66 add break cb 2019-07-23 17:18:56 +10:00
ntr
420b3b71e9 actually fix cb 2019-07-23 17:08:12 +10:00
ntr
c248ab40f9 fix cb 2019-07-23 17:05:45 +10:00
ntr
5baffffd69 icon stuff 2019-07-23 17:01:43 +10:00
ntr
7c8f724209 Merge branch 'develop' into line-anims 2019-07-23 16:42:11 +10:00
ntr
341f4dda09 blast and text colours 2019-07-23 16:40:40 +10:00
ntr
eef880e052 attak 2019-07-23 16:01:07 +10:00
Mashy
ef11d14752 fix cb for banish/invert 2019-07-23 15:57:50 +10:00
Mashy
d03eec1423 Merge branch 'develop' of ssh://mnml.gg:40022/~/mnml into develop 2019-07-23 15:05:19 +10:00
Mashy
a816e75554 return cb from anim componentWillUnmount() 2019-07-23 15:05:03 +10:00
ntr
4c6ee01b5d Merge branch 'develop' of ssh://mnml.gg:40022/~/mnml into develop 2019-07-23 14:21:09 +10:00
ntr
10369dee17 less 2019-07-23 14:17:46 +10:00