no collision now for the default tile. configured samples too

Cammin · Jul 19, 2023 · 0f9e134 · 0f9e134
1 parent 256d05b
commit 0f9e134
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 24 deletions.
diff --git a/Assets/LDtkUnity/CHANGELOG.md b/Assets/LDtkUnity/CHANGELOG.md
@@ -17,9 +17,11 @@ Major update that introduces the separate tileset file!
 - Hid the `Export` Button in the importer inspector until the feature is re-supported
 
 ### Breaking Changes
+- Changed the default tile for an empty field back to `None` collision. Make any fixes to reflect this change.
+  - Because there are now two options for defining collision, turning off grid collision by default became more sensible.
 - Removed the SpriteAtlas field from the project importer
   - Instead, you can directly add a tileset file into a sprite atlas to pack it's sprites, much like the normal unity workflow
-- Because sprites and tiles are now generated from each respective tileset file, the references to these assets will be lost
+  - Because sprites and tiles are now generated from each respective tileset file, the references to these assets will be lost if they were referenced prior
 
 # 3.3.3
 ###### May 3, 2023

diff --git a/Assets/LDtkUnity/Resources/LDtkDefaultTile.asset b/Assets/LDtkUnity/Resources/LDtkDefaultTile.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 31471dfd53d5490a956a89a1b2d11ad9, type: 3}
   m_Name: LDtkDefaultTile
   m_EditorClassIdentifier: 
-  _colliderType: 2
+  _colliderType: 0
   _customPhysicsSprite: {fileID: 21300000, guid: a0ec3126b00c562449ef4e99a4da11fc, type: 3}
   _tilemapTag: Untagged
   _tilemapLayerMask: 0

diff --git a/Assets/LDtkUnity/Runtime/UnityAssets/Assets/LDtkArtifactAssets.cs b/Assets/LDtkUnity/Runtime/UnityAssets/Assets/LDtkArtifactAssets.cs
@@ -179,14 +179,14 @@ private T GetIndexedItem<T>(string assetName, Dictionary<string, T> indexedDicti
 
             if (indexedDictionary == null)
             {
-                LDtkDebug.LogError($"GetItem The instanced dictionary was null when getting artifacts for {typeof(T).Name} \"{assetName}\"");
+                LDtkDebug.LogError($"GetItem The instanced dictionary was null when getting artifacts for {typeof(T).Name} from \"{assetName}\"");
                 Profiler.EndSample();
                 return null;
             }
 
             if (indexedDictionary.Count == 0)
             {
-                LDtkDebug.LogError($"GetItem The instanced dictionary was empty! No values of {typeof(T).Name}");
+                LDtkDebug.LogError($"GetItem The instanced dictionary was empty! No values of {typeof(T).Name} from \"{assetName}\"");
                 Profiler.EndSample();
                 return null;
             }

diff --git a/...mples~/Common/LDtkExampleTile_Empty.asset → ...amples~/Common/LDtkExampleTile_Grid.asset b/...mples~/Common/LDtkExampleTile_Empty.asset → ...amples~/Common/LDtkExampleTile_Grid.asset
@@ -10,7 +10,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 31471dfd53d5490a956a89a1b2d11ad9, type: 3}
-  m_Name: LDtkExampleTile_Empty
+  m_Name: LDtkExampleTile_Grid
   m_EditorClassIdentifier: 
   _colliderType: 0
   _customPhysicsSprite: {fileID: 0}

diff --git a/...~/Common/LDtkExampleTile_Empty.asset.meta → ...s~/Common/LDtkExampleTile_Grid.asset.meta b/...~/Common/LDtkExampleTile_Empty.asset.meta → ...s~/Common/LDtkExampleTile_Grid.asset.meta
diff --git a/Assets/LDtkUnity/Samples~/Samples/AutoLayers_1_basic.ldtk.meta b/Assets/LDtkUnity/Samples~/Samples/AutoLayers_1_basic.ldtk.meta
diff --git a/Assets/LDtkUnity/Samples~/Samples/AutoLayers_5_Advanced.ldtk.meta b/Assets/LDtkUnity/Samples~/Samples/AutoLayers_5_Advanced.ldtk.meta
diff --git a/Assets/LDtkUnity/Samples~/Samples/AutoLayers_6_OptionalRules.ldtk.meta b/Assets/LDtkUnity/Samples~/Samples/AutoLayers_6_OptionalRules.ldtk.meta
diff --git a/Assets/LDtkUnity/Samples~/Samples/Typical_2D_platformer_example.ldtk.meta b/Assets/LDtkUnity/Samples~/Samples/Typical_2D_platformer_example.ldtk.meta
diff --git a/Assets/LDtkUnity/Samples~/Samples/WorldMap_Free_layout.ldtk.meta b/Assets/LDtkUnity/Samples~/Samples/WorldMap_Free_layout.ldtk.meta
diff --git a/Assets/LDtkUnity/Samples~/Samples/WorldMap_GridVania_layout.ldtk.meta b/Assets/LDtkUnity/Samples~/Samples/WorldMap_GridVania_layout.ldtk.meta
diff --git a/Assets/Tests/Misc/OtherTechTests/LevelsVania.ldtk.meta b/Assets/Tests/Misc/OtherTechTests/LevelsVania.ldtk.meta
diff --git a/Assets/Tests/Misc/OtherTechTests/TestPivot.ldtk.meta b/Assets/Tests/Misc/OtherTechTests/TestPivot.ldtk.meta