From a2a251904fe517f016c241c0a86fe40402eb5d5d Mon Sep 17 00:00:00 2001 From: ntr Date: Tue, 5 Nov 2019 12:45:08 +1100 Subject: [PATCH 01/32] v1.8.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 081af9a1..afa2b351 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.7.1 \ No newline at end of file +1.8.0 \ No newline at end of file diff --git a/acp/package.json b/acp/package.json index 48ed247e..69013a0e 100644 --- a/acp/package.json +++ b/acp/package.json @@ -1,6 +1,6 @@ { "name": "mnml-client", - "version": "1.7.1", + "version": "1.8.0", "description": "", "main": "index.js", "scripts": { diff --git a/client/package.json b/client/package.json index f446e92c..fbdfadd2 100644 --- a/client/package.json +++ b/client/package.json @@ -1,6 +1,6 @@ { "name": "mnml-client", - "version": "1.7.1", + "version": "1.8.0", "description": "", "main": "index.js", "scripts": { diff --git a/ops/package.json b/ops/package.json index 876bd4cf..3c4ae105 100755 --- a/ops/package.json +++ b/ops/package.json @@ -1,6 +1,6 @@ { "name": "mnml-ops", - "version": "1.7.1", + "version": "1.8.0", "description": "", "main": "index.js", "scripts": { diff --git a/server/Cargo.toml b/server/Cargo.toml index 40e26480..a29783c7 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mnml" -version = "1.7.1" +version = "1.8.0" authors = ["ntr "] [dependencies] From ec24e3a194b7e18afa5c8edf818b5cfd73dc1fd4 Mon Sep 17 00:00:00 2001 From: ntr Date: Tue, 5 Nov 2019 13:00:06 +1100 Subject: [PATCH 02/32] uppercase READY prompt --- client/src/components/targeting.arrows.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/components/targeting.arrows.jsx b/client/src/components/targeting.arrows.jsx index b615517b..d893e3bc 100644 --- a/client/src/components/targeting.arrows.jsx +++ b/client/src/components/targeting.arrows.jsx @@ -59,7 +59,7 @@ class TargetSvg extends Component { if (tutorialGame) { return (
-

Select your skills, click on targets and then hit ready.

+

Select your skills, click on targets and then hit READY.

); } From 4a67cab2b3d1f7acb3ebb78124e0a6e20d0bc670 Mon Sep 17 00:00:00 2001 From: Mashy Date: Tue, 5 Nov 2019 12:04:02 +1000 Subject: [PATCH 03/32] combiner fix --- client/src/components/vbox.component.jsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/client/src/components/vbox.component.jsx b/client/src/components/vbox.component.jsx index 5b1385dd..c09e07f1 100644 --- a/client/src/components/vbox.component.jsx +++ b/client/src/components/vbox.component.jsx @@ -329,7 +329,9 @@ class Vbox extends preact.Component {