Merge branch 'dev-0.9.2'

deepnight · Apr 20, 2021 · d3c800f · d3c800f
2 parents 4140b62 + f44e22b
commit d3c800f
Show file tree

Hide file tree

Showing 32 changed files with 25,035 additions and 69 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
@@ -6030,7 +6030,7 @@ $patternSize : 32px;
 
 	.content {
 		width: 890px;
-		grid-template-rows: min-content min-content auto;
+		grid-template-rows: min-content min-content min-content auto;
 		.mainList {
 			grid-row: 3/5;
 		}

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

diff --git a/app/samples/AutoLayers_1_basic.ldtk b/app/samples/AutoLayers_1_basic.ldtk
@@ -5,10 +5,10 @@
 		"doc": "https://ldtk.io/json",
 		"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
 		"appAuthor": "Sebastien 'deepnight' Benard",
-		"appVersion": "0.9.1",
+		"appVersion": "0.9.2",
 		"url": "https://ldtk.io"
 	},
-	"jsonVersion": "0.9.1",
+	"jsonVersion": "0.9.2",
 	"nextUid": 108,
 	"worldLayout": "Free",
 	"worldGridWidth": 128,

diff --git a/app/samples/AutoLayers_2_stamps.ldtk b/app/samples/AutoLayers_2_stamps.ldtk
@@ -5,10 +5,10 @@
 		"doc": "https://ldtk.io/json",
 		"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
 		"appAuthor": "Sebastien 'deepnight' Benard",
-		"appVersion": "0.9.1",
+		"appVersion": "0.9.2",
 		"url": "https://ldtk.io"
 	},
-	"jsonVersion": "0.9.1",
+	"jsonVersion": "0.9.2",
 	"nextUid": 39,
 	"worldLayout": "Free",
 	"worldGridWidth": 256,

diff --git a/app/samples/AutoLayers_3_Mosaic.ldtk b/app/samples/AutoLayers_3_Mosaic.ldtk
@@ -5,10 +5,10 @@
 		"doc": "https://ldtk.io/json",
 		"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
 		"appAuthor": "Sebastien 'deepnight' Benard",
-		"appVersion": "0.9.1",
+		"appVersion": "0.9.2",
 		"url": "https://ldtk.io"
 	},
-	"jsonVersion": "0.9.1",
+	"jsonVersion": "0.9.2",
 	"nextUid": 53,
 	"worldLayout": "Free",
 	"worldGridWidth": 256,

diff --git a/app/samples/AutoLayers_4_Advanced.ldtk b/app/samples/AutoLayers_4_Advanced.ldtk
@@ -5,10 +5,10 @@
 		"doc": "https://ldtk.io/json",
 		"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
 		"appAuthor": "Sebastien 'deepnight' Benard",
-		"appVersion": "0.9.1",
+		"appVersion": "0.9.2",
 		"url": "https://ldtk.io"
 	},
-	"jsonVersion": "0.9.1",
+	"jsonVersion": "0.9.2",
 	"nextUid": 98,
 	"worldLayout": "Free",
 	"worldGridWidth": 256,

diff --git a/app/samples/AutoLayers_5_OptionalRules.ldtk b/app/samples/AutoLayers_5_OptionalRules.ldtk
@@ -5,10 +5,10 @@
 		"doc": "https://ldtk.io/json",
 		"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
 		"appAuthor": "Sebastien 'deepnight' Benard",
-		"appVersion": "0.9.1",
+		"appVersion": "0.9.2",
 		"url": "https://ldtk.io"
 	},
-	"jsonVersion": "0.9.1",
+	"jsonVersion": "0.9.2",
 	"nextUid": 148,
 	"worldLayout": "GridVania",
 	"worldGridWidth": 256,

diff --git a/app/samples/Entities.ldtk b/app/samples/Entities.ldtk
@@ -5,10 +5,10 @@
 		"doc": "https://ldtk.io/json",
 		"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
 		"appAuthor": "Sebastien 'deepnight' Benard",
-		"appVersion": "0.9.1",
+		"appVersion": "0.9.2",
 		"url": "https://ldtk.io"
 	},
-	"jsonVersion": "0.9.1",
+	"jsonVersion": "0.9.2",
 	"nextUid": 91,
 	"worldLayout": "Free",
 	"worldGridWidth": 256,

diff --git a/app/samples/SeparateLevelFiles.ldtk b/app/samples/SeparateLevelFiles.ldtk
@@ -5,10 +5,10 @@
 		"doc": "https://ldtk.io/json",
 		"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
 		"appAuthor": "Sebastien 'deepnight' Benard",
-		"appVersion": "0.9.1",
+		"appVersion": "0.9.2",
 		"url": "https://ldtk.io"
 	},
-	"jsonVersion": "0.9.1",
+	"jsonVersion": "0.9.2",
 	"nextUid": 10,
 	"worldLayout": "LinearHorizontal",
 	"worldGridWidth": 240,

diff --git a/app/samples/SeparateLevelFiles/0000-Level_0.ldtkl b/app/samples/SeparateLevelFiles/0000-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": "0.9.1",
+		"appVersion": "0.9.2",
 		"url": "https://ldtk.io"
 	},
 	"identifier": "Level_0",

diff --git a/app/samples/SeparateLevelFiles/0001-Level_1.ldtkl b/app/samples/SeparateLevelFiles/0001-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": "0.9.1",
+		"appVersion": "0.9.2",
 		"url": "https://ldtk.io"
 	},
 	"identifier": "Level_1",

diff --git a/app/samples/SeparateLevelFiles/0002-Level_2.ldtkl b/app/samples/SeparateLevelFiles/0002-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": "0.9.1",
+		"appVersion": "0.9.2",
 		"url": "https://ldtk.io"
 	},
 	"identifier": "Level_2",

diff --git a/app/samples/Test_file_for_API_showing_all_features.ldtk b/app/samples/Test_file_for_API_showing_all_features.ldtk
@@ -5,10 +5,10 @@
 		"doc": "https://ldtk.io/json",
 		"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
 		"appAuthor": "Sebastien 'deepnight' Benard",
-		"appVersion": "0.9.1",
+		"appVersion": "0.9.2",
 		"url": "https://ldtk.io"
 	},
-	"jsonVersion": "0.9.1",
+	"jsonVersion": "0.9.2",
 	"nextUid": 45,
 	"worldLayout": "LinearVertical",
 	"worldGridWidth": 256,

diff --git a/app/samples/Typical_2D_platformer_example.ldtk b/app/samples/Typical_2D_platformer_example.ldtk
@@ -5,10 +5,10 @@
 		"doc": "https://ldtk.io/json",
 		"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
 		"appAuthor": "Sebastien 'deepnight' Benard",
-		"appVersion": "0.9.1",
+		"appVersion": "0.9.2",
 		"url": "https://ldtk.io"
 	},
-	"jsonVersion": "0.9.1",
+	"jsonVersion": "0.9.2",
 	"nextUid": 94,
 	"worldLayout": "Free",
 	"worldGridWidth": 256,

diff --git a/app/samples/Typical_TopDown_example.ldtk b/app/samples/Typical_TopDown_example.ldtk
@@ -5,10 +5,10 @@
 		"doc": "https://ldtk.io/json",
 		"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
 		"appAuthor": "Sebastien 'deepnight' Benard",
-		"appVersion": "0.9.1",
+		"appVersion": "0.9.2",
 		"url": "https://ldtk.io"
 	},
-	"jsonVersion": "0.9.1",
+	"jsonVersion": "0.9.2",
 	"nextUid": 86,
 	"worldLayout": "Free",
 	"worldGridWidth": 256,

diff --git a/app/samples/WorldMap_Free_layout.ldtk b/app/samples/WorldMap_Free_layout.ldtk
@@ -5,10 +5,10 @@
 		"doc": "https://ldtk.io/json",
 		"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
 		"appAuthor": "Sebastien 'deepnight' Benard",
-		"appVersion": "0.9.1",
+		"appVersion": "0.9.2",
 		"url": "https://ldtk.io"
 	},
-	"jsonVersion": "0.9.1",
+	"jsonVersion": "0.9.2",
 	"nextUid": 48,
 	"worldLayout": "Free",
 	"worldGridWidth": 256,

diff --git a/app/samples/WorldMap_GridVania_layout.ldtk b/app/samples/WorldMap_GridVania_layout.ldtk
@@ -5,10 +5,10 @@
 		"doc": "https://ldtk.io/json",
 		"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
 		"appAuthor": "Sebastien 'deepnight' Benard",
-		"appVersion": "0.9.1",
+		"appVersion": "0.9.2",
 		"url": "https://ldtk.io"
 	},
-	"jsonVersion": "0.9.1",
+	"jsonVersion": "0.9.2",
 	"nextUid": 103,
 	"worldLayout": "GridVania",
 	"worldGridWidth": 256,

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -1,10 +1,19 @@
+# 0.9.2
+
+  - Added a tiny "(...)" above entities with fields when they are hidden
+  - Fixed "re-open last project" that could sometime reset app settings
+  - Fixed rule editor not updating when changing pivot
+  - Fixed incorrect "Perlin noise" preview when right click on the Perlin option in Rules panel.
+  - Fixed "shrinking" tileset view when panning it
+  - Fixed discarded "levelPaths" array when importing OGMO projects
+
 # 0.9.1
 
- - **Fixed broken "New project" button. Sorry!**
- - Added an option to **re-open last project** when starting LDtk (open Settings with `F12`)
- - Hold `CTRL` to disable preview when moving mouse over auto-layer rules.
- - Fixed missing tooltips in rules panel.
- - Fixed tooltips staying on screen in rules panel.
+  - **Fixed broken "New project" button. Sorry!**
+  - Added an option to **re-open last project** when starting LDtk (open Settings with `F12`)
+  - Hold `CTRL` to disable preview when moving mouse over auto-layer rules.
+  - Fixed missing tooltips in rules panel.
+  - Fixed tooltips staying on screen in rules panel.
 
 
 # 0.9.0 - Biomes and tags

diff --git a/docs/JSON_DOC.md b/docs/JSON_DOC.md
@@ -1,4 +1,4 @@
-# LDtk Json structure (version 0.9.1)
+# LDtk Json structure (version 0.9.2)
 
 ## Table of contents
    - [LDtk Json root](#ldtk-ProjectJson)

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 0.9.1 JSON schema",
+	"title": "LDtk 0.9.2 JSON schema",
 	"$schema": "https://json-schema.org/draft-07/schema#",
 	"$ref": "#/LdtkJsonRoot",
-	"version": "0.9.1",
+	"version": "0.9.2",
 	"LdtkJsonRoot": {
 		"description": "This is the root of any Project JSON file. It contains:  - the project settings, - an array of levels, - and a definition object (that can probably be safely ignored for most users).",
 		"title": "LDtk Json root",

diff --git a/docs/deployInstructions.md b/docs/deployInstructions.md
@@ -42,6 +42,9 @@
 - [ ] Publish GitHub release
 - [ ] *[Optional]* Update Itch.io page
 
+## Community APIs
+- [ ] Update API list ([issue](https://github.com/deepnight/ldtk/issues/273))
+
 ## Communication
 - [ ] Add a devlog post on Itch.io
 - [ ] Announce on Twitter

diff --git a/src/electron.renderer/App.hx b/src/electron.renderer/App.hx
@@ -20,8 +20,6 @@ class App extends dn.Process {
 	var mouseButtonDowns : Map<Int,Bool> = new Map();
 	public var focused(default,null) = true;
 
-	public var loadingLog : dn.Log;
-
 	public function new() {
 		super();
 
@@ -41,13 +39,11 @@ class App extends dn.Process {
 		LOG.add("BOOT","Resources: "+ET.getAppResourceDir());
 		LOG.add("BOOT","SamplesPath: "+JsTools.getSamplesDir());
 		LOG.add("BOOT","Display: "+ET.getScreenWidth()+"x"+ET.getScreenHeight());
-
-		loadingLog = new dn.Log();
-		loadingLog.onAdd = (l)->LOG.addLogEntry(l);
-
 		// App arguments
 		args = ET.getArgs();
 		LOG.add("BOOT", args.toString());
+		LOG.flushToFile();
+		LOG.flushOnAdd = true; // disabled after App init sequence
 
 		// Init
 		ME = this;
@@ -115,16 +111,25 @@ class App extends dn.Process {
 			LOG.add("BOOT", 'Start args: path=$path levelIndex=$levelIndex');
 
 			// Load page
-			if( path!=null )
+			if( path!=null ) {
+				LOG.add("BOOT", 'Loading project from args (${path.full})...');
 				loadProject(path.full, levelIndex);
-			else if( settings.v.openLastProject && settings.v.lastProject!=null && NT.fileExists(settings.v.lastProject.filePath) )
-				loadProject(settings.v.lastProject.filePath);
-			else
+			}
+			else if( settings.v.openLastProject && settings.v.lastProject!=null && NT.fileExists(settings.v.lastProject.filePath) ) {
+				var path = settings.v.lastProject.filePath;
+				LOG.add("BOOT", 'Re-opening last project ($path)...');
+				loadProject(path);
+			}
+			else {
+				LOG.add("BOOT", 'Loading Home...');
 				loadPage( ()->new page.Home() );
+			}
 		}, 0.2);
 
+		LOG.add("BOOT", "Calling appReady...");
 		IpcRenderer.invoke("appReady");
 		updateBodyClasses();
+		LOG.flushOnAdd = false;
 	}
 
 
@@ -333,14 +338,18 @@ class App extends dn.Process {
 	}
 
 	public function addMask() {
-		jBody.find("#appMask").remove();
+		removeMask();
 		jBody.append('<div id="appMask"/>');
 	}
 
 	public function fadeOutMask() {
 		jBody.find("#appMask").fadeOut(200);
 	}
 
+	public function removeMask() {
+		jBody.find("#appMask").remove();
+	}
+
 	public function miniNotif(html:String, fadeDelayS=0.5, persist=false) {
 		var e = jBody.find("#miniNotif");
 		delayer.cancelById("miniNotifFadeOut");