Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop

CHANGELOG.md

@@ -2,13 +2,12 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [1.6.1] - 2019-10-??
+## [1.6.2] - 2019-10-20
 ### Fixed
+- Combiner bug where it would preview items for different combinations
+- Skill descriptions are cleared when animations start
 
- - Combiner bug where it would preview items for different combinations
+## [1.6.1] - Skipped
-
- - Skill descriptions are cleared when animations start
-
 
 ## [1.6.0] - 2019-10-18
 ### Added

VERSION

@@ -1 +1 @@
-1.6.0
+1.6.2

acp/package.json

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

client/assets/styles/controls.less

@@ -144,6 +144,12 @@ aside {
     }
 }
 
+.play-ctrl {
+    .controls {
+        grid-template-rows: 1fr 1fr 1fr 3fr 1fr;
+    }
+}
+
 .abandon:not([disabled]) {
     &:hover {
         color: @red;

client/package.json

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

client/src/components/play.ctrl.jsx

@@ -130,16 +130,14 @@ function JoinButtons(args) {
         <aside class='play-ctrl'>
             <div class="timer-container"></div>
             <div class="controls">
+                <button
+                    class='practice ready'
+                    onClick={() => sendInstancePractice()}
+                    type="submit">
+                    Learn
+                </button>
+                {inviteBtn()}
                 {discordBtn}
-                <div class="flex">
-                    <button
-                        class='practice ready'
-                        onClick={() => sendInstancePractice()}
-                        type="submit">
-                        Learn
-                    </button>
-                    {inviteBtn()}
-                </div>
                 <AccountBox />
                 <div class="instance-ctrl-btns">
                     <button disabled={true} >Chat</button>

client/src/components/play.jsx

@@ -93,18 +93,18 @@ function Play(args) {
     return (
         <section class="top">
             <div class="news">
-                <h1>v{VERSION}</h1>
+                <h2>v{VERSION}</h2>
                 <p class="play-p">Use the buttons on the right to join an instance.</p>
                 <p>
                     Select <b>PVP</b> to play against other players.<br />
                     Select <b>INVITE</b> then click <b>COPY LINK</b> to generate an instance invitation for a friend.<br />
                     Click <b>LEARN</b> to practice the game without time controls.
                 </p>
+                <p>Join our Discord server to find opponents, message @ntr or @mashy for some credits to get started.</p>
                 <p>
                     If you enjoy the game please support its development by <b>subscribing</b> or purchasing <b>credits</b>.<br />
                     glhf
                 </p>
-                <p>--ntr & mashy</p>
             </div>
             <div>
                 <h1 class="credits">¤ {account.balance}</h1>

client/src/socket.jsx

@@ -30,7 +30,11 @@ function createSocket(events) {
     // -------------
     function send(msg) {
         if (msg[0] !== 'Ping') console.log('outgoing msg', msg);
-        ws.send(cbor.encode(msg));
+        try {
+            ws.send(cbor.encode(msg));
+        } catch (e) {
+            console.warn(e);
+        }
     }
 
     let ping;

ops/package.json

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

server/Cargo.toml

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