Assets Editor v2

Arch-Mina · Nov 9, 2023 · 222bdb5 · 222bdb5
1 parent 873ad14
commit 222bdb5
Show file tree

Hide file tree

Showing 43 changed files with 18,673 additions and 11,843 deletions.
diff --git a/Assets Editor/App.xaml b/Assets Editor/App.xaml
@@ -9,6 +9,7 @@
             <ResourceDictionary.MergedDictionaries>
                 <materialDesign:BundledTheme BaseTheme="Light" PrimaryColor="DeepPurple" SecondaryColor="Lime" />
                 <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.PopupBox.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>

diff --git a/Assets Editor/Appearances.cs b/Assets Editor/Appearances.cs
diff --git a/Assets Editor/AssetsEditor.csproj b/Assets Editor/AssetsEditor.csproj
@@ -2,21 +2,46 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <RootNamespace>Assets_Editor</RootNamespace>
     <UseWPF>true</UseWPF>
     <UseWindowsForms>true</UseWindowsForms>
     <AssemblyName>Assets Editor</AssemblyName>
     <ApplicationIcon>Walking_000.ico</ApplicationIcon>
+    <FileVersion>2.0.0</FileVersion>
+    <AssemblyVersion>2.0.0</AssemblyVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Extended.Wpf.Toolkit" Version="4.0.1" />
+    <None Remove="Resources\Walking_000.png" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Extended.Wpf.Toolkit" Version="4.5.0" />
     <PackageReference Include="Google.Protobuf" Version="3.21.4" />
-    <PackageReference Include="MaterialDesignThemes" Version="3.2.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="MaterialDesignThemes" Version="4.9.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="SevenZip" Version="19.0.0" />
-    <PackageReference Include="System.Drawing.Common" Version="4.7.0" />
+    <PackageReference Include="System.Drawing.Common" Version="7.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Resource Include="Resources\Walking_000.png" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
   </ItemGroup>
 
 </Project>
diff --git a/Assets Editor/AssetsEditor.csproj.user b/Assets Editor/AssetsEditor.csproj.user
@@ -6,20 +6,50 @@
     </ApplicationDefinition>
   </ItemGroup>
   <ItemGroup>
+    <Compile Update="about.xaml.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Update="DatEditor.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Update="ImportManager.xaml.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Update="LegacyDatEditor.xaml.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Update="OTBEditor.xaml.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Update="SearchWindow.xaml.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Update="SprEditor.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <Page Update="about.xaml">
+      <SubType>Designer</SubType>
+    </Page>
     <Page Update="DatEditor.xaml">
       <SubType>Designer</SubType>
     </Page>
+    <Page Update="ImportManager.xaml">
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Update="LegacyDatEditor.xaml">
+      <SubType>Designer</SubType>
+    </Page>
     <Page Update="MainWindow.xaml">
       <SubType>Designer</SubType>
     </Page>
+    <Page Update="OTBEditor.xaml">
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Update="SearchWindow.xaml">
+      <SubType>Designer</SubType>
+    </Page>
     <Page Update="SprEditor.xaml">
       <SubType>Designer</SubType>
     </Page>

diff --git a/Assets Editor/DatEditor.xaml b/Assets Editor/DatEditor.xaml
diff --git a/Assets Editor/DatEditor.xaml.cs b/Assets Editor/DatEditor.xaml.cs
diff --git a/Assets Editor/ImportManager.xaml b/Assets Editor/ImportManager.xaml