From dbac521c634a82f419f87e1f2a381061bb72e061 Mon Sep 17 00:00:00 2001 From: Cristian Deenen Date: Fri, 20 Oct 2023 00:11:45 +0200 Subject: [PATCH] v3.0.2 --- MaterialPlane.js | 66 +------------------- changelog.md | 13 +++- img/.thumb/MaterialFoundry2560x1440.jpg.jpg | Bin 0 -> 11232 bytes img/MaterialFoundry2560x1440.jpg | Bin 0 -> 494338 bytes lang/en.json | 16 +++-- module.json | 18 +++++- src/IRtoken/IRtoken.js | 4 +- src/Misc/settings.js | 63 +++++++++++++++++-- src/analyzeIR.js | 1 + src/websocket.js | 39 +++++++----- templates/config.html | 36 ++++++----- 11 files changed, 147 insertions(+), 109 deletions(-) create mode 100644 img/.thumb/MaterialFoundry2560x1440.jpg.jpg create mode 100644 img/MaterialFoundry2560x1440.jpg diff --git a/MaterialPlane.js b/MaterialPlane.js index 55af928..41efa6f 100644 --- a/MaterialPlane.js +++ b/MaterialPlane.js @@ -165,12 +165,12 @@ Hooks.on('ready', ()=>{ enableModule = game.user.id == game.settings.get(moduleName,'ActiveUser'); hideElements = game.settings.get(moduleName,'HideElements') && game.user.isGM == false; - if (game.settings.get(moduleName,'device') == 'sensor' && game.settings.get(moduleName,'Enable') && window.location.protocol == "https:" && game.settings.get(moduleName,'EnMaterialServer') == false){ + if (game.settings.get(moduleName,'device') == 'sensor' && game.settings.get(moduleName,'ConnectionMode') != "noConnect" && window.location.protocol == "https:" && game.settings.get(moduleName,'ConnectionMode') != 'materialCompanion'){ ui.notifications.warn("Material Plane: "+game.i18n.localize("MaterialPlane.Notifications.SSL")); enableModule = false; return; } - if ((enableModule || game.user.isGM) && game.settings.get(moduleName,'Enable')){ + if ((enableModule || game.user.isGM) && game.settings.get(moduleName,'ConnectionMode') != "noConnect"){ if (game.settings.get(moduleName,'device') == 'sensor') startWebsocket(); else { @@ -294,10 +294,9 @@ Hooks.on('closecalibrationProgressScreen',() => { * Initialize settings */ Hooks.once('init', function(){ - registerSettings(); //in ./src/settings.js + registerSettings(); registerLayer(); configDialog = new mpConfig(); - //calibrationDialog = new calibrationForm(); calibrationProgress = new calibrationProgressScreen(); }); @@ -334,11 +333,6 @@ Hooks.on('renderPlayerList', (app, html) => { } }); -Hooks.on('canvasReady', (canvas) => { - // canvas.stage.addChild(circle); - //circle.init(); -}) - Hooks.on('controlToken', (token,controlled) => { if (!controlled) return; enableModule = game.user.id == game.settings.get(moduleName,'ActiveUser'); @@ -401,58 +395,4 @@ export async function checkForUpdate(reqType) { latestReleases.materialCompanion = version; } }); - - return; - - var request = new XMLHttpRequest(); - request.open('GET', url, true); - request.send(null); - request.onreadystatechange = function () { - if (request.readyState === 4 && request.status === 200) { - var type = request.getResponseHeader('Content-Type'); - if (type.indexOf("text") !== 1) { - let version; - if (reqType == 'module') { - version = JSON.parse(request.responseText).version; - latestReleases.module = version; - } - else if (reqType == 'MS') { - version = JSON.parse(request.responseText).version; - latestReleases.ms = version; - } - else if (reqType == 'SWs') { - const start = request.responseText.search('"', request.responseText.search('const webserverVersion = "v')) + 2; - let v = ""; - for (let i=start; i
  • Decreased the size of the battery indicator to it doesn't overflow
    • @@ -7,6 +7,17 @@ Fixes:
  • In the base setup, rules with base IDs of the current base display a green ID again
    • +Additions: + + +Other: + + ### v3.0.1 - 04-10-2023 Fixes: