770 Commits

Author SHA1 Message Date
Mashy
1600ca6c82 fix ++ spec display in vbox 2019-09-04 16:25:28 +10:00
Mashy
2dc90db185 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-09-04 15:35:00 +10:00
Mashy
285d574934 serde rename items 2019-09-04 15:34:43 +10:00
ntr
a16369085c do not kill listener threads on error 2019-09-04 15:23:35 +10:00
ntr
c83172ca3d pvp queue join messages 2019-09-03 16:15:40 +10:00
ntr
2728be796e fix pvp instance state push notification 2019-09-03 10:02:32 +10:00
ntr
a5199b7d4b resubscribe button 2019-08-29 12:54:36 +10:00
ntr
ffc070ed51 email and sub status 2019-08-29 12:43:06 +10:00
ntr
d7b887e1ad stripe verify 2019-08-28 19:21:29 +10:00
ntr
d726aa8d33 stripe sub cancellations 2019-08-28 18:57:23 +10:00
ntr
a733cf77c9 events 2019-08-27 11:03:38 +10:00
ntr
e57f72940d don't bail the tx when looking for a mail account 2019-08-26 19:30:38 +10:00
ntr
2da5684156 email state 2019-08-26 19:09:49 +10:00
ntr
1e96a8ee5a Merge branch 'develop' into release/0.3.0 2019-08-26 18:43:41 +10:00
ntr
65514f576a welcome to mnml 2019-08-26 18:43:05 +10:00
ntr
6ff292ff3c email recovery 2019-08-26 14:28:46 +10:00
ntr
b75edcda66 send emails and confirm 2019-08-26 00:40:33 +10:00
ntr
df1ccdb8cd email http functions 2019-08-25 18:47:40 +10:00
ntr
b9f4a67e0c telegraf 2019-08-22 22:35:18 +10:00
ntr
682be021b7 escape msg 2019-08-20 14:08:06 +10:00
ntr
796e5835e9 sweet beautiful fern 2019-08-20 13:35:05 +10:00
Mashy
d995e936ad fix ko electrify (effect removal in post effect) 2019-08-19 18:21:01 +10:00
ntr
ee60167d1e Merge branch 'account' into develop 2019-08-17 17:52:12 +10:00
Mashy
9cc4995959 spec goal overflow 2019-08-15 15:37:32 +10:00
ntr
8684f32db2 nginx acp stuff 2019-08-14 17:40:01 +10:00
ntr
6fe9b52d00 fk axios 2019-08-14 15:23:15 +10:00
Mashy
fbf0eead04 tidy up info strings 2019-08-14 13:28:02 +10:00
ntr
f68a12eab8 acp routing 2019-08-14 11:31:12 +10:00
Mashy
8a74d9e3c4 wip added svg icons into description strings 2019-08-14 00:51:01 +10:00
ntr
143b0e92cb support email 2019-08-13 14:44:44 +10:00
ntr
f0166a1779 password change 2019-08-13 12:26:32 +10:00
ntr
b4dccf9f1c login pimpout 2019-08-12 14:11:53 +10:00
ntr
89d2b39823 account wip 2019-08-09 22:48:58 +10:00
ntr
437eaf8039 Merge branch 'develop' of ssh://mnml.gg:40022/~/mnml into develop 2019-08-09 15:40:15 +10:00
ntr
11ac600300 names' 2019-08-08 21:07:02 +10:00
Mashy
f6f9b8c79e fix stun rpc (dupe entry) 2019-07-30 19:06:43 +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
69c95c27ac fix cookies on ws auth 2019-07-30 15:43:01 +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
c94b6f134c sheeeeeeeeeeeeeeeeeeeeeeeeeeit 2019-07-30 00:48:40 +10:00
ntr
fd518ba4e2 breakage inc 2019-07-29 18:08:24 +10:00
ntr
1940c437b0 names and hiero 2019-07-29 12:20:56 +10:00
ntr
e5c8b78ec1 names 2019-07-29 00:24:10 +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
84c0a187c2 pay for constructs 2019-07-27 11:12:00 +10:00
Mashy
f295235b52 fn names 2019-07-26 21:30:20 +10:00