From 1bb741f885208137bda0e6b2f82829098ea6d3f6 Mon Sep 17 00:00:00 2001 From: ntr Date: Sun, 22 Sep 2019 19:10:36 +1000 Subject: [PATCH 1/3] v1.5.0 --- VERSION | 2 +- acp/package.json | 2 +- client/package.json | 2 +- ops/package.json | 2 +- server/Cargo.toml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/VERSION b/VERSION index 721b9931..3e1ad720 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.4.8 \ No newline at end of file +1.5.0 \ No newline at end of file diff --git a/acp/package.json b/acp/package.json index 67f5a80c..3d3a55d5 100644 --- a/acp/package.json +++ b/acp/package.json @@ -1,6 +1,6 @@ { "name": "mnml-client", - "version": "1.4.8", + "version": "1.5.0", "description": "", "main": "index.js", "scripts": { diff --git a/client/package.json b/client/package.json index 387e4c64..51074c78 100644 --- a/client/package.json +++ b/client/package.json @@ -1,6 +1,6 @@ { "name": "mnml-client", - "version": "1.4.8", + "version": "1.5.0", "description": "", "main": "index.js", "scripts": { diff --git a/ops/package.json b/ops/package.json index 9bd16061..7e8d1236 100755 --- a/ops/package.json +++ b/ops/package.json @@ -1,6 +1,6 @@ { "name": "mnml-ops", - "version": "1.4.8", + "version": "1.5.0", "description": "", "main": "index.js", "scripts": { diff --git a/server/Cargo.toml b/server/Cargo.toml index 1df1bf9a..83386650 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mnml" -version = "1.4.8" +version = "1.5.0" authors = ["ntr "] [dependencies] From c4f95d57f25a276fb603623e75599417a64ef922 Mon Sep 17 00:00:00 2001 From: ntr Date: Sun, 22 Sep 2019 19:29:34 +1000 Subject: [PATCH 2/3] fix game btns --- client/src/components/game.ctrl.btns.jsx | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/client/src/components/game.ctrl.btns.jsx b/client/src/components/game.ctrl.btns.jsx index d92d0b86..3ca81ff3 100644 --- a/client/src/components/game.ctrl.btns.jsx +++ b/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 = ; + const quitBtn = ; return (
- + {finished ? quitBtn : readyBtn}
); } From babbeae3e0cac51c7715f07c3fe91cbeb6026d23 Mon Sep 17 00:00:00 2001 From: ntr Date: Sun, 22 Sep 2019 20:03:31 +1000 Subject: [PATCH 3/3] big leave btn --- client/assets/styles/controls.less | 2 +- client/src/components/game.ctrl.btns.jsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/assets/styles/controls.less b/client/assets/styles/controls.less index 69b1a07a..f267351a 100644 --- a/client/assets/styles/controls.less +++ b/client/assets/styles/controls.less @@ -116,7 +116,7 @@ aside { flex: 0; } - .ready { + .ready, .quit { flex: 1; font-size: 200%; } diff --git a/client/src/components/game.ctrl.btns.jsx b/client/src/components/game.ctrl.btns.jsx index 3ca81ff3..30513961 100644 --- a/client/src/components/game.ctrl.btns.jsx +++ b/client/src/components/game.ctrl.btns.jsx @@ -69,7 +69,7 @@ function GameCtrlBtns(args) { } const readyBtn = ; - const quitBtn = ; + const quitBtn = ; return (