Skip to content

Update ACE submod #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LtRipley36706 wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Update ACE submod #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4754369
Update ACE
LtRipley36706 Aug 13, 2026
177d50d
Update appveyor.yml
LtRipley36706 Aug 13, 2026
687bbac
Update ACViewer.csproj
LtRipley36706 Aug 13, 2026
f024c1e
Update NameFilterLanguageData.cs
LtRipley36706 Aug 13, 2026
77f2d48
Update FileExport.cs
LtRipley36706 Aug 13, 2026
7de1af6
Update ColorDialogEx.cs
LtRipley36706 Aug 13, 2026
5ef692f
Update ACViewer.csproj
LtRipley36706 Aug 13, 2026
b90e54c
Update appveyor.yml
LtRipley36706 Aug 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ACE
Open in desktop
Submodule ACE updated 331 files
9 changes: 8 additions & 1 deletion ACViewer/ACViewer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net8.0-windows7.0</TargetFramework>
<TargetFramework>net10.0-windows7.0</TargetFramework>
<UseWPF>true</UseWPF>
<ApplicationIcon />
<StartupObject />
Expand Down Expand Up @@ -100,6 +100,13 @@
</None>
</ItemGroup>

<ItemGroup>
<NuGetAuditSuppress Include="https://github.com/advisories/GHSA-4f7c-pmjv-c25w" />
<NuGetAuditSuppress Include="https://github.com/advisories/GHSA-7mfr-774f-w5r9" />
<NuGetAuditSuppress Include="https://github.com/advisories/GHSA-8884-xcr4-r68p" />
<NuGetAuditSuppress Include="https://github.com/advisories/GHSA-xcvr-qv8h-m7xw" />
</ItemGroup>

<PropertyGroup>
<PostBuildEvent>
robocopy $(SolutionDir)docs $(TargetDir)docs /S /E /COPY:DAT /MIR /NP /TEE /V
Expand Down
2 changes: 1 addition & 1 deletion ACViewer/Entity/NameFilterLanguageData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ public List<TreeNode> BuildTree()
{
var treeNode = new List<TreeNode>();

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");

Expand Down
2 changes: 2 additions & 0 deletions ACViewer/Extensions/ColorDialogEx.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System;
using System.ComponentModel;
using System.Runtime.InteropServices;
using System.Windows.Forms;

Expand Down Expand Up @@ -128,6 +129,7 @@ protected override IntPtr HookProc(IntPtr hWnd, int msg, IntPtr wparam, IntPtr l
}
#endregion

[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public Action<int, int, int> ColorEditCallback { get; set; }
}
}
2 changes: 1 addition & 1 deletion ACViewer/FileExport.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};
Expand Down
4 changes: 2 additions & 2 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ branches:
only:
- master
skip_tags: true
image: Visual Studio 2022
image: Visual Studio 2026
configuration:
- Release
- Debug
Expand All @@ -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
Expand Down