Skip to content

Commit

Permalink
Merge commit 'd56c91c5962e9b762cf7a74b120e5518b7ae3183'
Browse files Browse the repository at this point in the history
  • Loading branch information
@deepnight
deepnight committed May 3, 2023
2 parents 3f99b16 + d56c91c commit a9f8b9e
Show file tree
Hide file tree
Showing 24 changed files with 55 additions and 52 deletions.
6 changes: 3 additions & 3 deletions app/extraFiles/samples/AutoLayers_1_basic.ldtk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
"doc": "https://ldtk.io/json",
"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
"appAuthor": "Sebastien 'deepnight' Benard",
"appVersion": "1.3.1",
"appVersion": "1.3.2",
"url": "https://ldtk.io"
},
"iid": "a22d35f0-7820-11ed-b6fd-213e885f30da",
"jsonVersion": "1.3.1",
"appBuildId": 467534,
"jsonVersion": "1.3.2",
"appBuildId": 467535,
"nextUid": 108,
"identifierStyle": "Capitalize",
"toc": [],
Expand Down
6 changes: 3 additions & 3 deletions app/extraFiles/samples/AutoLayers_2_stamps.ldtk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
"doc": "https://ldtk.io/json",
"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
"appAuthor": "Sebastien 'deepnight' Benard",
"appVersion": "1.3.1",
"appVersion": "1.3.2",
"url": "https://ldtk.io"
},
"iid": "a243f240-7820-11ed-b6fd-f550906acdc3",
"jsonVersion": "1.3.1",
"appBuildId": 467534,
"jsonVersion": "1.3.2",
"appBuildId": 467535,
"nextUid": 40,
"identifierStyle": "Capitalize",
"toc": [],
Expand Down
6 changes: 3 additions & 3 deletions app/extraFiles/samples/AutoLayers_3_Mosaic.ldtk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
"doc": "https://ldtk.io/json",
"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
"appAuthor": "Sebastien 'deepnight' Benard",
"appVersion": "1.3.1",
"appVersion": "1.3.2",
"url": "https://ldtk.io"
},
"iid": "a2533480-7820-11ed-b6fd-e9108160ae94",
"jsonVersion": "1.3.1",
"appBuildId": 467534,
"jsonVersion": "1.3.2",
"appBuildId": 467535,
"nextUid": 64,
"identifierStyle": "Capitalize",
"toc": [],
Expand Down
6 changes: 3 additions & 3 deletions app/extraFiles/samples/AutoLayers_4_Assistant.ldtk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
"doc": "https://ldtk.io/json",
"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
"appAuthor": "Sebastien 'deepnight' Benard",
"appVersion": "1.3.1",
"appVersion": "1.3.2",
"url": "https://ldtk.io"
},
"iid": "a2533480-7820-11ed-b6fd-e9108160ae94",
"jsonVersion": "1.3.1",
"appBuildId": 467534,
"jsonVersion": "1.3.2",
"appBuildId": 467535,
"nextUid": 424,
"identifierStyle": "Capitalize",
"toc": [],
Expand Down
6 changes: 3 additions & 3 deletions app/extraFiles/samples/AutoLayers_5_Advanced.ldtk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
"doc": "https://ldtk.io/json",
"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
"appAuthor": "Sebastien 'deepnight' Benard",
"appVersion": "1.3.1",
"appVersion": "1.3.2",
"url": "https://ldtk.io"
},
"iid": "a26276c0-7820-11ed-b6fd-ed05d55c9a75",
"jsonVersion": "1.3.1",
"appBuildId": 467534,
"jsonVersion": "1.3.2",
"appBuildId": 467535,
"nextUid": 105,
"identifierStyle": "Capitalize",
"toc": [],
Expand Down
6 changes: 3 additions & 3 deletions app/extraFiles/samples/AutoLayers_6_OptionalRules.ldtk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
"doc": "https://ldtk.io/json",
"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
"appAuthor": "Sebastien 'deepnight' Benard",
"appVersion": "1.3.1",
"appVersion": "1.3.2",
"url": "https://ldtk.io"
},
"iid": "a27ed860-7820-11ed-b6fd-7fbe30dcfa27",
"jsonVersion": "1.3.1",
"appBuildId": 467534,
"jsonVersion": "1.3.2",
"appBuildId": 467535,
"nextUid": 167,
"identifierStyle": "Capitalize",
"toc": [],
Expand Down
6 changes: 3 additions & 3 deletions app/extraFiles/samples/Entities.ldtk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
"doc": "https://ldtk.io/json",
"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
"appAuthor": "Sebastien 'deepnight' Benard",
"appVersion": "1.3.1",
"appVersion": "1.3.2",
"url": "https://ldtk.io"
},
"iid": "a2a4fe00-7820-11ed-b6fd-9b53622ece75",
"jsonVersion": "1.3.1",
"appBuildId": 467534,
"jsonVersion": "1.3.2",
"appBuildId": 467535,
"nextUid": 173,
"identifierStyle": "Capitalize",
"toc": [{
Expand Down
6 changes: 3 additions & 3 deletions app/extraFiles/samples/SeparateLevelFiles.ldtk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
"doc": "https://ldtk.io/json",
"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
"appAuthor": "Sebastien 'deepnight' Benard",
"appVersion": "1.3.1",
"appVersion": "1.3.2",
"url": "https://ldtk.io"
},
"iid": "a2d9f0b0-7820-11ed-b6fd-010ddaafa733",
"jsonVersion": "1.3.1",
"appBuildId": 467534,
"jsonVersion": "1.3.2",
"appBuildId": 467535,
"nextUid": 10,
"identifierStyle": "Capitalize",
"toc": [],
Expand Down
2 changes: 1 addition & 1 deletion app/extraFiles/samples/SeparateLevelFiles/World_Level_0.ldtkl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"doc": "https://ldtk.io/json",
"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
"appAuthor": "Sebastien 'deepnight' Benard",
"appVersion": "1.3.1",
"appVersion": "1.3.2",
"url": "https://ldtk.io"
},
"identifier": "World_Level_0",
Expand Down
2 changes: 1 addition & 1 deletion app/extraFiles/samples/SeparateLevelFiles/World_Level_1.ldtkl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"doc": "https://ldtk.io/json",
"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
"appAuthor": "Sebastien 'deepnight' Benard",
"appVersion": "1.3.1",
"appVersion": "1.3.2",
"url": "https://ldtk.io"
},
"identifier": "World_Level_1",
Expand Down
2 changes: 1 addition & 1 deletion app/extraFiles/samples/SeparateLevelFiles/World_Level_2.ldtkl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"doc": "https://ldtk.io/json",
"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
"appAuthor": "Sebastien 'deepnight' Benard",
"appVersion": "1.3.1",
"appVersion": "1.3.2",
"url": "https://ldtk.io"
},
"identifier": "World_Level_2",
Expand Down
6 changes: 3 additions & 3 deletions app/extraFiles/samples/Test_file_for_API_showing_all_features.ldtk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
"doc": "https://ldtk.io/json",
"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
"appAuthor": "Sebastien 'deepnight' Benard",
"appVersion": "1.3.1",
"appVersion": "1.3.2",
"url": "https://ldtk.io"
},
"iid": "a2e6e900-7820-11ed-b6fd-61d0df8fd468",
"jsonVersion": "1.3.1",
"appBuildId": 467534,
"jsonVersion": "1.3.2",
"appBuildId": 467535,
"nextUid": 50,
"identifierStyle": "Capitalize",
"toc": [{
Expand Down
6 changes: 3 additions & 3 deletions app/extraFiles/samples/Typical_2D_platformer_example.ldtk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
"doc": "https://ldtk.io/json",
"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
"appAuthor": "Sebastien 'deepnight' Benard",
"appVersion": "1.3.1",
"appVersion": "1.3.2",
"url": "https://ldtk.io"
},
"iid": "a302fc80-7820-11ed-b6fd-0944dd561895",
"jsonVersion": "1.3.1",
"appBuildId": 467534,
"jsonVersion": "1.3.2",
"appBuildId": 467535,
"nextUid": 105,
"identifierStyle": "Capitalize",
"toc": [],
Expand Down
6 changes: 3 additions & 3 deletions app/extraFiles/samples/Typical_TopDown_example.ldtk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
"doc": "https://ldtk.io/json",
"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
"appAuthor": "Sebastien 'deepnight' Benard",
"appVersion": "1.3.1",
"appVersion": "1.3.2",
"url": "https://ldtk.io"
},
"iid": "a3386460-7820-11ed-b6fd-157a63b4d02d",
"jsonVersion": "1.3.1",
"appBuildId": 467534,
"jsonVersion": "1.3.2",
"appBuildId": 467535,
"nextUid": 158,
"identifierStyle": "Capitalize",
"toc": [{
Expand Down
6 changes: 3 additions & 3 deletions app/extraFiles/samples/WorldMap_Free_layout.ldtk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
"doc": "https://ldtk.io/json",
"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
"appAuthor": "Sebastien 'deepnight' Benard",
"appVersion": "1.3.1",
"appVersion": "1.3.2",
"url": "https://ldtk.io"
},
"iid": "a3619740-7820-11ed-b6fd-4b64aa0352a1",
"jsonVersion": "1.3.1",
"appBuildId": 467534,
"jsonVersion": "1.3.2",
"appBuildId": 467535,
"nextUid": 125,
"identifierStyle": "Capitalize",
"toc": [],
Expand Down
6 changes: 3 additions & 3 deletions app/extraFiles/samples/WorldMap_GridVania_layout.ldtk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
"doc": "https://ldtk.io/json",
"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
"appAuthor": "Sebastien 'deepnight' Benard",
"appVersion": "1.3.1",
"appVersion": "1.3.2",
"url": "https://ldtk.io"
},
"iid": "a39fb1b0-7820-11ed-b6fd-87f9a01f3d6b",
"jsonVersion": "1.3.1",
"appBuildId": 467534,
"jsonVersion": "1.3.2",
"appBuildId": 467535,
"nextUid": 142,
"identifierStyle": "Capitalize",
"toc": [{
Expand Down
2 changes: 1 addition & 1 deletion app/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ldtk",
"version": "1.3.1",
"version": "1.3.2",
"main": "assets/main.js",
"productName": "LDtk",
"author": "Sebastien Benard",
Expand Down
5 changes: 5 additions & 0 deletions docs/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# 1.3.2

- Fixed invisible auto-layer tiles when loading pre-1.3.1 projects
- Removed tiny debug message (oops)

# 1.3.1

- **Added customizable UI color of layers**
Expand Down
2 changes: 1 addition & 1 deletion docs/JSON_DOC.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# LDtk Json structure (version 1.3.1)
# LDtk Json structure (version 1.3.2)


<a id="ldtk-ProjectJson" name="ldtk-ProjectJson"></a>
Expand Down
4 changes: 2 additions & 2 deletions docs/JSON_SCHEMA.json
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"description": "This file is a JSON schema of files created by LDtk level editor (https://ldtk.io).",
"title": "LDtk 1.3.1 JSON schema",
"title": "LDtk 1.3.2 JSON schema",
"$schema": "https://json-schema.org/draft-07/schema#",
"$ref": "#/LdtkJsonRoot",
"version": "1.3.1",
"version": "1.3.2",
"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",
Expand Down
4 changes: 2 additions & 2 deletions docs/MINIMAL_JSON_SCHEMA.json
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"description": "This file is a JSON schema of files created by LDtk level editor (https://ldtk.io).",
"title": "LDtk 1.3.1 JSON schema",
"title": "LDtk 1.3.2 JSON schema",
"$schema": "https://json-schema.org/draft-07/schema#",
"$ref": "#/LdtkJsonRoot",
"version": "1.3.1",
"version": "1.3.2",
"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",
Expand Down
2 changes: 1 addition & 1 deletion docs/version.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.3.1
1.3.2
2 changes: 1 addition & 1 deletion src/electron.renderer/data/inst/LayerInstance.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ class LayerInstance {
srcY: at.src[1],
flips: at.f,
tid: at.t,
a: at.a,
a: at.a==null ? 1 : at.a,
});
}
}
Expand Down
2 changes: 0 additions & 2 deletions src/electron.renderer/ui/Tileset.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -773,8 +773,6 @@ class Tileset {
}

public function update() {
App.ME.debugPre(Std.int(scrollX)+" "+Std.int(right), true);

// Focus scrolling animation
final spd = M.fmin(1, 0.38 * App.ME.tmod);
if( tx!=null ) {
Expand Down

0 comments on commit a9f8b9e

Please sign in to comment.