Merge commit '2d4e90ca4fa41dffe9d5084200ef1c915ba1d799'

deepnight · Jan 11, 2024 · 65619aa · 65619aa
2 parents 74d324e + 2d4e90c
commit 65619aa
Show file tree

Hide file tree

Showing 62 changed files with 79,516 additions and 350 deletions.
diff --git a/app/assets/css/app.min.css b/app/assets/css/app.min.css
diff --git a/app/assets/css/app.scss b/app/assets/css/app.scss
@@ -2547,7 +2547,6 @@ textarea {
 				font-weight: bold;
 				font-size: 9pt;
 				font-family: 'Courier New', Courier, monospace;
-				text-transform: uppercase;
 				border: 1px solid $bgLighter;
 				background-color: $bgLight;
 				border-left-color: $almostWhite;
@@ -5220,7 +5219,7 @@ canvas#webgl {
 				background-image: url("../img/stripes.png");
 			}
 
-			ul.niceList {
+			&>ul.niceList {
 				height: 100%;
 				box-sizing: border-box;
 			}
@@ -6506,7 +6505,7 @@ canvas#webgl {
 	&.intGrid {
 		grid-template-rows: min-content auto fit-content(24px);
 
-		.bar {
+		>.bar {
 			display: grid;
 			gap: 4px;
 			grid-template-columns: auto min-content;
@@ -6515,7 +6514,7 @@ canvas#webgl {
 			}
 		}
 
-		ul.niceList {
+		>ul.niceList {
 			&:not(.col-1) .subList ul {
 				display: grid;
 
@@ -6547,7 +6546,7 @@ canvas#webgl {
 		}
 	}
 
-	&.intGrid ul.niceList {
+	&.intGrid>ul.niceList {
 		&:not(.col-1) .subList ul li {
 			.intGridValue {
 				width: 100%;
@@ -6571,7 +6570,7 @@ canvas#webgl {
 	}
 
 
-	&.entities ul.niceList {
+	&.entities>ul.niceList {
 		&:not(.col-1) .subList ul li {
 			.entityPreview  {
 				margin: 0;
@@ -6633,7 +6632,7 @@ canvas#webgl {
 	}
 
 
-	ul.niceList {
+	>ul.niceList {
 		margin: 0;
 		padding: 4px;
 		width: 100%;
@@ -7720,6 +7719,7 @@ dl.form.fieldInstanceEditor {
 						margin: 0;
 						text-transform: none;
 						font-weight: bold;
+						text-align: left;
 						color: white;
 						cursor: pointer;
 					}

diff --git a/app/assets/tpl/editLayerDefs.html b/app/assets/tpl/editLayerDefs.html
@@ -274,11 +274,11 @@ <h2>
 		</dd>
 
 
-		<dt class="AutoLayer">
+		<dt class="AutoLayer IntGridAutoLayer">
 			<label>Kill tiles</label>
 			<info>If the selected Tile layer contains any tiles, this auto-layer won't draw anything under them.</info>
 		</dt>
-		<dd class="AutoLayer">
+		<dd class="AutoLayer IntGridAutoLayer">
 			<select name="autoKillLayer"></select>
 		</dd>
 

diff --git a/app/buildAssets/icon.icns b/app/buildAssets/icon.icns
diff --git a/app/buildAssets/level.icns b/app/buildAssets/level.icns
diff --git a/app/buildAssets/project.icns b/app/buildAssets/project.icns
diff --git a/app/extraFiles/samples/AutoLayers_1_basic.ldtk b/app/extraFiles/samples/AutoLayers_1_basic.ldtk
@@ -5,12 +5,12 @@
 		"doc": "https://ldtk.io/json",
 		"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
 		"appAuthor": "Sebastien 'deepnight' Benard",
-		"appVersion": "1.5.0",
+		"appVersion": "1.5.1",
 		"url": "https://ldtk.io"
 	},
 	"iid": "a22d35f0-7820-11ed-b6fd-213e885f30da",
-	"jsonVersion": "1.5.0",
-	"appBuildId": 473583,
+	"jsonVersion": "1.5.1",
+	"appBuildId": 473601,
 	"nextUid": 112,
 	"identifierStyle": "Capitalize",
 	"toc": [],

diff --git a/app/extraFiles/samples/AutoLayers_2_stamps.ldtk b/app/extraFiles/samples/AutoLayers_2_stamps.ldtk
@@ -5,12 +5,12 @@
 		"doc": "https://ldtk.io/json",
 		"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
 		"appAuthor": "Sebastien 'deepnight' Benard",
-		"appVersion": "1.5.0",
+		"appVersion": "1.5.1",
 		"url": "https://ldtk.io"
 	},
 	"iid": "a243f240-7820-11ed-b6fd-f550906acdc3",
-	"jsonVersion": "1.5.0",
-	"appBuildId": 473583,
+	"jsonVersion": "1.5.1",
+	"appBuildId": 473601,
 	"nextUid": 40,
 	"identifierStyle": "Capitalize",
 	"toc": [],

diff --git a/app/extraFiles/samples/AutoLayers_3_Mosaic.ldtk b/app/extraFiles/samples/AutoLayers_3_Mosaic.ldtk
@@ -5,12 +5,12 @@
 		"doc": "https://ldtk.io/json",
 		"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
 		"appAuthor": "Sebastien 'deepnight' Benard",
-		"appVersion": "1.5.0",
+		"appVersion": "1.5.1",
 		"url": "https://ldtk.io"
 	},
 	"iid": "a2533480-7820-11ed-b6fd-e9108160ae94",
-	"jsonVersion": "1.5.0",
-	"appBuildId": 473583,
+	"jsonVersion": "1.5.1",
+	"appBuildId": 473601,
 	"nextUid": 64,
 	"identifierStyle": "Capitalize",
 	"toc": [],

diff --git a/app/extraFiles/samples/AutoLayers_4_Assistant.ldtk b/app/extraFiles/samples/AutoLayers_4_Assistant.ldtk
@@ -5,12 +5,12 @@
 		"doc": "https://ldtk.io/json",
 		"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
 		"appAuthor": "Sebastien 'deepnight' Benard",
-		"appVersion": "1.5.0",
+		"appVersion": "1.5.1",
 		"url": "https://ldtk.io"
 	},
 	"iid": "a2533480-7820-11ed-b6fd-e9108160ae94",
-	"jsonVersion": "1.5.0",
-	"appBuildId": 473583,
+	"jsonVersion": "1.5.1",
+	"appBuildId": 473601,
 	"nextUid": 652,
 	"identifierStyle": "Capitalize",
 	"toc": [],

diff --git a/app/extraFiles/samples/AutoLayers_5_Advanced.ldtk b/app/extraFiles/samples/AutoLayers_5_Advanced.ldtk
@@ -5,12 +5,12 @@
 		"doc": "https://ldtk.io/json",
 		"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
 		"appAuthor": "Sebastien 'deepnight' Benard",
-		"appVersion": "1.5.0",
+		"appVersion": "1.5.1",
 		"url": "https://ldtk.io"
 	},
 	"iid": "a26276c0-7820-11ed-b6fd-ed05d55c9a75",
-	"jsonVersion": "1.5.0",
-	"appBuildId": 473583,
+	"jsonVersion": "1.5.1",
+	"appBuildId": 473601,
 	"nextUid": 106,
 	"identifierStyle": "Capitalize",
 	"toc": [],

diff --git a/app/extraFiles/samples/AutoLayers_6_OptionalRules.ldtk b/app/extraFiles/samples/AutoLayers_6_OptionalRules.ldtk
@@ -5,12 +5,12 @@
 		"doc": "https://ldtk.io/json",
 		"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
 		"appAuthor": "Sebastien 'deepnight' Benard",
-		"appVersion": "1.5.0",
+		"appVersion": "1.5.1",
 		"url": "https://ldtk.io"
 	},
 	"iid": "a27ed860-7820-11ed-b6fd-7fbe30dcfa27",
-	"jsonVersion": "1.5.0",
-	"appBuildId": 473583,
+	"jsonVersion": "1.5.1",
+	"appBuildId": 473601,
 	"nextUid": 167,
 	"identifierStyle": "Capitalize",
 	"toc": [],

diff --git a/app/extraFiles/samples/AutoLayers_7_Biomes.ldtk b/app/extraFiles/samples/AutoLayers_7_Biomes.ldtk
@@ -5,12 +5,12 @@
 		"doc": "https://ldtk.io/json",
 		"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
 		"appAuthor": "Sebastien 'deepnight' Benard",
-		"appVersion": "1.5.0",
+		"appVersion": "1.5.1",
 		"url": "https://ldtk.io"
 	},
 	"iid": "a27ed860-7820-11ed-b6fd-7fbe30dcfa27",
-	"jsonVersion": "1.5.0",
-	"appBuildId": 473583,
+	"jsonVersion": "1.5.1",
+	"appBuildId": 473601,
 	"nextUid": 181,
 	"identifierStyle": "Capitalize",
 	"toc": [],

diff --git a/app/extraFiles/samples/Entities.ldtk b/app/extraFiles/samples/Entities.ldtk
@@ -5,12 +5,12 @@
 		"doc": "https://ldtk.io/json",
 		"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
 		"appAuthor": "Sebastien 'deepnight' Benard",
-		"appVersion": "1.5.0",
+		"appVersion": "1.5.1",
 		"url": "https://ldtk.io"
 	},
 	"iid": "a2a4fe00-7820-11ed-b6fd-9b53622ece75",
-	"jsonVersion": "1.5.0",
-	"appBuildId": 473583,
+	"jsonVersion": "1.5.1",
+	"appBuildId": 473601,
 	"nextUid": 198,
 	"identifierStyle": "Capitalize",
 	"toc": [{

diff --git a/app/extraFiles/samples/SeparateLevelFiles.ldtk b/app/extraFiles/samples/SeparateLevelFiles.ldtk
@@ -5,12 +5,12 @@
 		"doc": "https://ldtk.io/json",
 		"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
 		"appAuthor": "Sebastien 'deepnight' Benard",
-		"appVersion": "1.5.0",
+		"appVersion": "1.5.1",
 		"url": "https://ldtk.io"
 	},
 	"iid": "a2d9f0b0-7820-11ed-b6fd-010ddaafa733",
-	"jsonVersion": "1.5.0",
-	"appBuildId": 473583,
+	"jsonVersion": "1.5.1",
+	"appBuildId": 473601,
 	"nextUid": 10,
 	"identifierStyle": "Capitalize",
 	"toc": [],

diff --git a/app/extraFiles/samples/SeparateLevelFiles/World_Level_0.ldtkl b/app/extraFiles/samples/SeparateLevelFiles/World_Level_0.ldtkl
@@ -5,7 +5,7 @@
 		"doc": "https://ldtk.io/json",
 		"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
 		"appAuthor": "Sebastien 'deepnight' Benard",
-		"appVersion": "1.5.0",
+		"appVersion": "1.5.1",
 		"url": "https://ldtk.io"
 	},
 	"identifier": "World_Level_0",

diff --git a/app/extraFiles/samples/SeparateLevelFiles/World_Level_1.ldtkl b/app/extraFiles/samples/SeparateLevelFiles/World_Level_1.ldtkl
@@ -5,7 +5,7 @@
 		"doc": "https://ldtk.io/json",
 		"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
 		"appAuthor": "Sebastien 'deepnight' Benard",
-		"appVersion": "1.5.0",
+		"appVersion": "1.5.1",
 		"url": "https://ldtk.io"
 	},
 	"identifier": "World_Level_1",

diff --git a/app/extraFiles/samples/SeparateLevelFiles/World_Level_2.ldtkl b/app/extraFiles/samples/SeparateLevelFiles/World_Level_2.ldtkl
@@ -5,7 +5,7 @@
 		"doc": "https://ldtk.io/json",
 		"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
 		"appAuthor": "Sebastien 'deepnight' Benard",
-		"appVersion": "1.5.0",
+		"appVersion": "1.5.1",
 		"url": "https://ldtk.io"
 	},
 	"identifier": "World_Level_2",

diff --git a/app/extraFiles/samples/Test_file_for_API_showing_all_features.ldtk b/app/extraFiles/samples/Test_file_for_API_showing_all_features.ldtk
@@ -5,12 +5,12 @@
 		"doc": "https://ldtk.io/json",
 		"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
 		"appAuthor": "Sebastien 'deepnight' Benard",
-		"appVersion": "1.5.0",
+		"appVersion": "1.5.1",
 		"url": "https://ldtk.io"
 	},
 	"iid": "a2e6e900-7820-11ed-b6fd-61d0df8fd468",
-	"jsonVersion": "1.5.0",
-	"appBuildId": 473583,
+	"jsonVersion": "1.5.1",
+	"appBuildId": 473601,
 	"nextUid": 50,
 	"identifierStyle": "Capitalize",
 	"toc": [{

diff --git a/app/extraFiles/samples/Typical_2D_platformer_example.ldtk b/app/extraFiles/samples/Typical_2D_platformer_example.ldtk
@@ -5,12 +5,12 @@
 		"doc": "https://ldtk.io/json",
 		"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
 		"appAuthor": "Sebastien 'deepnight' Benard",
-		"appVersion": "1.5.0",
+		"appVersion": "1.5.1",
 		"url": "https://ldtk.io"
 	},
 	"iid": "a302fc80-7820-11ed-b6fd-0944dd561895",
-	"jsonVersion": "1.5.0",
-	"appBuildId": 473583,
+	"jsonVersion": "1.5.1",
+	"appBuildId": 473601,
 	"nextUid": 106,
 	"identifierStyle": "Capitalize",
 	"toc": [],

diff --git a/app/extraFiles/samples/Typical_TopDown_example.ldtk b/app/extraFiles/samples/Typical_TopDown_example.ldtk
@@ -5,12 +5,12 @@
 		"doc": "https://ldtk.io/json",
 		"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
 		"appAuthor": "Sebastien 'deepnight' Benard",
-		"appVersion": "1.5.0",
+		"appVersion": "1.5.1",
 		"url": "https://ldtk.io"
 	},
 	"iid": "a3386460-7820-11ed-b6fd-157a63b4d02d",
-	"jsonVersion": "1.5.0",
-	"appBuildId": 473583,
+	"jsonVersion": "1.5.1",
+	"appBuildId": 473601,
 	"nextUid": 170,
 	"identifierStyle": "Capitalize",
 	"toc": [{

diff --git a/app/extraFiles/samples/WorldMap_Free_layout.ldtk b/app/extraFiles/samples/WorldMap_Free_layout.ldtk
@@ -5,12 +5,12 @@
 		"doc": "https://ldtk.io/json",
 		"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
 		"appAuthor": "Sebastien 'deepnight' Benard",
-		"appVersion": "1.5.0",
+		"appVersion": "1.5.1",
 		"url": "https://ldtk.io"
 	},
 	"iid": "a3619740-7820-11ed-b6fd-4b64aa0352a1",
-	"jsonVersion": "1.5.0",
-	"appBuildId": 473583,
+	"jsonVersion": "1.5.1",
+	"appBuildId": 473601,
 	"nextUid": 125,
 	"identifierStyle": "Capitalize",
 	"toc": [],

diff --git a/app/extraFiles/samples/WorldMap_GridVania_layout.ldtk b/app/extraFiles/samples/WorldMap_GridVania_layout.ldtk
@@ -5,12 +5,12 @@
 		"doc": "https://ldtk.io/json",
 		"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
 		"appAuthor": "Sebastien 'deepnight' Benard",
-		"appVersion": "1.5.0",
+		"appVersion": "1.5.1",
 		"url": "https://ldtk.io"
 	},
 	"iid": "a39fb1b0-7820-11ed-b6fd-87f9a01f3d6b",
-	"jsonVersion": "1.5.0",
-	"appBuildId": 473583,
+	"jsonVersion": "1.5.1",
+	"appBuildId": 473601,
 	"nextUid": 146,
 	"identifierStyle": "Capitalize",
 	"toc": [{

diff --git a/app/package.json b/app/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "ldtk",
-	"version": "1.5.0",
+	"version": "1.5.1",
 	"main": "assets/main.js",
 	"productName": "LDtk",
 	"author": "Sebastien Benard",

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -1,3 +1,16 @@
+# 1.5.1
+
+- Fixed visual feedback when painting tiles in a Tile layer with "Asynchronous render" enabled.
+- Fixed a crash when creating a new World.
+- Updated macOS icons.
+- Fixed "Kill Tiles" layer option to work as intended with IntGrid layers.
+- Fixed a minor visual bug with neighbour levels rendering.
+- Fixed support for layer opacity settings in neighbour levels rendering.
+- Fixed a render bug when resizing levels.
+- Fixed WorldDepth value in automatic level names pattern.
+- Various minor optimizations.
+- Various UI fixes.
+
 # 1.5.0 - New LDtk logo
 
 ## LDtk logo

diff --git a/docs/JSON_DOC.md b/docs/JSON_DOC.md
@@ -1,4 +1,4 @@
-# LDtk Json structure (version 1.5.0)
+# LDtk Json structure (version 1.5.1)
 
 
 <a id="ldtk-ProjectJson" name="ldtk-ProjectJson"></a>

diff --git a/docs/JSON_SCHEMA.json b/docs/JSON_SCHEMA.json
@@ -1,9 +1,9 @@
 {
 	"description": "This file is a JSON schema of files created by LDtk level editor (https://ldtk.io).",
-	"title": "LDtk 1.5.0 JSON schema",
+	"title": "LDtk 1.5.1 JSON schema",
 	"$schema": "https://json-schema.org/draft-07/schema#",
 	"$ref": "#/LdtkJsonRoot",
-	"version": "1.5.0",
+	"version": "1.5.1",
 	"LdtkJsonRoot": {
 		"description": "This is the root of any Project JSON file. It contains:  - the project settings, - an array of levels, - a group of definitions (that can probably be safely ignored for most users).",
 		"title": "LDtk Json root",

diff --git a/docs/MINIMAL_JSON_SCHEMA.json b/docs/MINIMAL_JSON_SCHEMA.json
@@ -1,9 +1,9 @@
 {
 	"description": "This file is a JSON schema of files created by LDtk level editor (https://ldtk.io).",
-	"title": "LDtk 1.5.0 JSON schema",
+	"title": "LDtk 1.5.1 JSON schema",
 	"$schema": "https://json-schema.org/draft-07/schema#",
 	"$ref": "#/LdtkJsonRoot",
-	"version": "1.5.0",
+	"version": "1.5.1",
 	"LdtkJsonRoot": {
 		"description": "This is the root of any Project JSON file. It contains:  - the project settings, - an array of levels, - a group of definitions (that can probably be safely ignored for most users).",
 		"title": "LDtk Json root",

diff --git a/docs/deploy/deployChecklist.md b/docs/deploy/deployChecklist.md
@@ -46,7 +46,7 @@
 ## Publish Itch
 - [ ] Run `npm run publish-itchio`
 - [ ] Upload macOS build to Itch.io ([link](https://itch.io/dashboard))
-- [ ] Upload Linux build to Itch.io
+- [ ] Upload Linux build to Itch.io ([link](https://itch.io/dashboard))
 - [ ] Add a devlog post on Itch.io ([link](https://deepnight.itch.io/ldtk))
 - [ ] *[Optional]* Update Itch.io page