diff --git a/ACE b/ACE index 382edb23..7ae5dad6 160000 --- a/ACE +++ b/ACE @@ -1 +1 @@ -Subproject commit 382edb23045d77fd3eb8ef90b01a44322fd7d94a +Subproject commit 7ae5dad6ad43cd4f1a36fac1e960d364c905fd7b diff --git a/ACViewer/ACViewer.csproj b/ACViewer/ACViewer.csproj index 3b80a956..e6366d84 100644 --- a/ACViewer/ACViewer.csproj +++ b/ACViewer/ACViewer.csproj @@ -2,7 +2,7 @@ WinExe - net8.0-windows7.0 + net10.0-windows7.0 true @@ -100,6 +100,13 @@ + + + + + + + robocopy $(SolutionDir)docs $(TargetDir)docs /S /E /COPY:DAT /MIR /NP /TEE /V diff --git a/ACViewer/Entity/NameFilterLanguageData.cs b/ACViewer/Entity/NameFilterLanguageData.cs index b35f4713..890e1057 100644 --- a/ACViewer/Entity/NameFilterLanguageData.cs +++ b/ACViewer/Entity/NameFilterLanguageData.cs @@ -15,11 +15,11 @@ public List BuildTree() { var treeNode = new List(); + treeNode.Add(new TreeNode($"MaximumSameCharactersInARow: {_nameFilterLanguageData.MaximumSameCharactersInARow}")); treeNode.Add(new TreeNode($"MaximumVowelsInARow: {_nameFilterLanguageData.MaximumVowelsInARow}")); treeNode.Add(new TreeNode($"FirstNCharactersMustHaveAVowel: {_nameFilterLanguageData.FirstNCharactersMustHaveAVowel}")); treeNode.Add(new TreeNode($"VowelContainingSubstringLength: {_nameFilterLanguageData.VowelContainingSubstringLength}")); treeNode.Add(new TreeNode($"ExtraAllowedCharacters: {_nameFilterLanguageData.ExtraAllowedCharacters}")); - treeNode.Add(new TreeNode($"Unknown: {_nameFilterLanguageData.Unknown}")); var compoundLetterGroups = new TreeNode($"CompoundLetterGrounds"); diff --git a/ACViewer/Extensions/ColorDialogEx.cs b/ACViewer/Extensions/ColorDialogEx.cs index 8dbbd5e6..fd79940b 100644 --- a/ACViewer/Extensions/ColorDialogEx.cs +++ b/ACViewer/Extensions/ColorDialogEx.cs @@ -1,4 +1,5 @@ using System; +using System.ComponentModel; using System.Runtime.InteropServices; using System.Windows.Forms; @@ -128,6 +129,7 @@ protected override IntPtr HookProc(IntPtr hWnd, int msg, IntPtr wparam, IntPtr l } #endregion + [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] public Action ColorEditCallback { get; set; } } } diff --git a/ACViewer/FileExport.cs b/ACViewer/FileExport.cs index 733a3644..5c9ca6a2 100644 --- a/ACViewer/FileExport.cs +++ b/ACViewer/FileExport.cs @@ -882,7 +882,7 @@ private static void ExportSurfaces_Assimp(string outFilename, Assimp.Scene scene { //FilePath = surfaceFilename, FilePath = $"{surfaceID:X8}.png", - TextureType = TextureType.Diffuse, + TextureType = Assimp.TextureType.Diffuse, //WrapModeU = TextureWrapMode.Wrap, //WrapModeV = TextureWrapMode.Wrap, }; diff --git a/appveyor.yml b/appveyor.yml index aadf0425..7ab94f45 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,7 +5,7 @@ branches: only: - master skip_tags: true -image: Visual Studio 2022 +image: Visual Studio 2026 configuration: - Release - Debug @@ -21,7 +21,7 @@ build: project: ACViewer.sln verbosity: minimal artifacts: -- path: ACViewer\bin\$(configuration)\net8.0-windows7.0 +- path: ACViewer\bin\$(configuration)\net10.0-windows7.0\ name: ACViewer-v$(appveyor_build_version)-$(configuration) deploy: - provider: GitHub