1.1.1

IrishBruse · Jul 15, 2023 · 01edee2 · 01edee2
1 parent 80aa132
commit 01edee2
Show file tree

Hide file tree

Showing 13 changed files with 8,197 additions and 2,247 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,49 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "LDtk.Codegen",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "Build LDtk.Codegen",
+            "program": "${workspaceFolder}/LDtk.Codegen/bin/Debug/net6.0/LDtk.Codegen.dll",
+            "cwd": "${workspaceFolder}/LDtk.Codegen",
+            "console": "integratedTerminal",
+            "internalConsoleOptions": "neverOpen",
+            "__autoGenerated__": true
+        },
+        {
+            "name": "LDtk.Example",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "Build LDtk.Example",
+            "program": "${workspaceFolder}/LDtk.Example/bin/Debug/net6.0/LDtk.Example.dll",
+            "cwd": "${workspaceFolder}/LDtk.Example",
+            "console": "integratedTerminal",
+            "internalConsoleOptions": "neverOpen",
+            "__autoGenerated__": true
+        },
+        {
+            "name": "LDtk.DocGeneration",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "Build LDtk.DocGeneration",
+            "program": "${workspaceFolder}/Tools\\LDtk.DocGeneration/bin/Debug/net6.0/LDtk.DocGeneration.dll",
+            "cwd": "${workspaceFolder}/Tools\\LDtk.DocGeneration",
+            "console": "integratedTerminal",
+            "internalConsoleOptions": "neverOpen",
+            "__autoGenerated__": true
+        },
+        {
+            "name": "LDtk.Quicktype",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "Build LDtk.Quicktype",
+            "program": "${workspaceFolder}/Tools\\LDtk.Quicktype/bin/Debug/net7.0/LDtk.Quicktype.dll",
+            "cwd": "${workspaceFolder}/Tools\\LDtk.Quicktype",
+            "console": "integratedTerminal",
+            "internalConsoleOptions": "neverOpen",
+            "__autoGenerated__": true
+        }
+    ]
+}
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -0,0 +1,89 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "Build LDtk",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "build",
+                "${workspaceFolder}/LDtk\\LDtk.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile",
+            "group": "build",
+            "__autoGenerated__": true
+        },
+        {
+            "label": "Build LDtk.Codegen",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "build",
+                "${workspaceFolder}/LDtk.Codegen\\LDtk.Codegen.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile",
+            "group": "build",
+            "__autoGenerated__": true
+        },
+        {
+            "label": "Build LDtk.ContentPipeline",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "build",
+                "${workspaceFolder}/LDtk.ContentPipeline\\LDtk.ContentPipeline.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile",
+            "group": "build",
+            "__autoGenerated__": true
+        },
+        {
+            "label": "Build LDtk.Example",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "build",
+                "${workspaceFolder}/LDtk.Example\\LDtk.Example.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile",
+            "group": "build",
+            "__autoGenerated__": true
+        },
+        {
+            "label": "Build LDtk.DocGeneration",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "build",
+                "${workspaceFolder}/Tools\\LDtk.DocGeneration\\LDtk.DocGeneration.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile",
+            "group": "build",
+            "__autoGenerated__": true
+        },
+        {
+            "label": "Build LDtk.Quicktype",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "build",
+                "${workspaceFolder}/Tools\\LDtk.Quicktype\\LDtk.Quicktype.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile",
+            "group": "build",
+            "__autoGenerated__": true
+        }
+    ]
+}
diff --git a/Documentation/src/changelog.md b/Documentation/src/changelog.md
@@ -1,6 +1,8 @@
 # Changelog
 
 Changelog for versions
+- <a href="https://github.com/IrishBruse/LDtkMonogame/compare/v1.1.0...v1.1.1">1.1.1</a>
+    - Fix assetName for textures when the parent ldtk is in a nested folder [PR-25](https://github.com/IrishBruse/LDtkMonogame/pull/25)
 - <a href="https://github.com/IrishBruse/LDtkMonogame/compare/v1.0.1...v1.1.0">1.1.0</a>
     - Updated `LDtkFile.FromFile(filePath)` For old slower behaviour use `FromFileReflection` <br/> Source generator deserializing should be faster but may have bugs please test.
     - Updated json to 1.3.3

diff --git a/LDtk.Codegen/LDtk.Codegen.csproj b/LDtk.Codegen/LDtk.Codegen.csproj
@@ -9,7 +9,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <Version>1.1.0</Version>
+        <Version>1.1.1</Version>
         <Authors>Ethan Conneely</Authors>
         <Product>LDtk Monogame</Product>
         <PackageId>LDtkMonogame.Codegen</PackageId>

diff --git a/LDtk.ContentPipeline/LDtk.ContentPipeline.csproj b/LDtk.ContentPipeline/LDtk.ContentPipeline.csproj
@@ -7,7 +7,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <Version>1.1.0</Version>
+        <Version>1.1.1</Version>
         <Authors>Ethan Conneely</Authors>
         <Product>LDtk Monogame</Product>
         <PackageId>LDtkMonogame.ContentPipeline</PackageId>

diff --git a/LDtk.Example/Content/Content.mgcb b/LDtk.Example/Content/Content.mgcb
@@ -26,7 +26,7 @@
 /processorParam:TextureFormat=Color
 /build:Characters.png
 
-#begin Tilemap.png
+#begin Atlas/Tilemap.png
 /importer:TextureImporter
 /processor:TextureProcessor
 /processorParam:ColorKeyColor=255,0,255,255
@@ -36,9 +36,9 @@
 /processorParam:ResizeToPowerOfTwo=False
 /processorParam:MakeSquare=False
 /processorParam:TextureFormat=Color
-/build:Tilemap.png
+/build:Test/Atlas/Tilemap.png
 
 #begin World.ldtk
 /importer:LDtkFileImporter
 /processor:LDtkFileProcessor
-/build:World.ldtk
+/build:Test/World.ldtk
diff --git a/LDtk.Example/Content/Tilemap.png → LDtk.Example/Content/Test/Atlas/Tilemap.png b/LDtk.Example/Content/Tilemap.png → LDtk.Example/Content/Test/Atlas/Tilemap.png