Merge tag '6.12.3'

Author: leohilbert

.github/workflows/test-runner.yml

@@ -16,13 +16,14 @@ jobs:
                 testMode:
                     #- playmode
                     - editmode
-                unityVersion:
+                unityVersion: # All are LTS except minimum supported version
                     - 2019.3.15f1
                     - 2019.4.40f1
                     - 2020.3.48f1
                     - 2021.3.45f1
                     - 2022.3.43f1
-                    - 6000.0.23f1
+                    - 6000.0.64f1
+                    - 6000.3.2f1
 
         steps:
             #Test Checkout

.github/workflows/unity-builder.yml

@@ -16,13 +16,14 @@ jobs:
                 targetPlatform:
                     - StandaloneWindows
                     #- WebGL
-                unityVersion:
+                unityVersion: # All are LTS except minimum supported version
                     - 2019.3.15f1
                     - 2019.4.40f1
                     - 2020.3.48f1
                     - 2021.3.45f1
                     - 2022.3.43f1
-                    - 6000.0.23f1
+                    - 6000.0.64f1
+                    - 6000.3.2f1
 
                 include:
                     - targetPlatform: WebGL

Assets/LDtkUnity/CHANGELOG.md

@@ -1,3 +1,72 @@
+## [6.12.3](https://github.com/Cammin/LDtkToUnity/compare/6.12.2...6.12.3) (2026-04-10)
+
+
+### Bug Fixes
+
+* Tweaked the Iid FindObjectsByType so Unity 6.4+ won't throw a warning ([42d896c](https://github.com/Cammin/LDtkToUnity/commit/42d896cf7cd94acd55c037fe2727f076e21ca843))
+
+
+### Performance Improvements
+
+* Set all importers to AllowCaching so that it may potentially work with parallel importing better ([9d44ddc](https://github.com/Cammin/LDtkToUnity/commit/9d44ddc4e8df8180baf6f62d8aeabc56f9ba6411))
+
+## [6.12.2](https://github.com/Cammin/LDtkToUnity/compare/6.12.1...6.12.2) (2026-03-23)
+
+
+### Bug Fixes
+
+* Fixed issue where a level component's iid component reference was assigned a previous layer ([bf953f1](https://github.com/Cammin/LDtkToUnity/commit/bf953f13ad92e7da454aead249ab605a1e2b290f))
+
+## [6.12.1](https://github.com/Cammin/LDtkToUnity/compare/6.12.0...6.12.1) (2026-01-25)
+
+
+### Bug Fixes
+
+* Fixed a compile error in unity versions 2020 and before ([a12ebb4](https://github.com/Cammin/LDtkToUnity/commit/a12ebb44a513dc7a20bd3b3517b6c90c41dcf2e6))
+
+# [6.12.0](https://github.com/Cammin/LDtkToUnity/compare/6.11.5...6.12.0) (2025-12-17)
+
+
+### Features
+
+* Added layer sorting option ([6e96315](https://github.com/Cammin/LDtkToUnity/commit/6e963156aa75115e0c1df488ea1924dcdd9fdfcc))
+
+## [6.11.5](https://github.com/Cammin/LDtkToUnity/compare/6.11.4...6.11.5) (2025-12-09)
+
+
+### Bug Fixes
+
+* Disabled a .ldtkc import attempt that Unity does not encourage. Also prevents it's related warning which appears in 6000.3 ([bede8be](https://github.com/Cammin/LDtkToUnity/commit/bede8be19aa6dbbc13870b3ace9589609a4bbbc9))
+
+## [6.11.4](https://github.com/Cammin/LDtkToUnity/compare/6.11.3...6.11.4) (2025-11-27)
+
+
+### Bug Fixes
+
+* Fixed warnings related to TreeView that would appear in Unity 6000.2 ([5609f76](https://github.com/Cammin/LDtkToUnity/commit/5609f76a28b73f7be4a45309a9b96cd569847f34))
+
+## [6.11.3](https://github.com/Cammin/LDtkToUnity/compare/6.11.2...6.11.3) (2025-11-26)
+
+
+### Bug Fixes
+
+* ScaleEntities now properly reimports separate levels when changed ([90b69be](https://github.com/Cammin/LDtkToUnity/commit/90b69be430b13e3192789826d6d44d72fb65d9c5))
+
+## [6.11.2](https://github.com/Cammin/LDtkToUnity/compare/6.11.1...6.11.2) (2025-07-30)
+
+
+### Bug Fixes
+
+* Removed the check for EditorSettings.defaultBehaviorMode ([9937f39](https://github.com/Cammin/LDtkToUnity/commit/9937f3924e108280c8067a705ff0ddd5b82ea122))
+
+## [6.11.1](https://github.com/Cammin/LDtkToUnity/compare/6.11.0...6.11.1) (2025-07-27)
+
+
+### Bug Fixes
+
+* Fixed entities accidentally having a z scale of 0 ([0a01a78](https://github.com/Cammin/LDtkToUnity/commit/0a01a78b9db6465f8ad84a68ea0ebd9ade46c7ce))
+* Made a function in LDtkField internal instead of public ([be5130b](https://github.com/Cammin/LDtkToUnity/commit/be5130bac3150d2aff4677ff8921a575c0b995d5))
+
 # [6.11.0](https://github.com/Cammin/LDtkToUnity/compare/6.10.0...6.11.0) (2025-05-16)
 
 

Assets/LDtkUnity/Editor/Builders/LDtkBuilderEntity.cs

@@ -24,7 +24,7 @@ public LDtkBuilderEntity(LDtkProjectImporter project, Level level, LDtkComponent
 
         public LDtkComponentEntity[] BuildEntityLayerInstances()
         {
-            SortingOrder.Next();
+            SortingOrder.Next(Layer.Identifier);
 
             LDtkFieldParser.CacheRecentBuilder(this);
 
@@ -125,7 +125,8 @@ private void ScaleEntity()
 
             //modify by the resized entity scaling from LDtk
             Vector3 newScale = _entityObj.transform.localScale;
-            newScale.Scale(_entityComponent.ScaleFactor);
+            newScale.x *= _entityComponent.ScaleFactor.x;
+            newScale.y *= _entityComponent.ScaleFactor.y;
             _entityObj.transform.localScale = newScale;
         }
 

Assets/LDtkUnity/Editor/Builders/LDtkBuilderIntGridValue.cs

@@ -17,7 +17,7 @@ public LDtkBuilderIntGridValue(LDtkProjectImporter importer, Level level, LDtkCo
         public void BuildIntGridValues()
         {
             RoundTilemapPos();
-            SortingOrder.Next();
+            SortingOrder.Next(Layer.Identifier); 
 
             LayerDefinition layerDef = Layer.Definition;
             IntGridValueDefinition[] intGridValueDefs = layerDef.IntGridValues;

Assets/LDtkUnity/Editor/Builders/LDtkBuilderLevel.cs

@@ -1,4 +1,5 @@
-using UnityEngine;
+using System.Collections.Generic;
+using UnityEngine;
 
 namespace LDtkUnity.Editor
 {
@@ -21,6 +22,7 @@ internal sealed class LDtkBuilderLevel
         private LDtkComponentLayer[] _layerComponents;
         private MonoBehaviour[] _components;
 
+        private LDtkIid _layerIidComponent;
         private GameObject _layerGameObject;
         private LDtkComponentLayer _layerComponent;
         private LDtkComponentLayerParallax _parallax;
@@ -102,8 +104,8 @@ private void BuildLevelProcess()
             AddIidComponent();
             LDtkProfiler.EndSample();
 
-            LDtkProfiler.BeginSample("new LDtkSortingOrder");
-            _sortingOrder = new LDtkSortingOrder();
+            LDtkProfiler.BeginSample("LDtkSortingOrder");
+            CreateSortingOrder();
             LDtkProfiler.EndSample();
 
             LDtkProfiler.BeginSample("BuildLayerInstances");
@@ -131,6 +133,24 @@ private void BuildLevelProcess()
             LDtkProfiler.EndSample();
         }
 
+        private void CreateSortingOrder()
+        {
+            var orders = _project.LayerCustomSortingOrders;
+
+            if (!_project.UseLayerCustomSortingOrders || orders.IsNullOrEmpty())
+            {
+                _sortingOrder = new LDtkSortingOrder();
+                return;
+            }
+
+            var sortingOrders = new Dictionary<string, int>(orders.Length);
+            foreach (LDtkLayerCustomSortingOrder order in orders)
+            {
+                sortingOrders.Add(order._ldtkLayerName, order._ldtkLayerOrder);
+            }
+            _sortingOrder = new LDtkSortingOrder(sortingOrders);
+        }
+
         private void BuildFields()
         {
             bool addedFields = TryAddFields();
@@ -150,8 +170,8 @@ private void BuildFields()
 
         private void AddIidComponent()
         {
-            LDtkIid iid = _levelGameObject.AddComponent<LDtkIid>();
-            iid.SetIid(_level);
+            _iidComponent = _levelGameObject.AddComponent<LDtkIid>();
+            _iidComponent.SetIid(_level);
         }
 
         private GameObject CreateLevelGameObject()
@@ -272,8 +292,8 @@ void TryBuildLayerGameObject()
                     _parallax = _layerGameObject.AddComponent<LDtkComponentLayerParallax>();
                 }
 
-                _iidComponent = _layerGameObject.AddComponent<LDtkIid>();
-                _iidComponent.SetIid(layer);
+                _layerIidComponent = _layerGameObject.AddComponent<LDtkIid>();
+                _layerIidComponent.SetIid(layer);
 
                 builtLayer = true;
             }
@@ -323,7 +343,7 @@ void TryPopulateLayerComponent(ref bool populated)
                 }
 
                 //now that everything is gathered, do the special OnImport and populate that component
-                _layerComponent.OnImport(_importer.DefinitionObjects, layer, _levelComponent, _iidComponent, entities, _layerIntGrid, _layerTiles, layerScale);
+                _layerComponent.OnImport(_importer.DefinitionObjects, layer, _levelComponent, _layerIidComponent, entities, _layerIntGrid, _layerTiles, layerScale);
                 if (_project.UseParallax)
                 {
                     Vector2 halfLvlSize = (Vector2)_level.UnityPxSize / _project.PixelsPerUnit * 0.5f;

Assets/LDtkUnity/Editor/Builders/LDtkBuilderTileset.cs

@@ -21,7 +21,7 @@ public LDtkBuilderTileset(LDtkProjectImporter project, Level level, LDtkComponen
 
         private void ConstructNewTilemap()
         {
-            SortingOrder.Next();
+            SortingOrder.Next(Layer.Identifier);
 
             string tilemapName = Layer.IsTilesLayer ? "Tiles" : "AutoLayer";
 

Assets/LDtkUnity/Editor/Builders/LDtkSortingOrder.cs

@@ -1,11 +1,36 @@
-namespace LDtkUnity.Editor
+using System.Collections.Generic;
+
+namespace LDtkUnity.Editor
 {
+    /// <summary>
+    /// Increments for each occurrence of a tilemap or entity when building layers to ensure everything is layered correctly.
+    /// This can be overridden to jump to custom-set sorting order numbers if needed.
+    /// </summary>
     internal sealed class LDtkSortingOrder
     {
         public int SortingOrderValue { get; private set; } = 0;
+        private readonly Dictionary<string, int> _layerNameOverrides;
+        private readonly HashSet<string> _layerNameOccurrences = new HashSet<string>();
 
-        public void Next()
+        public LDtkSortingOrder(Dictionary<string, int> layerNameOverrides = null)
+        {
+            _layerNameOverrides = layerNameOverrides;
+        }
+        
+        public void Next(string layerIdentifier = null)
         {
+            //note: this supports repeated layer occurrences, even if that never happens.
+            
+            //Jump to the custom order if we get the first occurrence of a layer
+            if (layerIdentifier != null && _layerNameOccurrences.Add(layerIdentifier))
+            {
+                if (_layerNameOverrides != null && _layerNameOverrides.TryGetValue(layerIdentifier, out int order))
+                {
+                    SortingOrderValue = order;
+                    return;
+                }
+            }
+            
             SortingOrderValue--;
         }
     }

Assets/LDtkUnity/Editor/Builders/TileChangeData.cs.meta

@@ -16,7 +16,7 @@ public override void OnInspectorGUI()
         {
             const string msg = "This file is generated by the project importer.\n" +
                                "It contains the configuration data from the project inspector.\n" +
-                               "It is only used for telling the levels to reimport when this is changed.";
+                               "It is only used for telling separate levels to reimport when this has different values.";
             EditorGUILayout.HelpBox(msg, MessageType.Info);
             ApplyRevertGUI();
         }