Skip to content

Commit

Permalink
Initial work on level modding workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
@miyu
miyu committed Dec 10, 2015
1 parent 1923283 commit 2bfb646
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion dargon
Submodule dargon updated 30 files
+76 −0 Dargon.DDS/Dargon.DDS.csproj
+36 −0 Dargon.DDS/Properties/AssemblyInfo.cs
+12 −4 Dargon.DDS/TextureConverter.cs
+1 −1 Dargon.DDS/TextureConverterFactory.cs
+5 −0 Dargon.DDS/packages.config
+4 −2 Dargon.Modifications.ThumbnailGenerator.Impl/Dargon.ThumbnailGenerator.Impl.csproj
+1 −1 Dargon.Modifications.ThumbnailGenerator.Impl/SlicePicker.cs
+1 −0 Dargon.Modifications.ThumbnailGenerator.Impl/ThumbnailGeneratorServiceImpl.cs
+1 −0 Dargon.Modifications.ThumbnailGenerator.Impl/ThumbnailGeneratorUtilities.cs
+1 −1 dargon-asset-dumper/App.config
+175 −10 dargon-asset-dumper/Program.cs
+13 −0 dargon-asset-dumper/dargon-developer-tools-cli.csproj
+1 −1 dargon-client/Controllers/ModificationImportController.cs
+5 −2 dargon-client/ViewModels/RootViewModel.cs
+1,203 −0 dargon-client/Views/Helpers/OpenFileOrFolderDialog.cs
+9 −1 dargon-client/Views/ModificationListingView.xaml
+12 −1 dargon-client/Views/ModificationListingView.xaml.cs
+3 −0 dargon-client/dargon-client.csproj
+0 −6 dargon-developer-tools/App.config
+0 −9 dargon-developer-tools/App.xaml
+0 −15 dargon-developer-tools/App.xaml.cs
+0 −25 dargon-developer-tools/MainWindow.xaml
+0 −25 dargon-developer-tools/MainWindow.xaml.cs
+0 −55 dargon-developer-tools/Properties/AssemblyInfo.cs
+0 −62 dargon-developer-tools/Properties/Resources.Designer.cs
+0 −117 dargon-developer-tools/Properties/Resources.resx
+0 −26 dargon-developer-tools/Properties/Settings.Designer.cs
+0 −7 dargon-developer-tools/Properties/Settings.settings
+0 −111 dargon-developer-tools/dargon-developer-tools.csproj
+1 −1 trinket-managed/trinket-managed.csproj
44 changes: 22 additions & 22 deletions dargon-root.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -355,9 +355,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "trinket-managed", "dargon\t
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ddt", "ddt", "{141BEFE6-7BBD-437B-AB92-F143A76E3B23}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dargon-developer-tools", "dargon\dargon-developer-tools\dargon-developer-tools.csproj", "{D4594516-011E-4FE0-BA2F-7D6D5AA6DFFB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dargon-asset-dumper", "dargon\dargon-asset-dumper\dargon-asset-dumper.csproj", "{46E69E8A-258F-48A9-A8AD-9F142C2F04BE}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dargon-developer-tools-cli", "dargon\dargon-asset-dumper\dargon-developer-tools-cli.csproj", "{46E69E8A-258F-48A9-A8AD-9F142C2F04BE}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "documentation", "documentation", "{38559502-FA99-4517-81D7-772E25003215}"
ProjectSection(SolutionItems) = preProject
Expand All @@ -377,6 +375,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dargon-client-deployment",
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "deploy-nest-core-and-client", "dev\deploy-nest-core-and-client\deploy-nest-core-and-client.csproj", "{F6222CE1-C6F4-4FF5-BFBD-703333114D24}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dargon.DDS", "dargon\Dargon.DDS\Dargon.DDS.csproj", "{FEE4B8B0-2CFD-45C1-89EE-FC61C7D2B279}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Console|Any CPU = Console|Any CPU
Expand Down Expand Up @@ -2676,24 +2676,6 @@ Global
{6615AB36-20B2-4F72-B5BF-7134E06F74C5}.Release|x64.Build.0 = Release|Any CPU
{6615AB36-20B2-4F72-B5BF-7134E06F74C5}.Release|x86.ActiveCfg = Release|Any CPU
{6615AB36-20B2-4F72-B5BF-7134E06F74C5}.Release|x86.Build.0 = Release|Any CPU
{D4594516-011E-4FE0-BA2F-7D6D5AA6DFFB}.Console|Any CPU.ActiveCfg = Release|Any CPU
{D4594516-011E-4FE0-BA2F-7D6D5AA6DFFB}.Console|Any CPU.Build.0 = Release|Any CPU
{D4594516-011E-4FE0-BA2F-7D6D5AA6DFFB}.Console|x64.ActiveCfg = Release|Any CPU
{D4594516-011E-4FE0-BA2F-7D6D5AA6DFFB}.Console|x64.Build.0 = Release|Any CPU
{D4594516-011E-4FE0-BA2F-7D6D5AA6DFFB}.Console|x86.ActiveCfg = Release|Any CPU
{D4594516-011E-4FE0-BA2F-7D6D5AA6DFFB}.Console|x86.Build.0 = Release|Any CPU
{D4594516-011E-4FE0-BA2F-7D6D5AA6DFFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D4594516-011E-4FE0-BA2F-7D6D5AA6DFFB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D4594516-011E-4FE0-BA2F-7D6D5AA6DFFB}.Debug|x64.ActiveCfg = Debug|Any CPU
{D4594516-011E-4FE0-BA2F-7D6D5AA6DFFB}.Debug|x64.Build.0 = Debug|Any CPU
{D4594516-011E-4FE0-BA2F-7D6D5AA6DFFB}.Debug|x86.ActiveCfg = Debug|Any CPU
{D4594516-011E-4FE0-BA2F-7D6D5AA6DFFB}.Debug|x86.Build.0 = Debug|Any CPU
{D4594516-011E-4FE0-BA2F-7D6D5AA6DFFB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D4594516-011E-4FE0-BA2F-7D6D5AA6DFFB}.Release|Any CPU.Build.0 = Release|Any CPU
{D4594516-011E-4FE0-BA2F-7D6D5AA6DFFB}.Release|x64.ActiveCfg = Release|Any CPU
{D4594516-011E-4FE0-BA2F-7D6D5AA6DFFB}.Release|x64.Build.0 = Release|Any CPU
{D4594516-011E-4FE0-BA2F-7D6D5AA6DFFB}.Release|x86.ActiveCfg = Release|Any CPU
{D4594516-011E-4FE0-BA2F-7D6D5AA6DFFB}.Release|x86.Build.0 = Release|Any CPU
{46E69E8A-258F-48A9-A8AD-9F142C2F04BE}.Console|Any CPU.ActiveCfg = Release|Any CPU
{46E69E8A-258F-48A9-A8AD-9F142C2F04BE}.Console|Any CPU.Build.0 = Release|Any CPU
{46E69E8A-258F-48A9-A8AD-9F142C2F04BE}.Console|x64.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -2748,6 +2730,24 @@ Global
{F6222CE1-C6F4-4FF5-BFBD-703333114D24}.Release|x64.Build.0 = Release|Any CPU
{F6222CE1-C6F4-4FF5-BFBD-703333114D24}.Release|x86.ActiveCfg = Release|Any CPU
{F6222CE1-C6F4-4FF5-BFBD-703333114D24}.Release|x86.Build.0 = Release|Any CPU
{FEE4B8B0-2CFD-45C1-89EE-FC61C7D2B279}.Console|Any CPU.ActiveCfg = Release|Any CPU
{FEE4B8B0-2CFD-45C1-89EE-FC61C7D2B279}.Console|Any CPU.Build.0 = Release|Any CPU
{FEE4B8B0-2CFD-45C1-89EE-FC61C7D2B279}.Console|x64.ActiveCfg = Release|Any CPU
{FEE4B8B0-2CFD-45C1-89EE-FC61C7D2B279}.Console|x64.Build.0 = Release|Any CPU
{FEE4B8B0-2CFD-45C1-89EE-FC61C7D2B279}.Console|x86.ActiveCfg = Release|Any CPU
{FEE4B8B0-2CFD-45C1-89EE-FC61C7D2B279}.Console|x86.Build.0 = Release|Any CPU
{FEE4B8B0-2CFD-45C1-89EE-FC61C7D2B279}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FEE4B8B0-2CFD-45C1-89EE-FC61C7D2B279}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FEE4B8B0-2CFD-45C1-89EE-FC61C7D2B279}.Debug|x64.ActiveCfg = Debug|Any CPU
{FEE4B8B0-2CFD-45C1-89EE-FC61C7D2B279}.Debug|x64.Build.0 = Debug|Any CPU
{FEE4B8B0-2CFD-45C1-89EE-FC61C7D2B279}.Debug|x86.ActiveCfg = Debug|Any CPU
{FEE4B8B0-2CFD-45C1-89EE-FC61C7D2B279}.Debug|x86.Build.0 = Debug|Any CPU
{FEE4B8B0-2CFD-45C1-89EE-FC61C7D2B279}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FEE4B8B0-2CFD-45C1-89EE-FC61C7D2B279}.Release|Any CPU.Build.0 = Release|Any CPU
{FEE4B8B0-2CFD-45C1-89EE-FC61C7D2B279}.Release|x64.ActiveCfg = Release|Any CPU
{FEE4B8B0-2CFD-45C1-89EE-FC61C7D2B279}.Release|x64.Build.0 = Release|Any CPU
{FEE4B8B0-2CFD-45C1-89EE-FC61C7D2B279}.Release|x86.ActiveCfg = Release|Any CPU
{FEE4B8B0-2CFD-45C1-89EE-FC61C7D2B279}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -2914,13 +2914,13 @@ Global
{08EB1A26-7629-430A-B6BD-CB8ECC7E1F38} = {8BB34446-5A0C-4BBE-92E0-42EE38BE8D29}
{6615AB36-20B2-4F72-B5BF-7134E06F74C5} = {8873D806-008B-4A18-B151-1BAF537A46E9}
{141BEFE6-7BBD-437B-AB92-F143A76E3B23} = {7C966BF2-5DDA-4B14-94DE-88C5A512B8DE}
{D4594516-011E-4FE0-BA2F-7D6D5AA6DFFB} = {141BEFE6-7BBD-437B-AB92-F143A76E3B23}
{46E69E8A-258F-48A9-A8AD-9F142C2F04BE} = {141BEFE6-7BBD-437B-AB92-F143A76E3B23}
{38559502-FA99-4517-81D7-772E25003215} = {17DA9ADA-FB2C-4280-9E10-7758DDB25BC9}
{DB157FD2-6255-45E4-ABFC-7B9E76BF9F32} = {18439844-AFEB-46FA-8CF8-0C5138261415}
{0ED45046-0E3D-42EC-814A-8E8BCD1FFE28} = {18439844-AFEB-46FA-8CF8-0C5138261415}
{A08D2FFF-95DB-4951-9023-BD4C27CA8CB4} = {18439844-AFEB-46FA-8CF8-0C5138261415}
{664BC68C-1AAF-4F03-B193-C142200A8A29} = {A08D2FFF-95DB-4951-9023-BD4C27CA8CB4}
{F6222CE1-C6F4-4FF5-BFBD-703333114D24} = {18439844-AFEB-46FA-8CF8-0C5138261415}
{FEE4B8B0-2CFD-45C1-89EE-FC61C7D2B279} = {4426218F-53C3-49A7-90EF-C63436D5FB99}
EndGlobalSection
EndGlobal

0 comments on commit 2bfb646

Please sign in to comment.