From 65bc2ac729fc58dbf1b1e4399bea1f6fac7752f0 Mon Sep 17 00:00:00 2001 From: ntr Date: Fri, 18 Oct 2019 15:53:46 +1100 Subject: [PATCH 1/5] v1.6.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 03082db7..ce6a70b9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.5.6 \ No newline at end of file +1.6.0 \ No newline at end of file diff --git a/acp/package.json b/acp/package.json index a9ffeccf..f7dc99f5 100644 --- a/acp/package.json +++ b/acp/package.json @@ -1,6 +1,6 @@ { "name": "mnml-client", - "version": "1.5.6", + "version": "1.6.0", "description": "", "main": "index.js", "scripts": { diff --git a/client/package.json b/client/package.json index 9d22f205..6eb572dd 100644 --- a/client/package.json +++ b/client/package.json @@ -1,6 +1,6 @@ { "name": "mnml-client", - "version": "1.5.6", + "version": "1.6.0", "description": "", "main": "index.js", "scripts": { diff --git a/ops/package.json b/ops/package.json index 673c03d7..50a73702 100755 --- a/ops/package.json +++ b/ops/package.json @@ -1,6 +1,6 @@ { "name": "mnml-ops", - "version": "1.5.6", + "version": "1.6.0", "description": "", "main": "index.js", "scripts": { diff --git a/server/Cargo.toml b/server/Cargo.toml index 4285bf4c..3c9043f3 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mnml" -version = "1.5.6" +version = "1.6.0" authors = ["ntr "] [dependencies] From c0be03f0e3e70f074c2cb00c1aaf66ab4bfbb74b Mon Sep 17 00:00:00 2001 From: ntr Date: Fri, 18 Oct 2019 16:08:05 +1100 Subject: [PATCH 2/5] don't internal error msg spam --- server/src/events.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/events.rs b/server/src/events.rs index 3b24200c..df53a60f 100644 --- a/server/src/events.rs +++ b/server/src/events.rs @@ -310,7 +310,7 @@ impl Events { .ok_or(format_err!("connection not found id={:?}", id))?; if c.chat.is_some() { - return Err(err_msg("you must wait")); + return Ok(()); } c.chat = Some((instance, msg)); From 0ee39111cbcd5c115e97239a0d54e6c39808d337 Mon Sep 17 00:00:00 2001 From: ntr Date: Fri, 18 Oct 2019 17:14:11 +1100 Subject: [PATCH 3/5] fix random broken styles --- CHANGELOG.md | 5 ++++- client/assets/styles/footer.less | 1 + client/assets/styles/game.less | 1 - client/assets/styles/styles.less | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a9c00e91..06e1a152 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,10 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). -## [1.5.7] - 2019-10-18 +## [1.6.0] - 2019-10-18 +### Added +- Subscriber chat! + ### Changed - Made available skill / effect information during the combat phase. - Highlighting a skill replace the effect area with the skill description including speed multiplier. diff --git a/client/assets/styles/footer.less b/client/assets/styles/footer.less index cf9b6012..96791e70 100644 --- a/client/assets/styles/footer.less +++ b/client/assets/styles/footer.less @@ -3,6 +3,7 @@ footer { flex-flow: row wrap; grid-area: footer; margin: 0; + z-index: 10; button { margin: 0; diff --git a/client/assets/styles/game.less b/client/assets/styles/game.less index 909a088a..ef445028 100644 --- a/client/assets/styles/game.less +++ b/client/assets/styles/game.less @@ -123,7 +123,6 @@ button { width: 100%; height: 2em; - height: 25%; margin-right: 1em; } button.active { diff --git a/client/assets/styles/styles.less b/client/assets/styles/styles.less index 7150057e..1cb6f712 100644 --- a/client/assets/styles/styles.less +++ b/client/assets/styles/styles.less @@ -14,7 +14,7 @@ html body { -ms-user-select: none; overflow-x: hidden; - // overflow-y: hidden; + overflow-y: hidden; } #mnml { @@ -26,7 +26,7 @@ html body { /* stops inspector going skitz*/ overflow-x: hidden; - // overflow-y: hidden; + overflow-y: hidden; } // @media (min-width: 1921px) { From d1866a4fda76ffe4c8e88b7efee346c0ebdfd9bc Mon Sep 17 00:00:00 2001 From: ntr Date: Fri, 18 Oct 2019 17:21:01 +1100 Subject: [PATCH 4/5] only send chat clear after a msg --- server/src/events.rs | 8 ++++++++ server/src/rpc.rs | 7 ------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/server/src/events.rs b/server/src/events.rs index df53a60f..294cfb03 100644 --- a/server/src/events.rs +++ b/server/src/events.rs @@ -1,4 +1,6 @@ use std::collections::{HashMap, HashSet}; +use std::thread::{spawn, sleep}; +use std::time; // Db Commons use uuid::Uuid; @@ -314,6 +316,12 @@ impl Events { } c.chat = Some((instance, msg)); + + let events_tx = self.tx.clone(); + spawn(move || { + sleep(time::Duration::from_secs(3)); + events_tx.send(Event::ChatClear(id, instance)).unwrap(); + }); } // now collect all listeners of this instance diff --git a/server/src/rpc.rs b/server/src/rpc.rs index 2dfb9589..3194c1d4 100644 --- a/server/src/rpc.rs +++ b/server/src/rpc.rs @@ -179,13 +179,6 @@ impl Connection { return Err(err_msg("invalid chat index")); } - let events_tx = self.events.clone(); - let id = self.id; - spawn(move || { - sleep(time::Duration::from_secs(3)); - events_tx.send(Event::ChatClear(id, instance_id)).unwrap(); - }); - Ok(RpcMessage::Processing(())) }, _ => { From 525ad5770767973dce4834615a2276be790558fa Mon Sep 17 00:00:00 2001 From: ntr Date: Fri, 18 Oct 2019 17:40:18 +1100 Subject: [PATCH 5/5] changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 06e1a152..287876ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,9 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Slay now deals red damage based RedPower and GreenPower. Previously only based on RedPower. - Siphon now deals blue damage based BluePower and GreenPower. Previously only based on BluePower. +### Fixed +- Matchmaking bug where server matches you with yourself + ## [1.5.6] - 2019-10-17 We've updated the UI during the vbox / buy phase to give a better indication of valid actions.