Merge tag '1.14.0' into develop

1.14.0

VERSION

@@ -1 +1 @@
-1.13.0
+1.14.0

acp/package.json

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

client/package.json

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

client/src/components/account.box.jsx

@@ -59,8 +59,13 @@ class AccountAvatar extends Component {
     }
 
     componentDidMount() {
-        this.idle = idleAnimation(this.props.account.id);
+        const startIdle = () => {
-        return this.animations.push(this.idle);
+            this.idle = idleAnimation(this.props.account.id);
+            this.animations.push(this.idle);
+            this.idle.finished.then(startIdle);
+        };
+
+        startIdle();
     }
 
     resetAnimations() {

client/src/components/anims/idle.jsx

@@ -1,8 +1,9 @@
 const anime = require('animejs').default;
 
 function idle(id) {
-    const duration = anime.random(2000, 18000);
+    const duration = anime.random(2000, 8000);
     const target = document.getElementById(id);
+
     return anime({
         targets: target,
         translateX: () => anime.random(-20, 20),
@@ -10,8 +11,7 @@ function idle(id) {
         rotate: () => anime.random(-15, 15),
         duration,
         direction: 'alternate',
-        easing: 'linear',
+        easing: 'easeInOutSine',
-        loop: true,
     });
 }
 

client/src/components/construct.jsx

@@ -48,8 +48,13 @@ class ConstructAvatar extends Component {
     }
 
     componentDidMount() {
-        this.idle = idleAnimation(this.props.construct.id);
+        const startIdle = () => {
-        return this.animations.push(this.idle);
+            this.idle = idleAnimation(this.props.construct.id);
+            this.animations.push(this.idle);
+            this.idle.finished.then(startIdle);
+        };
+
+        startIdle();
     }
 
     resetAnimations() {

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

@@ -98,7 +98,7 @@ function GameCtrlBtns(args) {
     return (
         <div class="game-ctrl-btns">
             <button disabled={!account.subscribed} onClick={() => setChatShow(!chatShow)}>Chat</button>
-            <button disabled={animating} onClick={sendGameSkillClear}>Clear</button>
+            <button disabled={finished || animating} onClick={sendGameSkillClear}>Clear</button>
             {finished ? quitBtn : readyBtn}
         </div>
     );

client/src/components/mnni.jsx

@@ -34,8 +34,13 @@ class MnniAvatatr extends Component {
     }
 
     componentDidMount() {
-        this.idle = idleAnimation('mnni');
+        const startIdle = () => {
-        return this.animations.push(this.idle);
+            this.idle = idleAnimation('mnni');
+            this.animations.push(this.idle);
+            this.idle.finished.then(startIdle);
+        };
+
+        startIdle();
     }
 
     resetAnimations() {

client/src/components/player.box.jsx

@@ -37,8 +37,13 @@ class Img extends Component {
     }
 
     componentDidMount() {
-        this.idle = idleAnimation(this.props.id);
+        const startIdle = () => {
-        return this.animations.push(this.idle);
+            this.idle = idleAnimation(this.props.id);
+            this.animations.push(this.idle);
+            this.idle.finished.then(startIdle);
+        };
+
+        startIdle();
     }
 
     resetAnimations() {

client/src/socket.jsx

@@ -349,6 +349,7 @@ function createSocket(events) {
         sendItemInfo();
 
         events.urlHashChange();
+        events.setPvp(false);
 
         return true;
     }

core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mnml_core"
-version = "1.13.0"
+version = "1.14.0"
 authors = ["ntr <ntr@smokestack.io>", "mashy <mashy@mnml.gg>"]
 
 [dependencies]

ops/package.json

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

server/Cargo.toml

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

studios/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mnml-studios",
-  "version": "1.13.0",
+  "version": "1.14.0",
   "description": "",
   "main": "index.js",
   "scripts": {