Merge tag '1.6.0' into develop

1.6.0

CHANGELOG.md

@@ -2,7 +2,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [1.5.7] - 2019-10-18
+## [1.6.0] - 2019-10-18
+### Added
+- Subscriber chat!
+
 ### Changed
  - Made available skill / effect information during the combat phase.
     - Highlighting a skill replace the effect area with the skill description including speed multiplier.
@@ -14,6 +17,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
     - Slay now deals red damage based RedPower and GreenPower. Previously only based on RedPower.
     - Siphon now deals blue damage based BluePower and GreenPower. Previously only based on BluePower.
 
+### Fixed
+- Matchmaking bug where server matches you with yourself
+
 ## [1.5.6] - 2019-10-17
 We've updated the UI during the vbox / buy phase to give a better indication of valid actions.
 

VERSION

@@ -1 +1 @@
-1.5.6
+1.6.0

acp/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mnml-client",
-  "version": "1.5.6",
+  "version": "1.6.0",
   "description": "",
   "main": "index.js",
   "scripts": {

client/assets/styles/footer.less

@@ -3,6 +3,7 @@ footer {
     flex-flow: row wrap;
     grid-area: footer;
     margin: 0;
+    z-index: 10;
 
     button {
         margin: 0;

client/assets/styles/game.less

@@ -123,7 +123,6 @@
         button {
             width: 100%;
             height: 2em;
-            height: 25%;
             margin-right: 1em;
         }
         button.active {

client/assets/styles/styles.less

@@ -14,7 +14,7 @@ html body {
     -ms-user-select: none;
 
     overflow-x: hidden;
-    // overflow-y: hidden;
+    overflow-y: hidden;
 }
 
 #mnml {
@@ -26,7 +26,7 @@ html body {
 
     /* stops inspector going skitz*/
     overflow-x: hidden;
-    // overflow-y: hidden;
+    overflow-y: hidden;
 }
 
 // @media (min-width: 1921px) {

client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mnml-client",
-  "version": "1.5.6",
+  "version": "1.6.0",
   "description": "",
   "main": "index.js",
   "scripts": {

ops/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mnml-ops",
-  "version": "1.5.6",
+  "version": "1.6.0",
   "description": "",
   "main": "index.js",
   "scripts": {

server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mnml"
-version = "1.5.6"
+version = "1.6.0"
 authors = ["ntr <ntr@smokestack.io>"]
 
 [dependencies]

server/src/events.rs

@@ -1,4 +1,6 @@
 use std::collections::{HashMap, HashSet};
+use std::thread::{spawn, sleep};
+use std::time;
 
 // Db Commons
 use uuid::Uuid;
@@ -310,10 +312,16 @@ impl Events {
                         .ok_or(format_err!("connection not found id={:?}", id))?;
 
                     if c.chat.is_some() {
-                        return Err(err_msg("you must wait"));
+                        return Ok(());
                     }
 
                     c.chat = Some((instance, msg));
+
+                    let events_tx = self.tx.clone();
+                    spawn(move || {
+                        sleep(time::Duration::from_secs(3));
+                        events_tx.send(Event::ChatClear(id, instance)).unwrap();
+                    });
                 }
 
                 // now collect all listeners of this instance

server/src/rpc.rs

@@ -179,13 +179,6 @@ impl Connection {
                             return Err(err_msg("invalid chat index"));
                         }
 
-                        let events_tx = self.events.clone();
-                        let id = self.id;
-                        spawn(move || {
-                            sleep(time::Duration::from_secs(3));
-                            events_tx.send(Event::ChatClear(id, instance_id)).unwrap();
-                        });
-
                         Ok(RpcMessage::Processing(()))
                     },
                     _ => {