Skip to content

Commit f33a879

Browse files
authored
Merge pull request #24 from IrishBruse/1.0.0
1.0.0
2 parents 0d8ec09 + 761e6c7 commit f33a879

File tree

27 files changed

+1042
-1142
lines changed

27 files changed

+1042
-1142
lines changed

.editorconfig

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ csharp_style_expression_bodied_constructors = false:warning
6060
csharp_style_expression_bodied_indexers = true:warning
6161
csharp_style_expression_bodied_lambdas = true:warning
6262
csharp_style_expression_bodied_local_functions = false:warning
63-
csharp_style_expression_bodied_methods = true:warning
63+
csharp_style_expression_bodied_methods = false
6464
csharp_style_expression_bodied_operators = false:warning
6565
csharp_style_expression_bodied_properties = true:warning
6666
csharp_style_implicit_object_creation_when_type_is_apparent = true:warning
@@ -83,18 +83,20 @@ csharp_style_var_for_built_in_types = false:warning
8383
csharp_style_var_when_type_is_apparent = false:warning
8484
csharp_using_directive_placement = inside_namespace:warning # 'using' directive preferences
8585
dotnet_code_quality_unused_parameters = all:warning # Parameter preferences
86-
dotnet_diagnostic.CA1822.severity = warning # Disable convert function to static
86+
dotnet_diagnostic.CA1822.severity = none # Disable convert function to static
87+
dotnet_diagnostic.CA1305.severity = none
88+
dotnet_diagnostic.CA1310.severity = warning
89+
dotnet_diagnostic.CS0649.severity = none
8790
dotnet_diagnostic.IDE0010.severity = none
8891
dotnet_diagnostic.IDE0072.severity = none
8992
dotnet_diagnostic.IDE0045.severity = warning
93+
dotnet_diagnostic.IDE0022.severity = refactoring
9094
dotnet_diagnostic.IDE0046.severity = warning
9195
dotnet_diagnostic.IDE0051.severity = none # Remove unused private member
9296
dotnet_diagnostic.IDE0058.severity = warning
93-
dotnet_diagnostic.IDE0059.severity = warning
94-
dotnet_diagnostic.CA1305.severity = none
95-
dotnet_diagnostic.CA1310.severity = warning
96-
dotnet_diagnostic.CA1051.severity = error
97-
dotnet_diagnostic.CA1707.severity = none
97+
dotnet_diagnostic.IDE0059.severity = suggestion
98+
dotnet_diagnostic.IDE0078.severity = none
99+
dotnet_diagnostic.IDE0060.severity = none
98100
dotnet_diagnostic.IDE0063.severity = warning
99101
dotnet_diagnostic.IDE0130.severity = warning
100102
dotnet_remove_unnecessary_suppression_exclusions = none # Suppression preferences

LDtk.Codegen/LDtk.Codegen.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@
1414
</ItemGroup>
1515

1616
<PropertyGroup>
17-
<Version>0.7.0</Version>
17+
<Version>1.0.0</Version>
1818
<Authors>Ethan Conneely</Authors>
1919
<Product>LDtk Monogame</Product>
2020
<PackageId>LDtkMonogame.Codegen</PackageId>
2121
<Description>LDtk tool that generates staticaly typed entities</Description>
22-
<PackageProjectUrl>https://irishbruse.github.io/LDtkMonogame/</PackageProjectUrl>
22+
<PackageProjectUrl>https://ethanconneely.com/LDtkMonogame/</PackageProjectUrl>
2323
<PackageLicenseExpression>MIT</PackageLicenseExpression>
2424
<RepositoryUrl>https://github.com/IrishBruse/LDtkMonogame</RepositoryUrl>
2525
<PackageTags>LDtk, Monogame, Level-Editor</PackageTags>
2626
<PackageIcon>Icon.png</PackageIcon>
2727
<RepositoryType>git</RepositoryType>
28-
<PackageReleaseNotes>https://www.ethanconneely.com/LDtkMonogame/</PackageReleaseNotes>
28+
<PackageReleaseNotes>https://ethanconneely.com/LDtkMonogame/</PackageReleaseNotes>
2929

3030
<PackAsTool>true</PackAsTool>
3131
<ToolCommandName>ldtkgen</ToolCommandName>

LDtk.Codegen/LDtkJsonFull.cs

Lines changed: 60 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// This file was auto generated, any changes will be lost.
22
namespace LDtk.Codegen;
33

4-
#pragma warning disable IDE1006, CA1711, CA1720
4+
#pragma warning disable IDE1006, CA1711, CA1720, CA1707, CS1591, CA1716
55
using System;
66

77
using Microsoft.Xna.Framework;
@@ -39,6 +39,11 @@ public partial class LDtkFile
3939
/// </summary>
4040
public Color BgColor { get; set; }
4141

42+
/// <summary>
43+
/// An array of command lines that can be ran manually by the user
44+
/// </summary>
45+
public LdtkCustomCommand[] CustomCommands { get; set; }
46+
4247
/// <summary>
4348
/// Default grid size for new layers
4449
/// </summary>
@@ -78,6 +83,11 @@ public partial class LDtkFile
7883
/// </summary>
7984
public Definitions Defs { get; set; }
8085

86+
/// <summary>
87+
/// If TRUE, the exported PNGs will include the level background (color or image).
88+
/// </summary>
89+
public bool ExportLevelBg { get; set; }
90+
8191
/// <summary>
8292
/// WARNING: this deprecated value is no inter exported since version 0.9.3 Replaced
8393
/// by: imageExportMode
@@ -109,6 +119,11 @@ public partial class LDtkFile
109119
/// </summary>
110120
public IdentifierStyle IdentifierStyle { get; set; }
111121

122+
/// <summary>
123+
/// Unique project identifier
124+
/// </summary>
125+
public Guid Iid { get; set; }
126+
112127
/// <summary>
113128
/// "Image export" option when saving project. Possible values: None, OneImagePerLayer,
114129
/// OneImagePerLevel, LayersAndLevels
@@ -213,6 +228,7 @@ public partial class AutoLayerRuleGroup
213228
public string Name { get; set; }
214229
public AutoLayerRuleDefinition[] Rules { get; set; }
215230
public int Uid { get; set; }
231+
public bool UsesWizard { get; set; }
216232
}
217233

218234
/// <summary>
@@ -323,6 +339,16 @@ public partial class AutoLayerRuleDefinition
323339
public int YOffset { get; set; }
324340
}
325341

342+
public partial class LdtkCustomCommand
343+
{
344+
public string Command { get; set; }
345+
346+
/// <summary>
347+
/// Possible values: Manual, AfterLoad, BeforeSave, AfterSave
348+
/// </summary>
349+
public When When { get; set; }
350+
}
351+
326352
/// <summary>
327353
/// If you're writing your own LDtk importer, you should probably just ignore most stuff in
328354
/// the defs section, as it contains data that are mostly important to the editor. To keep
@@ -459,8 +485,8 @@ public partial class EntityDefinition
459485
public string[] Tags { get; set; }
460486

461487
/// <summary>
462-
/// WARNING: this deprecated value will be removed completely on version 1.2.0+
463-
/// Replaced by: tileRect
488+
/// WARNING: this deprecated value is no inter exported since version 1.2.0 Replaced
489+
/// by: tileRect
464490
/// </summary>
465491
public int? TileId { get; set; }
466492

@@ -546,6 +572,12 @@ public partial class FieldDefinition
546572
/// </summary>
547573
public object DefaultOverride { get; set; }
548574

575+
/// <summary>
576+
/// User defined documentation for this field to provide help/tips to level designers about
577+
/// accepted values.
578+
/// </summary>
579+
public string Doc { get; set; }
580+
549581
public bool EditorAlwaysShow { get; set; }
550582
public bool EditorCutLongValues { get; set; }
551583

@@ -562,6 +594,12 @@ public partial class FieldDefinition
562594
/// </summary>
563595
public EditorDisplayPos EditorDisplayPos { get; set; }
564596

597+
/// <summary>
598+
/// Possible values: ZigZag, StraightArrow, CurvedArrow, ArrowsLine, DashedLine
599+
/// </summary>
600+
public EditorLinkStyle EditorLinkStyle { get; set; }
601+
602+
public bool EditorShowInWorld { get; set; }
565603
public string EditorTextPrefix { get; set; }
566604
public string EditorTextSuffix { get; set; }
567605

@@ -728,11 +766,16 @@ public partial class LayerDefinition
728766
public int? AutoSourceLayerDefUid { get; set; }
729767

730768
/// <summary>
731-
/// WARNING: this deprecated value will be removed completely on version 1.2.0+
732-
/// Replaced by: tilesetDefUid
769+
/// WARNING: this deprecated value is no inter exported since version 1.2.0 Replaced
770+
/// by: tilesetDefUid
733771
/// </summary>
734772
public int? AutoTilesetDefUid { get; set; }
735773

774+
/// <summary>
775+
/// Allow editor selections when the layer is not currently active.
776+
/// </summary>
777+
public bool CanSelectWhenInactive { get; set; }
778+
736779
/// <summary>
737780
/// Opacity of the layer (0 to 1.0)
738781
/// </summary>
@@ -1327,8 +1370,8 @@ public partial class NeighbourLevel
13271370
public Guid LevelIid { get; set; }
13281371

13291372
/// <summary>
1330-
/// WARNING: this deprecated value will be removed completely on version 1.2.0+
1331-
/// Replaced by: levelIid
1373+
/// WARNING: this deprecated value is no inter exported since version 1.2.0 Replaced
1374+
/// by: levelIid
13321375
/// </summary>
13331376
public int? LevelUid { get; set; }
13341377
}
@@ -1555,6 +1598,11 @@ public enum Checker { Horizontal, None, Vertical };
15551598
/// </summary>
15561599
public enum TileMode { Single, Stamp };
15571600

1601+
/// <summary>
1602+
/// Possible values: Manual, AfterLoad, BeforeSave, AfterSave
1603+
/// </summary>
1604+
public enum When { AfterLoad, AfterSave, BeforeSave, Manual };
1605+
15581606
/// <summary>
15591607
/// Possible values: Any, OnlySame, OnlyTags
15601608
/// </summary>
@@ -1573,6 +1621,11 @@ public enum EditorDisplayMode { ArrayCountNoLabel, ArrayCountWithLabel, EntityTi
15731621
/// </summary>
15741622
public enum EditorDisplayPos { Above, Beneath, Center };
15751623

1624+
/// <summary>
1625+
/// Possible values: ZigZag, StraightArrow, CurvedArrow, ArrowsLine, DashedLine
1626+
/// </summary>
1627+
public enum EditorLinkStyle { ArrowsLine, CurvedArrow, DashedLine, StraightArrow, ZigZag };
1628+
15761629
public enum TextLanguageMode { LangC, LangHaxe, LangJs, LangJson, LangLog, LangLua, LangMarkdown, LangPython, LangRuby, LangXml };
15771630

15781631
/// <summary>

LDtk.Codegen/Program.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ public class Program
1414
{
1515
public static void Main(string[] args)
1616
{
17-
Console.WriteLine("-- LDtk Codegen --");
1817
_ = Parser.Default.ParseArguments<Options>(args).WithParsed(Run).WithNotParsed(HandleParseError);
1918
}
2019

LDtk.ContentPipeline/LDtk.ContentPipeline.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</ItemGroup>
1717

1818
<PropertyGroup>
19-
<Version>0.7.0</Version>
19+
<Version>1.0.0</Version>
2020
<Authors>Ethan Conneely</Authors>
2121
<Product>LDtk Monogame</Product>
2222
<PackageId>LDtkMonogame.ContentPipeline</PackageId>

LDtk.Documentation/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
book

LDtk.Documentation/book.toml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,16 @@ description = "The LDtkMonogame nuget documentation"
99
[build]
1010
build-dir = "./docs/docs/"
1111

12+
[output.html.print]
13+
enable = false
14+
1215
[output.html]
1316
theme = "theme"
1417
default-theme = "ldtk"
1518
preferred-dark-theme = "ldtk"
16-
additional-js = ["misc.js"]
1719
curly-quotes = false
1820
mathjax-support = false
1921
copy-fonts = true
2022
no-section-label = false
2123
git-repository-url = "https://github.com/IrishBruse/LDtkMonogame"
2224
git-repository-icon = "fa-github"
23-
24-
[output.html.print]
25-
enable = false

LDtk.Documentation/misc.js

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)