Skip to content

Commit fa780b1

Browse files
s-kaniadeepnightMatiisscode807jeremyfa
authored
Updated master (#3)
* Fixed CDB enum import crash * Updated version to 1.5.4 * Changelog * Changelog * ADD uid ref to docs * UPD quicktypes * ADD uid refs listings * UPD changelog * ADD support for custom json style * FIX project panel label * ADD json style to project panel * UPD empty map sample * UPD docs * FIX cache invalidation when changing json style * UPD changelog * Docs * ADD full logo images * FIX logo * Fix `Type not found : dn.Bresenham` (deepnight#1145) * UPD docs * Custom Guide Grid Color (deepnight#1170) * Fix `Type not found : dn.Bresenham` (deepnight#1145) * Add custom guide grid color * fix guideColor error while loading old files --------- Co-authored-by: Matiiss <83066658+Matiiss@users.noreply.github.com> * FIX quickPick warning * FIX codemirror abstract enum * UPD docs * fix spelling error, change default value tooltip for strings (deepnight#1168) * FIX gettext changes * ADD support cdb uniqueIds in sheet lists * UPD changelog * Experiment with level multi-selection in world view, allowing grouped moves * UPD changelog * fix: bump version to 1.5.4-rs1 --------- Co-authored-by: Sebastien Benard <github@deepnight.net> Co-authored-by: Matiiss <83066658+Matiiss@users.noreply.github.com> Co-authored-by: code807 <noahcrandall.m@gmail.com> Co-authored-by: Jeremy Faivre <contact@jeremyfa.com>
1 parent ce4b423 commit fa780b1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+1104
-345
lines changed

app/assets/tpl/editLayerDefs.html

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,18 @@ <h2>
179179
<span>px</span>
180180
</dd>
181181

182+
<dt>
183+
<label for="guideColor">Guide grid color</label>
184+
<info>This color will be used for the optional secondary grid. If not specified, the secondary grid's color will be based on the project's background color.</info>
185+
</dt>
186+
<dd>
187+
<input type="color" name="guideColor" id="guideColor"/>
188+
<span>Opacity:</span>
189+
<input type="text" name="guideOpacity" class="small" id="guideOpacity"/>
190+
<span>%</span>
191+
<button class="transparent resetGuideColor small"> <span class="icon reset"></span> </button>
192+
</dd>
193+
182194
<dt>
183195
<label for="uiFilterTags">UI tags</label>
184196
<div class="info">These tags are used to filter elements from your layer list in the main editor panel.</div>

app/assets/tpl/editProject.html

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ <h2>
1515
<dt class="full"> <h3>Extra files</h3> </dt>
1616

1717
<dt>
18-
<label for="minify">Super simple export ❤</label>
18+
<label for="simplifiedExport">Super simple export ❤</label>
1919
<info tip="bottom">
2020
Enable this to export your level data in a secondary super simple format, ideal for quick integration in ANY existing engine.
2121
You will get:
@@ -116,15 +116,14 @@ <h2>
116116
</dd>
117117

118118
<dt>
119-
<label for="minify">Minify JSON</label>
119+
<label for="jsonStyle">JSON indent style</label>
120120
<info>
121-
Enable this to save project JSON file without any "pretty" formatting (ie. white spaces and indentation).
122-
This is NOT necessarily recommended if your project is stored on a versioning system (git, svn etc.) because this could cause issues with diffs and merging operations.
123-
Only use this option if you really need to reduce the project files size.
121+
You can adjust the way the JSON file is formated by LDtk (ie. white spaces and indentation).
122+
Only use Minified if you really need to reduce the project files size. This will cause issues with diffs and merging operations.
124123
</info>
125124
</dt>
126125
<dd>
127-
<input type="checkbox" name="minify" id="minify"/>
126+
<select id="jsonStyle"></select>
128127
</dd>
129128

130129
<dt>

app/assets/tpl/fieldDefsForm.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656

5757
<dt class="full"> <h3>Value specifications</h3> </dt>
5858

59-
<dt class="F_Int F_Float F_String">
59+
<dt class="F_Int F_Float">
6060
<label for="fDef">Default value</label>
6161
<info>This is the default number value for this field, unless overridden with something else.</info>
6262
</dt>
@@ -65,7 +65,7 @@
6565
</dd>
6666

6767

68-
<dt class="F_Text">
68+
<dt class="F_Text F_String">
6969
<label for="fDefMultiLines">Default value</label>
7070
<info>This is the default text for this field, unless modified manually.</info>
7171
</dt>

app/assets/tpl/pages/editor.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<div class="icon zen off"></div>
4444
</li>
4545

46-
<li class="grid" title="**Grid** Show the layer grid. In supported layer types, hiding the grid will also allow free positionning of elements." keys="G" tip="right">
46+
<li class="grid" title="**Grid** Show the layer grid. In supported layer types, hiding the grid will also allow free positioning of elements." keys="G" tip="right">
4747
<div class="icon gridOn on"></div>
4848
<div class="icon gridOff off"></div>
4949
</li>

app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ldtk-rp",
3-
"version": "1.0.1",
3+
"version": "1.5.4-rs1",
44
"main": "assets/main.js",
55
"productName": "LDtk - Ripped Sails",
66
"author": "Stefan Kania",
71.8 KB
Binary file not shown.
63.1 KB
Loading

art/logo/fullLogo/fullLogo.png

11.6 KB
Loading

docs/CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
# 1.5.4
2+
3+
- Multi-levels selection in world view (a big thank you to JeremyFa / https://github.com/jeremyfa)
4+
- Added a new Project setting to customize the JSON indentation (Full, Compact or Minified)
5+
- The online JSON documentation now shows references between UID fields.
6+
- Fixed a crash when updating an external CastleDB file
7+
- Fixed support for Aseprite 1.3.5 files
8+
- CastleDB: fixed support for unique IDs in lists (note: nested lists in lists are not supported yet)
9+
110
# 1.5.3
211

312
- Fixed a crash when trying to add a newly created Entity

docs/JSON_DOC.md

Lines changed: 58 additions & 55 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)