Merge branch 'dev-1.3.5'

app/assets/tpl/changelog.html

@@ -1,6 +1,6 @@
 <header>
  <div class="version">
- ::ver::
+ <strong>::mainVer::</strong><em>::patchVer::</em>
  </div>
 
  <div class="title">::title::</div>

app/assets/tpl/colorPicker.html

@@ -5,6 +5,7 @@
  <input type="text" placeholder="rrggbb" />
  <button class="copy gray"> <div class="icon copy"></div> </button>
  <button class="paste dark"> <div class="icon paste"></div> </button>
+ <button class="nullify red"> <div class="icon delete"></div> </button>
 </div>
 
 <div class="picker"></div>

app/assets/tpl/editAllAutoLayerRules.html

@@ -19,11 +19,12 @@ <h2><span class="icon rule"></span> Rules: ::layer::</h2>
  <div class="sortHandle"></div>
  <header>
  <div class="name">
- <div class="icon"></div>
+ <div class="collapserIcon"></div>
+ <div class="customIcon"></div>
  <div class="text"></div>
  </div>
  <input type="text" class="name"/>
- <button class="active transparent"> <span class="icon"></span> </button>
+ <button class="ruleActive transparent"> <span class="icon"></span> </button>
  <button class="useWizard">EDIT</button>
  <button class="addRule"><span class="icon add"></span></button>
  </header>

app/assets/tpl/editEntityDefs.html

@@ -149,6 +149,17 @@ <h2> <div class="icon entity"></div> Project entities </h2>
  </label>
  </dd>
 
+
+ <dt class="uiTile">
+ <label>Alt UI icon</label>
+ <div class="info">Alternative icon to represent this entity in the interface panels and lists.\nIf not set, the Editor Visual settings (see above) will be used by default.</div>
+ </dt>
+ <dd class="uiTile">
+ <select class="uiTileset"></select>
+ <div class="uiTilePicker"></div>
+ </dd>
+
+
  <dt>
  <label>Pivot point</label>
  <div class="info">

app/assets/tpl/editLayerDefs.html

@@ -204,19 +204,27 @@ <h2>
  <label>Grid values</label>
  <info>The list of all Integer values that could be painted in this IntGrid layer.</info>
  </dt>
- <dd class="IntGrid">
- <ul class="intGridValues">
- <li class="add">
- <button type="button" class="gray">+</button>
- </li>
- </ul>
+ <dd class="IntGrid intGridValues">
+ <div class="buttons">
+ <button class="gray addValue" title="Create an IntGrid value"> <span class="icon add"></span> </button>
+ <button class="gray addGroup" title="Create a group of IntGrid values"> <span class="icon folder"></span> </button>
+ </div>
+ <ul class="intGridValuesGroups"></ul>
+
+ <xml id="intGridValuesGroup">
+ <div class="header">
+ <span class="icon folderClose groupIcon"></span>
+ <span class="name"></span>
+ </div>
+ <ul class="intGridValuesGroup"></ul>
+ </xml>
 
  <xml id="intGridValue">
  <div class="sortHandle"></div>
  <span class="id">?</span>
+ <input type="color" value="#ffffff"/>
  <span class="tile"></span>
  <input type="text" class="name" placeholder="Optional value identifier"/>
- <input type="color" value="#ffffff"/>
  <button class="red remove"><span class="icon delete"></span></button>
  </xml>
  </dd>

app/assets/tpl/help.html

@@ -21,6 +21,7 @@ <h3>Video guides</h3>
 
 <div class="keys">
  <div class="column">
+
  <h3>Most important commands</h3>
  <dl class="major">
  <dt> mouseleft </dt>
@@ -45,6 +46,71 @@ <h3>Most important commands</h3>
  <dd>Clear selection, close panel, cancel an action etc.</dd>
  </dl>
 
+
+ <h3>General commands</h3>
+ <dl class="minor">
+ <dt> H </dt>
+ <dd>Show this help</dd>
+
+ <dt> TAB </dt>
+ <dd>Toggle zen mode</dd>
+
+ <dt> CTRL H </dt>
+ <dd>Show/hide visual details</dd>
+
+ <dt> F1 to F10 </dt>
+ <dd>Select layers</dd>
+
+ <dt> F11 </dt>
+ <dd>Toggle fullscreen</dd>
+
+ <dt> F12 </dt>
+ <dd>Open app settings</dd>
+
+ <dt> ctrl S </dt>
+ <dd>Save project</dd>
+
+ <dt> ctrl shift S </dt>
+ <dd>Save project as...</dd>
+
+ <dt> ctrl W </dt>
+ <dd>Close project</dd>
+
+ <dt> ctrl Q </dt>
+ <dd>Quit ::app::</dd>
+
+ <dt> G </dt>
+ <dd>Enable/disable the grid</dd>
+
+ <dt> Shift+A </dt>
+ <dd>Toggle "Single layer" mode</dd>
+
+ <dt> ctrl A </dt>
+ <dd>Select all</dd>
+
+ <dt> DELETE </dt>
+ <dd>Delete selected elements</dd>
+
+ <dt> ctrl R </dt>
+ <dd>Run a project custom command</dd>
+ </dl>
+
+
+ <h3>Sections</h3>
+ <dl class="minor">
+ <dt> P </dt> <dd>Open "Project" panel</dd>
+ <dt> L </dt> <dd>Open "Layers" panel</dd>
+ <dt> E </dt> <dd>Open "Entities" panel</dd>
+ <dt> U </dt> <dd>Open "Enumerations" panel</dd>
+ <dt> T </dt> <dd>Open "Tileset" panel</dd>
+ </dl>
+
+ </div>
+
+
+
+ <div class="column">
+
  <h3>Editing commands</h3>
  <dl class="major">
  <dt> alt + mouseleft </dt>
@@ -66,6 +132,7 @@ <h3>Editing commands</h3>
  <dd>Flood-fill the current area with the selected value.</dd>
  </dl>
 
+
  <h3>Auto-layers</h3>
  <dl class="minor">
  <dt> Shift + R </dt>
@@ -90,66 +157,7 @@ <h3>Tile layers</h3>
  <dt> Y </dt>
  <dd>Y-mirror current tile(s)</dd>
  </dl>
- </div>
-
-
- <div class="column">
- <h3>Sections</h3>
- <dl class="minor">
- <dt> P </dt> <dd>Open "Project" panel</dd>
- <dt> L </dt> <dd>Open "Layers" panel</dd>
- <dt> E </dt> <dd>Open "Entities" panel</dd>
- <dt> U </dt> <dd>Open "Enumerations" panel</dd>
- <dt> T </dt> <dd>Open "Tileset" panel</dd>
- </dl>
-
- <h3>General commands</h3>
- <dl class="minor">
- <dt> H </dt>
- <dd>Show this help</dd>
-
- <dt> CTRL H </dt>
- <dd>Show/hide visual details</dd>
-
- <dt> TAB </dt>
- <dd>Toggle compact mode</dd>
-
- <dt> F1 to F10 </dt>
- <dd>Select layers</dd>
 
- <dt> F11 </dt>
- <dd>Toggle fullscreen</dd>
-
- <dt> F12 </dt>
- <dd>Open app settings</dd>
-
- <dt> ctrl S </dt>
- <dd>Save project</dd>
-
- <dt> ctrl shift S </dt>
- <dd>Save project as...</dd>
-
- <dt> ctrl W </dt>
- <dd>Close project</dd>
-
- <dt> ctrl Q </dt>
- <dd>Quit ::app::</dd>
-
- <dt> G </dt>
- <dd>Enable/disable the grid</dd>
-
- <dt> Shift+A </dt>
- <dd>Toggle "Single layer" mode</dd>
-
- <dt> ctrl A </dt>
- <dd>Select all</dd>
-
- <dt> DELETE </dt>
- <dd>Delete selected elements</dd>
-
- <dt> ctrl R </dt>
- <dd>Run a project custom command</dd>
- </dl>
 
  <h3>World mode</h3>
  <dl class="minor">
@@ -163,7 +171,9 @@ <h3>World mode</h3>
  <dd>Move current level between world layers</dd>
  </dl>
 
+
  </div>
+
 </div>
 
 

app/assets/tpl/pages/editor.html

@@ -6,6 +6,7 @@
 
 <ul id="permanentNotifications"></ul>
 
+<div id="zenModeRevealer"></div>
 <div id="mainPanel">
  <div id="mainBar">
  <div class="buttons panels">
@@ -33,38 +34,50 @@
 </div>
 
 
-<ul id="editingOptions">
+<div id="editingOptions">
 
- <li class="grid warnOff" title="**Grid** Show the layer grid. In supported layer types, hidding the grid will also allow free positionning of elements." keys="G" tip="right">
- <div class="icon gridOn on"></div>
- <div class="icon gridOff off"></div>
- </li>
+ <div class="title visuals">Visuals</div>
+ <ul class="visuals">
+ <li class="zen" title="**Zen mode** This mode automatically hides the left panel to give more editing space." keys="TAB" tip="right">
+ <div class="icon zen on"></div>
+ <div class="icon zen off"></div>
+ </li>
 
- <li class="showDetails warnOff" title="**Show/hide details** When enabled, shows all elements in layers (tiles, entities, intGrid etc.), or only tiles otherwise." keys="CTRL+H" tip="right">
- <div class="icon showDetailsOn on"></div>
- <div class="icon showDetailsOff off"></div>
- </li>
+  <li class="grid" title="**Grid** Show the layer grid. In supported layer types, hidding the grid will also allow free positionning of elements." keys="G" tip="right">
+  <div class="icon gridOn on"></div>
+  <div class="icon gridOff off"></div>
+  </li>
 
- <li class="tileEnums" title="**Show/hide enums** Only applies to Tiles layers and Auto-layers. If this option is enabled, you will see enum colours over your tiles." tip="right">
- <div class="icon enum on"></div>
- <div class="icon enum off"></div>
- </li>
 
- <li class="separator"></li>
+ <li class="showDetails" title="**Show/hide details** When enabled, shows all elements in layers (tiles, entities, intGrid etc.), or only tiles otherwise." keys="CTRL+H" tip="right">
+ <div class="icon showDetailsOn on"></div>
+ <div class="icon showDetailsOff off"></div>
+ </li>
 
- <li class="singleLayerMode" title="**Single layer mode** Enable this to fade all other layers, and focus on active layer only. NOTE: this will also affect the Selection tool (ALT+click)." keys="Shift+A" tip="right">
- <div class="icon singleLayer"></div>
- </li>
+ <li class="tileEnums" title="**Show/hide enum tags** When enabled, shows a color overlay on tiles that have an Enum tag attached to them (see the Tilesets panel to tag tiles using Enums).\nOnly applies to Tiles layers and Auto-layers." tip="right">
+ <div class="icon enum on"></div>
+ <div class="icon enum off"></div>
+ </li>
+ </ul>
 
- <li class="emptySpaceSelection" title="**Select empty spaces** If this option is enabled when you select a level area with ALT+SHIFT+click, the selection will also include EMPTY grid cells." keys="Shift+E" tip="right">
- <div class="icon emptySpaceOn on"></div>
- <div class="icon emptySpaceOff off"></div>
- </li>
+ <div class="title editing">Editing</div>
+ <ul class="editing">
+ <li class="singleLayerMode" title="**Single layer mode** Enable this to fade all other layers, and focus on active layer only. NOTE: this will also affect the Selection tool (ALT+click)." keys="Shift+A" tip="right">
+ <div class="icon singleLayer"></div>
+ </li>
+
+ <li class="emptySpaceSelection" title="**Select empty spaces** If this option is enabled when you select a level area with ALT+SHIFT+click, the selection will also include EMPTY grid cells." keys="Shift+E" tip="right">
+ <div class="icon emptySpaceOn on"></div>
+ <div class="icon emptySpaceOff off"></div>
+ </li>
+
+ <li class="tileStacking" title="**Tile stacking** Only applies to Tiles layers. If this option is enabled, you will be able to stack multiple tiles in a single grid cell." keys="Shift+T" tip="right">
+ <div class="icon tile"></div>
+ </li>
+ </ul>
+
+</div>
 
- <li class="tileStacking" title="**Tile stacking** Only applies to Tiles layers. If this option is enabled, you will be able to stack multiple tiles in a single grid cell." keys="Shift+T" tip="right">
- <div class="icon tile"></div>
- </li>
-</ul>
 
 <div id="worldList">
  <ul></ul>
@@ -92,14 +105,11 @@
 </xml>
 
 <xml class="layer">
- <span class="shortcut notCompact"></span>
- <span class="layerIcon notCompact"></span>
+ <span class="shortcut"></span>
+ <span class="layerIcon"></span>
  <span class="name"></span>
- <span class="actions notCompact">
- <a class="rules" href="#">
- <span class="icon rule onlyCompact"></span>
- <span class="notCompact">Rules</span>
- </a>
+ <span class="actions">
+ <a class="rules" href="#">Rules</a>
  <span class="vis"> <span class="icon"></span> </span>
  </span>
 </xml>