From e309af2d0e0bb09ffa350365980ad4e9c0833a5f Mon Sep 17 00:00:00 2001 From: ntr Date: Tue, 8 Oct 2019 14:04:35 +1100 Subject: [PATCH 1/7] v1.5.3 --- 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 a73b4325..1d5e9e0b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.5.2 \ No newline at end of file +1.5.3 \ No newline at end of file diff --git a/acp/package.json b/acp/package.json index 809c390d..f41793e6 100644 --- a/acp/package.json +++ b/acp/package.json @@ -1,6 +1,6 @@ { "name": "mnml-client", - "version": "1.5.2", + "version": "1.5.3", "description": "", "main": "index.js", "scripts": { diff --git a/client/package.json b/client/package.json index 221ea1cf..90e180ae 100644 --- a/client/package.json +++ b/client/package.json @@ -1,6 +1,6 @@ { "name": "mnml-client", - "version": "1.5.2", + "version": "1.5.3", "description": "", "main": "index.js", "scripts": { diff --git a/ops/package.json b/ops/package.json index 323e1d24..e7427f86 100755 --- a/ops/package.json +++ b/ops/package.json @@ -1,6 +1,6 @@ { "name": "mnml-ops", - "version": "1.5.2", + "version": "1.5.3", "description": "", "main": "index.js", "scripts": { diff --git a/server/Cargo.toml b/server/Cargo.toml index 967fccad..26444b03 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mnml" -version = "1.5.2" +version = "1.5.3" authors = ["ntr "] [dependencies] From 7437111cac8b4995f59b6e90b288912f2460d806 Mon Sep 17 00:00:00 2001 From: ntr Date: Tue, 8 Oct 2019 15:32:56 +1100 Subject: [PATCH 2/7] flat colour siphon --- client/animations.test.js | 2 +- client/assets/styles/styles.less | 3 +++ client/assets/styles/styles.mobile.less | 5 +++- client/src/components/anims/siphon.jsx | 14 +++-------- client/src/components/anims/siphon.tick.jsx | 28 ++++++--------------- 5 files changed, 18 insertions(+), 34 deletions(-) diff --git a/client/animations.test.js b/client/animations.test.js index b447e649..b6cbc772 100644 --- a/client/animations.test.js +++ b/client/animations.test.js @@ -8,7 +8,7 @@ require('./assets/styles/instance.less'); require('./assets/styles/vbox.less'); require('./assets/styles/game.less'); require('./assets/styles/player.less'); -require('./assets/styles/styles.mobile.css'); +require('./assets/styles/styles.mobile.less'); require('./assets/styles/instance.mobile.less'); require('./src/animations.test.jsx'); diff --git a/client/assets/styles/styles.less b/client/assets/styles/styles.less index c9729698..2e3b241c 100644 --- a/client/assets/styles/styles.less +++ b/client/assets/styles/styles.less @@ -12,6 +12,9 @@ html body { -moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; + + overflow-x: hidden; + overflow-y: hidden; } #mnml { diff --git a/client/assets/styles/styles.mobile.less b/client/assets/styles/styles.mobile.less index 0b88dac7..f54478f2 100644 --- a/client/assets/styles/styles.mobile.less +++ b/client/assets/styles/styles.mobile.less @@ -1,4 +1,8 @@ @media (max-width: 800px) { + body { + overflow-y: initial; + } + #mnml { font-size: 12pt; padding: 0; @@ -11,7 +15,6 @@ height: 100vh; max-height: initial; min-height: initial; - overflow-y: initial; } table td { diff --git a/client/src/components/anims/siphon.jsx b/client/src/components/anims/siphon.jsx index 4ba6102b..cb1b376f 100644 --- a/client/src/components/anims/siphon.jsx +++ b/client/src/components/anims/siphon.jsx @@ -27,12 +27,9 @@ class Siphon extends Component { version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" - viewBox="0 0 300 400" + viewBox="0 0 300 300" opacity="0"> - - - - + ); } @@ -53,12 +50,7 @@ class Siphon extends Component { anime({ targets: '#siphon', - keyframes: [ - { r: '110', stroke: '#1FF01F' }, - { r: '80', stroke: '#1FF01F' }, - { r: '50', stroke: '#3050f8' }, - { r: '20', stroke: '#3050f8' }, - ], + r: 0, delay: TIMES.TARGET_DELAY_MS, duration, easing: 'easeInCubic', diff --git a/client/src/components/anims/siphon.tick.jsx b/client/src/components/anims/siphon.tick.jsx index 4a0b82e5..c431d5ca 100644 --- a/client/src/components/anims/siphon.tick.jsx +++ b/client/src/components/anims/siphon.tick.jsx @@ -20,9 +20,7 @@ function projectile(x, y, radius, colour) { cx={x} cy={y} r={radius} - fill="url(#grad1)" - stroke-width="0.1" - stroke={colour} + fill={colour} /> ); } @@ -44,24 +42,16 @@ class SiphonTick extends Component { version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" - viewBox="0 0 300 400"> + viewBox="0 0 300 300"> - - - - - - - - {this.charges} ); @@ -84,27 +74,23 @@ class SiphonTick extends Component { }); anime.set('#siphon', { - r: '80', + r: 0, stroke: '#3050f8', }); anime({ targets: '#siphon', - keyframes: [ - { r: '50', stroke: '#3050f8' }, - { r: '20', stroke: '#3050f8' }, - { r: '0', stroke: '#3050f8' }, - ], + r: 600, duration: duration * 2 / 3, - easing: 'easeInCubic', + easing: 'easeInSine', }); const projectiles = document.querySelectorAll('.skill-anim circle'); projectiles.forEach(proj => { anime({ targets: proj, - cx: Math.random() * 250 + 25, - cy: Math.random() * 200 - 100, + cx: 150 + (Math.random() * 50 * (Math.random() < 0.5 ? -1 : 1)), + cy: 150 + (Math.random() * 50 * (Math.random() < 0.5 ? -1 : 1)), delay: (Math.random() * duration * 1 / 2), duration, easing: 'easeInQuad', From cf05487c6dc4d1264d1d93f980fd68b8a3f86367 Mon Sep 17 00:00:00 2001 From: ntr Date: Tue, 8 Oct 2019 15:51:05 +1100 Subject: [PATCH 3/7] good shit --- client/assets/styles/game.less | 6 ++++++ client/src/components/anims/chaos.jsx | 8 ++++---- client/src/components/anims/siphon.tick.jsx | 4 ++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/client/assets/styles/game.less b/client/assets/styles/game.less index e5a8007b..e607f643 100644 --- a/client/assets/styles/game.less +++ b/client/assets/styles/game.less @@ -400,16 +400,22 @@ } .player { + width: calc(100% - 1em); bottom: 3em; height: calc(50% - 3em); } .opponent { + width: calc(100% - 1em); .game-construct { display: grid; grid-template-columns: 1fr; grid-template-rows: min-content 1fr; } } + + #targeting, .resolving-skill { + width: calc(100% - 1em); + } } } diff --git a/client/src/components/anims/chaos.jsx b/client/src/components/anims/chaos.jsx index 3b415520..8250af93 100644 --- a/client/src/components/anims/chaos.jsx +++ b/client/src/components/anims/chaos.jsx @@ -77,10 +77,10 @@ class Chaos extends Component { projectiles.forEach(proj => this.animations.push(anime({ targets: proj, - // cx: 150 + (Math.random() * 50 * (Math.random() < 0.5 ? -1 : 1)), - // cy: 200 + (Math.random() * 50 * (Math.random() < 0.5 ? -1 : 1)), - cx: 150, - cy: 200, + cx: 150 + (Math.random() * 50 * (Math.random() < 0.5 ? -1 : 1)), + cy: 200 + (Math.random() * 50 * (Math.random() < 0.5 ? -1 : 1)), + // cx: 150, + // cy: 200, // opacity: 0, delay: TIMES.TARGET_DELAY_MS, diff --git a/client/src/components/anims/siphon.tick.jsx b/client/src/components/anims/siphon.tick.jsx index c431d5ca..5d0faaf9 100644 --- a/client/src/components/anims/siphon.tick.jsx +++ b/client/src/components/anims/siphon.tick.jsx @@ -89,8 +89,8 @@ class SiphonTick extends Component { projectiles.forEach(proj => { anime({ targets: proj, - cx: 150 + (Math.random() * 50 * (Math.random() < 0.5 ? -1 : 1)), - cy: 150 + (Math.random() * 50 * (Math.random() < 0.5 ? -1 : 1)), + cx: 150 + (Math.random() * 300 * (Math.random() < 0.5 ? -1 : 1)), + cy: 150 + (Math.random() * 300 * (Math.random() < 0.5 ? -1 : 1)), delay: (Math.random() * duration * 1 / 2), duration, easing: 'easeInQuad', From 15fc22fd685147b8db58831dbe137e7a112bb909 Mon Sep 17 00:00:00 2001 From: ntr Date: Tue, 8 Oct 2019 15:53:37 +1100 Subject: [PATCH 4/7] menu fixes --- client/assets/styles/styles.mobile.less | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/client/assets/styles/styles.mobile.less b/client/assets/styles/styles.mobile.less index f54478f2..0991f256 100644 --- a/client/assets/styles/styles.mobile.less +++ b/client/assets/styles/styles.mobile.less @@ -93,4 +93,18 @@ "inventory" "games"; } + + .options { + flex-flow: row wrap; + + button { + flex: 1; + } + } + + section { + .list { + grid-template-columns: 1fr; + } + } } From a28898cd823d0392d9d4b035637654a565b102a1 Mon Sep 17 00:00:00 2001 From: ntr Date: Tue, 8 Oct 2019 16:05:42 +1100 Subject: [PATCH 5/7] mobile menu fixes --- client/assets/styles/styles.mobile.less | 24 ++++++++++++++++++++---- client/src/components/team.footer.jsx | 15 --------------- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/client/assets/styles/styles.mobile.less b/client/assets/styles/styles.mobile.less index 0991f256..e8269bd2 100644 --- a/client/assets/styles/styles.mobile.less +++ b/client/assets/styles/styles.mobile.less @@ -94,11 +94,21 @@ "games"; } - .options { - flex-flow: row wrap; + .menu { + .options { + display: grid; + grid-template-columns: 1fr; - button { - flex: 1; + button:not(:last-child) { + border: 2px solid #222; + } + + button.logo { + border: none; + margin-right: 0; + margin-top: 0.5em; + background-position: center; + } } } @@ -107,4 +117,10 @@ grid-template-columns: 1fr; } } + + .account { + div { + padding: 0; + } + } } diff --git a/client/src/components/team.footer.jsx b/client/src/components/team.footer.jsx index db3bb077..82584a57 100644 --- a/client/src/components/team.footer.jsx +++ b/client/src/components/team.footer.jsx @@ -7,7 +7,6 @@ const addState = connect( function receiveState(state) { const { teamSelect, - showNav, ws, } = state; @@ -18,32 +17,18 @@ const addState = connect( return { sendAccountSetTeam, teamSelect, - showNav, }; }, - function receiveDispatch(dispatch) { - - function setShowNav(v) { - return dispatch(actions.setShowNav(v)); - } - - return { - setShowNav, - }; - } ); function TeamFooter(args) { const { - showNav, teamSelect, sendAccountSetTeam, - setShowNav, } = args; return (