From 9d1c5f89085cf74c251a6a3d80de6d1ccfed3266 Mon Sep 17 00:00:00 2001 From: Lojemiru <33508026+Lojemiru@users.noreply.github.com> Date: Sat, 31 Dec 2022 23:28:09 -0600 Subject: [PATCH 1/9] Update Json.hx --- src/ldtk/Json.hx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/ldtk/Json.hx b/src/ldtk/Json.hx index 4f8dd96..f9b3e78 100644 --- a/src/ldtk/Json.hx +++ b/src/ldtk/Json.hx @@ -612,6 +612,10 @@ typedef EntityInstanceJson = { @changed("0.4.0") var px: Array; + /** **/ + @added("help") + var f: Int; + /** An array of all custom fields and their values. **/ var fieldInstances: Array; } From 445c3a3df08c67a1709b94fb781cc740dcbb0a00 Mon Sep 17 00:00:00 2001 From: Lojemiru <33508026+Lojemiru@users.noreply.github.com> Date: Sat, 31 Dec 2022 23:34:54 -0600 Subject: [PATCH 2/9] Update Json.hx --- src/ldtk/Json.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ldtk/Json.hx b/src/ldtk/Json.hx index f9b3e78..3fea5b0 100644 --- a/src/ldtk/Json.hx +++ b/src/ldtk/Json.hx @@ -613,7 +613,7 @@ typedef EntityInstanceJson = { var px: Array; /** **/ - @added("help") + @added("1.0.0") var f: Int; /** An array of all custom fields and their values. **/ From e3f9719a142e88c16c129245888b87f3ae69f01e Mon Sep 17 00:00:00 2001 From: Lojemiru <33508026+Lojemiru@users.noreply.github.com> Date: Sun, 1 Jan 2023 03:02:22 -0600 Subject: [PATCH 3/9] Hacky API update for Entity flip bits --- src/ldtk/Json.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ldtk/Json.hx b/src/ldtk/Json.hx index 3fea5b0..93f7523 100644 --- a/src/ldtk/Json.hx +++ b/src/ldtk/Json.hx @@ -612,7 +612,7 @@ typedef EntityInstanceJson = { @changed("0.4.0") var px: Array; - /** **/ + /** number is a liiiiiiiie **/ @added("1.0.0") var f: Int; From 69bdb371f4a332a4f2b13d8bd227e8c8a0855cd0 Mon Sep 17 00:00:00 2001 From: Lojemiru <33508026+Lojemiru@users.noreply.github.com> Date: Tue, 10 Jan 2023 00:11:02 -0600 Subject: [PATCH 4/9] Add resizable fields to EntityDefJson --- src/ldtk/Json.hx | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/ldtk/Json.hx b/src/ldtk/Json.hx index c06d5e0..eef86f3 100644 --- a/src/ldtk/Json.hx +++ b/src/ldtk/Json.hx @@ -1,5 +1,6 @@ package ldtk; +// TODO: Version numbers for newly added fields in this branch are lies as I don't know what the final version will be. Fix them before PR! /** This is the root of any Project JSON file. It contains: @@ -966,6 +967,16 @@ typedef EntityDefJson = { @internal var resizableY: Bool; + /** If TRUE, the entity instances will be flippable horizontally **/ + @added("1.0.0") + @internal + var resizableX: Bool; + + /** If TRUE, the entity instances will be flippable vertically **/ + @added("1.0.0") + @internal + var resizableY: Bool; + /** Only applies to entities resizable on both X/Y. If TRUE, the entity instance width/height will keep the same aspect ratio as the definition. **/ @added("0.8.0") @internal From 3270ba3bd9f05f847ec2da40a726353001ec79b2 Mon Sep 17 00:00:00 2001 From: Lojemiru <33508026+Lojemiru@users.noreply.github.com> Date: Tue, 10 Jan 2023 00:12:21 -0600 Subject: [PATCH 5/9] Fix name typos in previous commit --- src/ldtk/Json.hx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ldtk/Json.hx b/src/ldtk/Json.hx index eef86f3..16045fe 100644 --- a/src/ldtk/Json.hx +++ b/src/ldtk/Json.hx @@ -970,12 +970,12 @@ typedef EntityDefJson = { /** If TRUE, the entity instances will be flippable horizontally **/ @added("1.0.0") @internal - var resizableX: Bool; + var flippableX: Bool; /** If TRUE, the entity instances will be flippable vertically **/ @added("1.0.0") @internal - var resizableY: Bool; + var flippableY: Bool; /** Only applies to entities resizable on both X/Y. If TRUE, the entity instance width/height will keep the same aspect ratio as the definition. **/ @added("0.8.0") From 0a44002ed847a40161fa3e3085aea344ef4309ab Mon Sep 17 00:00:00 2001 From: Lojemiru <33508026+Lojemiru@users.noreply.github.com> Date: Tue, 24 Jan 2023 01:53:26 -0600 Subject: [PATCH 6/9] Remove TODO, add appropriate version numbers. --- src/ldtk/Json.hx | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/ldtk/Json.hx b/src/ldtk/Json.hx index 24d57d2..4c5f9be 100644 --- a/src/ldtk/Json.hx +++ b/src/ldtk/Json.hx @@ -1,7 +1,5 @@ package ldtk; -// TODO: Version numbers for newly added fields in this branch are lies as I don't know what the final version will be. Fix them before PR! - /** This is the root of any Project JSON file. It contains: @@ -631,8 +629,8 @@ typedef EntityInstanceJson = { @changed("0.4.0") var px: Array; - /** number is a liiiiiiiie **/ - @added("1.0.0") + /** Two-bit integer. First bit determines whether or not this EntityInstance is flipped horizontally, the second bit vertically. **/ + @added("1.2.6") var f: Int; /** An array of all custom fields and their values. **/ @@ -987,12 +985,12 @@ typedef EntityDefJson = { var resizableY: Bool; /** If TRUE, the entity instances will be flippable horizontally **/ - @added("1.0.0") + @added("1.2.6") @internal var flippableX: Bool; /** If TRUE, the entity instances will be flippable vertically **/ - @added("1.0.0") + @added("1.2.6") @internal var flippableY: Bool; From 4fb901f2914c355fa7945516aab1f49c0e1bf326 Mon Sep 17 00:00:00 2001 From: Lojemiru <33508026+Lojemiru@users.noreply.github.com> Date: Tue, 24 Jan 2023 01:55:19 -0600 Subject: [PATCH 7/9] Restore removed newline --- src/ldtk/Json.hx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ldtk/Json.hx b/src/ldtk/Json.hx index 4c5f9be..a84469b 100644 --- a/src/ldtk/Json.hx +++ b/src/ldtk/Json.hx @@ -1,5 +1,6 @@ package ldtk; + /** This is the root of any Project JSON file. It contains: From 5a9775dfbd94b1a1cd2b22a451ff8ee53a1dfcc4 Mon Sep 17 00:00:00 2001 From: Lojemiru <33508026+Lojemiru@users.noreply.github.com> Date: Sat, 4 Feb 2023 18:02:08 -0600 Subject: [PATCH 8/9] Add flipAroundPivot property to EntityDefJson --- src/ldtk/Json.hx | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/ldtk/Json.hx b/src/ldtk/Json.hx index a84469b..57f1af5 100644 --- a/src/ldtk/Json.hx +++ b/src/ldtk/Json.hx @@ -995,6 +995,11 @@ typedef EntityDefJson = { @internal var flippableY: Bool; + /** Defines whether entities flip within bounds (FALSE) or around their pivot point (TRUE). **/ + @added("1.2.6") + @internal + var flipAroundPivot: Bool; + /** Only applies to entities resizable on both X/Y. If TRUE, the entity instance width/height will keep the same aspect ratio as the definition. **/ @added("0.8.0") @internal From c92385aa7be11da0d62ecee2b46930df33ac5e9c Mon Sep 17 00:00:00 2001 From: Lojemiru <33508026+Lojemiru@users.noreply.github.com> Date: Sat, 4 Feb 2023 18:04:52 -0600 Subject: [PATCH 9/9] Remove internal declaration for flipAroundPivot --- src/ldtk/Json.hx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/ldtk/Json.hx b/src/ldtk/Json.hx index 57f1af5..a249232 100644 --- a/src/ldtk/Json.hx +++ b/src/ldtk/Json.hx @@ -997,7 +997,6 @@ typedef EntityDefJson = { /** Defines whether entities flip within bounds (FALSE) or around their pivot point (TRUE). **/ @added("1.2.6") - @internal var flipAroundPivot: Bool; /** Only applies to entities resizable on both X/Y. If TRUE, the entity instance width/height will keep the same aspect ratio as the definition. **/