From f994e64fc7a1743701e576323418efc821449dbd Mon Sep 17 00:00:00 2001 From: CDeenen Date: Thu, 4 Feb 2021 05:03:34 +0100 Subject: [PATCH] v1.2.3 --- MaterialDeck.js | 18 +- changelog.md | 16 +- module.json | 4 +- src/combattracker.js | 2 +- src/external.js | 11 +- src/macro.js | 108 ++++----- src/misc.js | 268 +++++++++++------------ src/othercontrols.js | 2 +- src/playlist.js | 2 +- src/scene.js | 17 +- src/soundboard.js | 51 ++--- src/token.js | 110 ++++------ templates/macroConfig.html | 4 +- templates/playlistConfig.html | 2 +- templates/soundboardConfig.html | 8 +- wiki/img/.thumb/ModuleSettings.png.jpg | Bin 12414 -> 17066 bytes wiki/img/.thumb/SoundboardConfig.png.jpg | Bin 14792 -> 15157 bytes 17 files changed, 279 insertions(+), 344 deletions(-) diff --git a/MaterialDeck.js b/MaterialDeck.js index e584084..e08548f 100644 --- a/MaterialDeck.js +++ b/MaterialDeck.js @@ -40,6 +40,8 @@ let wsOpen = false; //Bool for checking if websocket has ever been o let wsInterval; //Interval timer to detect disconnections let WSconnected = false; +//let furnace = game.modules.get("furnace"); + /* * Analyzes the message received * @@ -51,6 +53,17 @@ async function analyzeWSmessage(msg){ //console.log("Received",data); if (data.type == "connected" && data.data == "SD"){ + /* + console.log(data); + const minimumSDversion = game.modules.get("MaterialDeck").data.minimumSDversion.replace('v',''); + const minimumMSversion = game.modules.get("MaterialDeck").data.minimumMSversion; + console.log('SD',minimumSDversion,minimumMSversion) + if (data.SDversion < minimumSDversion) console.log('SD: nope') + else console.log('SD: yes'); + if (data.MSversion < minimumMSversion) console.log('MS: nope') + else console.log('MS: yes'); + */ + console.log("streamdeck connected to server"); streamDeck.resetImageBuffer(); } @@ -133,7 +146,10 @@ async function analyzeWSmessage(msg){ */ function startWebsocket() { const address = game.settings.get(moduleName,'address'); - ws = new WebSocket('ws://'+address+'/'); + + const url = address.startsWith('wss://') ? address : ('ws://'+address+'/'); + + ws = new WebSocket(url); ws.onmessage = function(msg){ //console.log(msg); diff --git a/changelog.md b/changelog.md index f7266de..c667f92 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,19 @@ # Changelog Material Deck Module -### v1.2.2 - 07-01-2021 +### v1.2.3 - 03-02-2021 +Fixes: + +Other Changes: + +Compatible server app and SD plugin:
+Material Server v1.0.2 (unchanged): https://github.com/CDeenen/MaterialServer/releases
+SD plugin v1.2.2 (unchanged): https://github.com/CDeenen/MaterialDeck_SD/releases
+ +### v1.2.2 - 02-02-2021 Additions: