Skip to content

Commit

Permalink
v1.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@CDeenen
CDeenen committed Oct 19, 2023
1 parent 0eee5ac commit a478b57
Show file tree
Hide file tree
Showing 20 changed files with 282 additions and 180 deletions.
Binary file modified Plugin/Release/com.cdeenen.materialdeck.streamDeckPlugin
View file
Binary file not shown.
Binary file added ...eenen.materialdeck.sdPlugin/action/images/custom/.thumb/MaterialFoundry.png.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...en.materialdeck.sdPlugin/action/images/custom/.thumb/MaterialFoundry@2x.png.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Plugin/com.cdeenen.materialdeck.sdPlugin/action/images/custom/MaterialFoundry.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...n/com.cdeenen.materialdeck.sdPlugin/action/images/custom/MaterialFoundry@2x.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions Plugin/com.cdeenen.materialdeck.sdPlugin/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ function connected(jsn) {
actions[5] = 'com.cdeenen.materialdeck.other';
actions[6] = 'com.cdeenen.materialdeck.external';
actions[7] = 'com.cdeenen.materialdeck.scene';
actions[8] = 'com.cdeenen.materialdeck.custom';


for (let i=0; i<actions.length; i++){
Expand Down
17 changes: 15 additions & 2 deletions Plugin/com.cdeenen.materialdeck.sdPlugin/manifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,19 @@
"Tooltip": "Displays selected token information.",
"UUID": "com.cdeenen.materialdeck.token",
"PropertyInspectorPath": "PropertyInspector/token.html"
},
{
"Name": "Custom",
"Icon": "action/images/custom/MaterialFoundry",
"States": [
{
"Image": "action/images/custom/MaterialFoundry",
"TitleAlignment": "middle"
}
],
"Tooltip": "Customizable action.",
"UUID": "com.cdeenen.materialdeck.custom",
"PropertyInspectorPath": "PropertyInspector/custom.html"
}
],
"SDKVersion": 2,
Expand All @@ -114,8 +127,8 @@
"Description": "Stream Deck plugin for the 'Material Deck' Foundry VTT module",
"Name": "Material Deck",
"Icon": "MaterialFoundry",
"URL": "https://github.com/CDeenen/MaterialDeck_SD",
"Version": "1.5.1.1",
"URL": "https://github.com/MaterialFoundry/MaterialDeck_SD",
"Version": "1.6.0",
"OS": [
{
"Platform": "mac",
Expand Down
40 changes: 23 additions & 17 deletions Plugin/com.cdeenen.materialdeck.sdPlugin/propertyinspector/combattracker.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
<body>
<div class="sdpi-wrapper" id="wrapper" style="display:none">
<div class="sdpi-item">
<div class="sdpi-item-label"><a href="https://github.com/CDeenen/MaterialDeck/wiki/Custom-Icons#icon-override-preferred" target=”_blank”>Icon Override</a></div>
<div class="sdpi-item-label"><a href="https://github.com/MaterialFoundry/MaterialDeck/wiki/Custom-Icons#icon-override-preferred" target=”_blank”>Icon Override</a></div>
<input class="sdpi-item-value" id="iconOverride" value="">
</div>

<div class="sdpi-item">
<div class="sdpi-item-label"><a href="https://github.com/CDeenen/MaterialDeck/wiki/Combat-Tracker-Action#mode" target=”_blank”>Mode</a></div>
<div class="sdpi-item-label"><a href="https://github.com/MaterialFoundry/MaterialDeck/wiki/Combat-Tracker-Action#mode" target=”_blank”>Mode</a></div>
<select class="sdpi-item-value select" id="combatTrackerMode" type="select">
<option value='combatants'>Combatants</option>
<option value='currentCombatant'>Current Turn's Combatant</option>
Expand All @@ -26,7 +26,7 @@
<div class="wrapper" id="funcWrapper" style="display:none">
<div class="sub1">
<div class="sdpi-item">
<div class="sdpi-item-label"><a href="https://github.com/CDeenen/MaterialDeck/wiki/Combat-Tracker-Action#mode-function" target=”_blank”>Function</a></div>
<div class="sdpi-item-label"><a href="https://github.com/MaterialFoundry/MaterialDeck/wiki/Combat-Tracker-Action#mode-function" target=”_blank”>Function</a></div>
<select class="sdpi-item-value select" id="combatTrackerFunction" type="select">
<option value='startStop'>Start/Stop Combat</option>
<option value='endTurn'>End Turn</option>
Expand All @@ -42,7 +42,7 @@
<div id="selectCombatantWrapper" style="display:none">
<div class="sub2">
<div type="checkbox" class="sdpi-item">
<div class="sdpi-item-label"><a href="https://github.com/CDeenen/MaterialDeck/wiki/Combat-Tracker-Action#select-combatant" target=”_blank”>Select Combatant</a></div>
<div class="sdpi-item-label"><a href="https://github.com/MaterialFoundry/MaterialDeck/wiki/Combat-Tracker-Action#select-combatant" target=”_blank”>Select Combatant</a></div>
<input class="sdpi-item-value" id="selectCombatant" type="checkbox">
<label for="selectCombatant"><span></span></label>
</div>
Expand All @@ -51,12 +51,12 @@
<div id="turnDisplay" style="display:none">
<div class="sub2">
<div type="checkbox" class="sdpi-item">
<div class="sdpi-item-label"><a href="https://github.com/CDeenen/MaterialDeck/wiki/Combat-Tracker-Action#function-turn-display" target=”_blank”>Display Turn</a></div>
<div class="sdpi-item-label"><a href="https://github.com/MaterialFoundry/MaterialDeck/wiki/Combat-Tracker-Action#function-turn-display" target=”_blank”>Display Turn</a></div>
<input class="sdpi-item-value" id="displayTurn" type="checkbox">
<label for="displayTurn"><span></span></label>
</div>
<div type="checkbox" class="sdpi-item">
<div class="sdpi-item-label"><a href="https://github.com/CDeenen/MaterialDeck/wiki/Combat-Tracker-Action#function-turn-display" target=”_blank”>Display Round</a></div>
<div class="sdpi-item-label"><a href="https://github.com/MaterialFoundry/MaterialDeck/wiki/Combat-Tracker-Action#function-turn-display" target=”_blank”>Display Round</a></div>
<input class="sdpi-item-value" id="displayRound" type="checkbox">
<label for="displayRound"><span></span></label>
</div>
Expand All @@ -68,21 +68,21 @@
<div class="wrapper" id="combatantWrapper" style="">
<div class="sub1">
<div class="sdpi-item" style="">
<div class="sdpi-item-label"><a href="https://github.com/CDeenen/MaterialDeck/wiki/Token-Action#stats" target=”_blank”>Stats</a></div>
<div class="sdpi-item-label"><a href="https://github.com/MaterialFoundry/MaterialDeck/wiki/Token-Action#stats" target=”_blank”>Stats</a></div>
<select class="sdpi-item-value select" id="stats" type="select">
<option value='none'>None</option>
<option value='custom'>Custom</option>
</select>
</div>

<div class="sdpi-item" id="customContainer" style="display:none">
<div class="sdpi-item-label"><a href="https://github.com/CDeenen/MaterialDeck/wiki/Token-Action#custom-stats" target=”_blank”>Custom</a></div>
<div class="sdpi-item-label"><a href="https://github.com/MaterialFoundry/MaterialDeck/wiki/Token-Action#custom-stats" target=”_blank”>Custom</a></div>
<input class="sdpi-item-value" id="custom" value="">
</div>

<div class="wrapper" id="onClickWrapper" style="">
<div class="sdpi-item">
<div class="sdpi-item-label"><a href="https://github.com/CDeenen/MaterialDeck/wiki/Token-Action#on-click" target=”_blank”>On Click</a></div>
<div class="sdpi-item-label"><a href="https://github.com/MaterialFoundry/MaterialDeck/wiki/Token-Action#on-click" target=”_blank”>On Click</a></div>
<select class="sdpi-item-value select" id="onClick" type="select">
<option value='doNothing'>Do Nothing</option>
<option value ='select'>Select Token</option>
Expand All @@ -97,12 +97,12 @@
</div>

<div class="sdpi-item" id="combatantNrSel" stype="display:none">
<div class="sdpi-item-label"><a href="https://github.com/CDeenen/MaterialDeck/wiki/Combat-Tracker-Action#combatant-nr---combatants-mode-only" target=”_blank”>Combatant Nr</a></div>
<div class="sdpi-item-label"><a href="https://github.com/MaterialFoundry/MaterialDeck/wiki/Combat-Tracker-Action#combatant-nr---combatants-mode-only" target=”_blank”>Combatant Nr</a></div>
<input class="sdpi-item-value" id="combatantNr" value="1">
</div>

<div class="sdpi-item">
<div class="sdpi-item-label"><a href="https://github.com/CDeenen/MaterialDeck/wiki/Combat-Tracker-Action#disposition-filter" target=”_blank”>Disposition Filter</a></div>
<div class="sdpi-item-label"><a href="https://github.com/MaterialFoundry/MaterialDeck/wiki/Combat-Tracker-Action#disposition-filter" target=”_blank”>Disposition Filter</a></div>
<select class="sdpi-item-value select" id="dispositionFilter" type="select">
<option value='all'>All Tokens</option>
<option value='friendlyNeutral'>Friendly & Neutral Tokens</option>
Expand All @@ -112,7 +112,7 @@

<div class="sub2" id="dispModeWrapper" style="display:none">
<div class="sdpi-item">
<div class="sdpi-item-label"><a href="https://github.com/CDeenen/MaterialDeck/wiki/Combat-Tracker-Action#mode-1" target=”_blank”>Mode</a></div>
<div class="sdpi-item-label"><a href="https://github.com/MaterialFoundry/MaterialDeck/wiki/Combat-Tracker-Action#mode-1" target=”_blank”>Mode</a></div>
<select class="sdpi-item-value select" id="dispositionMode" type="select">
<option value='remove'>Remove</option>
<option value='black'>Black Button</option>
Expand All @@ -123,7 +123,7 @@
</div>

<div class="sdpi-item">
<div class="sdpi-item-label"><a href="https://github.com/CDeenen/MaterialDeck/wiki/Combat-Tracker-Action#visibility-filter" target=”_blank”>Visibility Filter</a></div>
<div class="sdpi-item-label"><a href="https://github.com/MaterialFoundry/MaterialDeck/wiki/Combat-Tracker-Action#visibility-filter" target=”_blank”>Visibility Filter</a></div>
<select class="sdpi-item-value select" id="visibilityFilter" type="select">
<option value='none'>Don't Hide Invisible Tokens</option>
<option value='hostile'>Hide Hostile Invisible Tokens</option>
Expand All @@ -134,7 +134,7 @@

<div class="sub2" id="visibilityModeWrapper" style="display:none">
<div class="sdpi-item">
<div class="sdpi-item-label"><a href="https://github.com/CDeenen/MaterialDeck/wiki/Combat-Tracker-Action#mode-2" target=”_blank”>Mode</a></div>
<div class="sdpi-item-label"><a href="https://github.com/MaterialFoundry/MaterialDeck/wiki/Combat-Tracker-Action#mode-2" target=”_blank”>Mode</a></div>
<select class="sdpi-item-value select" id="visibilityMode" type="select">
<option value='remove'>Remove</option>
<option value='black'>Black Button</option>
Expand All @@ -145,24 +145,30 @@
</div>

<div type="checkbox" class="sdpi-item">
<div class="sdpi-item-label"><a href="https://github.com/CDeenen/MaterialDeck/wiki/Token-Action#display-name-1" target=”_blank”>Display Name</a></div>
<div class="sdpi-item-label"><a href="https://github.com/MaterialFoundry/MaterialDeck/wiki/Token-Action#display-name-1" target=”_blank”>Display Name</a></div>
<input class="sdpi-item-value" id="displayName" type="checkbox">
<label for="displayName"><span></span></label>
</div>
<div type="checkbox" class="sdpi-item">
<div class="sdpi-item-label"><a href="https://github.com/CDeenen/MaterialDeck/wiki/Token-Action#icon" target=”_blank”>Display Icon</a></div>
<div class="sdpi-item-label"><a href="https://github.com/MaterialFoundry/MaterialDeck/wiki/Token-Action#icon" target=”_blank”>Display Icon</a></div>
<input class="sdpi-item-value" id="displayIcon" type="checkbox">
<label for="displayIcon"><span></span></label>
</div>
</div>
</div>

<div type="range" class="sdpi-item" id="backgroundContainer">
<div class="sdpi-item-label"><a href="https://github.com/CDeenen/MaterialDeck/wiki/Combat-Tracker-Action#background" target=”_blank”>Background</a></div>
<div class="sdpi-item-label"><a href="https://github.com/MaterialFoundry/MaterialDeck/wiki/Combat-Tracker-Action#background" target=”_blank”>Background</a></div>
<div class="sdpi-item-value">
<input type="color" id="background" value="#000000">
</div>
</div>

<div class="sdpi-item" id="buttonIdContainer">
<div class="sdpi-item-label" id="buttonIdLabel"><a href="https://github.com/MaterialFoundry/MaterialDeck/wiki/Change-Buttons-Using-Macros" target=”_blank”>Button Identifier</a></div>
<input class="sdpi-item-value" id="buttonId" value="">
</div>

</div>

<div class="sdpi-info-label hidden" style="top: -1000;" value=""></div>
Expand Down
24 changes: 24 additions & 0 deletions Plugin/com.cdeenen.materialdeck.sdPlugin/propertyinspector/custom.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,minimal-ui,viewport-fit=cover">
<meta name=apple-mobile-web-app-capable content=yes>
<meta name=apple-mobile-web-app-status-bar-style content=black>
<title>com.cdeenen.materialdeck Custom Property Inspector</title>
<link rel="stylesheet" href="css/sdpi.css">
</head>
<body>
<div class="sdpi-wrapper" id="wrapper" style="display:none">
<div class="sdpi-item" id="buttonIdContainer">
<div class="sdpi-item-label" id="buttonIdLabel"><a href="https://github.com/MaterialFoundry/MaterialDeck/wiki/Change-Buttons-Using-Macros" target=”_blank”>Button Identifier</a></div>
<input class="sdpi-item-value" id="buttonId" value="">
</div>
</div>

<div class="sdpi-info-label hidden" style="top: -1000;" value=""></div>
<script src="js/common.js"></script>
<script src="js/common_pi.js"></script>
<script src="js/custom_pi.js"></script>
</body>
</html>
Loading

0 comments on commit a478b57

Please sign in to comment.