Merge tag '1.5.0' into develop

1.5.0

VERSION

@@ -1 +1 @@
-1.4.8
+1.5.0

acp/package.json

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

client/assets/styles/controls.less

@@ -116,7 +116,7 @@ aside {
         flex: 0;
     }
 
-    .ready {
+    .ready, .quit {
         flex: 1;
         font-size: 200%;
     }

client/package.json

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

client/src/components/game.ctrl.btns.jsx

@@ -54,17 +54,28 @@ function GameCtrlBtns(args) {
         game,
         animating,
 
+        getInstanceState,
         sendGameSkillClear,
         sendReady,
+        quit,
     } = args;
 
     if (!game) return false;
+    const finished = game.phase === 'Finish';
+
+    function quitClick() {
+        getInstanceState();
+        quit();
+    }
+
+    const readyBtn = <button disabled={animating} class="ready" onClick={() => sendReady()}>Ready</button>;
+    const quitBtn = <button disabled={animating} class="quit" onClick={quitClick}>Back</button>;
 
     return (
         <div class="game-ctrl-btns">
             <button disabled={true} >Chat</button>
             <button disabled={animating} onClick={sendGameSkillClear}>Clear</button>
-            <button disabled={animating} class="ready" onClick={() => sendReady()}>Ready</button>
+            {finished ? quitBtn : readyBtn}
         </div>
     );
 }

ops/package.json

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

server/Cargo.toml

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