Skip to content

Commit 259854a

Browse files
MinmooseMinmoose
committed
vNext work
1 parent 4646956 commit 259854a

File tree

10 files changed

+46
-67
lines changed

10 files changed

+46
-67
lines changed

‎.github/workflows/publish-xat.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Install .NET
2424
uses: actions/setup-dotnet@v1
2525
with:
26-
dotnet-version: 7.0.x
26+
dotnet-version: 8.0.x
2727

2828
- name: Deploy XAT
2929
run: dotnet publish XAT/XAT.sln /p:DebugType=None /p:DebugSymbols=false /p:PublishProfile=FinalPublish /p:Version=${{ steps.version-date.outputs.formattedTime }}

‎.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@ obj/
1111
*.suo
1212
*.sdf
1313
*.opensdf
14-
*.pdb
14+
*.pdb
15+
/publish-standalone

‎Blender/xat_addon/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
bl_info = {
22
"name" : "XAT",
3-
"author" : "Asgard",
4-
"description" : "Animations for FFXIV",
3+
"author" : "Asgard, Minmoose and Contributors",
4+
"description" : "Animation ToolKit for FFXIV",
55
"version": (1,0,0,0),
66
"blender" : (3, 0, 0),
77
"location" : "3D View > Tools (Right Side) > XAT",

‎README.md

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,20 @@
11
## XAT - The XIV Animation Toolkit
22

3-
XAT (or, more formally titled, The XIV Animation Toolkit) is a standalone tool for manipulating animations and skeletons in Final Fantasy XIV. It provides various techniques to export, import, compress and bind animations to and from a variety of formats.
3+
XAT or, more formally titled, The XIV Animation Toolkit, is a standalone tool for manipulating animations and skeletons in Final Fantasy XIV. It provides various techniques to export, import, compress and bind animations to and from a variety of formats.
44

55
XAT aims to combine and improve on the previous disparate efforts for XIV animation tools, and is intended to be developed and supported over time.
66

77
## Getting Started
88
### Prerequisites
9-
* [.NET 6.x Desktop Runtime x64](https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/runtime-desktop-6.0.6-windows-x64-installer)
9+
* [.NET 8.x Desktop Runtime x64](https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/runtime-desktop-6.0.6-windows-x64-installer)
1010
* [Visual C++ Redistributable for Visual Studio 2012 x86](https://www.microsoft.com/en-ca/download/details.aspx?id=30679)
1111

1212
## Help
13-
The project is still a very early Alpha and documentation is still being worked on. Join us on [Discord](https://discord.gg/KvGJCCnG8t).
13+
The project is still in a very early Alpha and documentation is still being worked on. Join us on [Discord](https://discord.gg/KvGJCCnG8t).
1414

1515
## Components
16-
* [XAT Standalone](https://github.com/Etheirys/XAT/releases/latest/download/XAT.zip) (for creating animations etc).
17-
* [Blender Addon](https://github.com/Etheirys/XAT/releases/latest/download/XAT-Blender-Addon.zip)
18-
* Dalamud Repo `https://raw.githubusercontent.com/Etheirys/XAT/main/repo.json`
19-
20-
## Contributing
21-
XAT is entirely open source and contributions are welcome.
16+
* [XAT APP](https://github.com/Etheirys/XAT/releases/latest/download/XAT.zip) (For creating animations etc).
17+
* [Blender Addon](https://github.com/Etheirys/XAT/releases/latest/download/XAT-Blender-Addon.zip) (For exporting a Blender camera as a cutscene that can be played with [Brio](https://github.com/Etheirys/Brio)).
2218

2319
## Acknowledgments
2420
This project builds on the work of previous research and tools built for XIV. A huge thank you is due to the following projects for making XAT possible.
@@ -31,3 +27,6 @@ This project builds on the work of previous research and tools built for XIV. A
3127
* [VFXEditor](https://github.com/0ceal0t/Dalamud-VFXEditor)
3228
* [Penumbra](https://github.com/xivdev/Penumbra/)
3329
* [Cammy](https://github.com/UnknownX7/Cammy/)
30+
31+
## License
32+
XAT is licensed under the [BSD 3-Clause License](https://github.com/Etheirys/XAT/blob/main/LICENSE).

‎XAT/XAT.Test/XAT.Test.csproj

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0-windows</TargetFramework>
4+
<TargetFramework>net8.0-windows</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77

88
<IsPackable>false</IsPackable>
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
13-
<PackageReference Include="MSTest.TestAdapter" Version="2.2.8" />
14-
<PackageReference Include="MSTest.TestFramework" Version="2.2.8" />
15-
<PackageReference Include="coverlet.collector" Version="3.1.2" />
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0-release-24373-02" />
13+
<PackageReference Include="MSTest.TestAdapter" Version="3.5.0" />
14+
<PackageReference Include="MSTest.TestFramework" Version="3.5.0" />
15+
<PackageReference Include="coverlet.collector" Version="6.0.2">
16+
<PrivateAssets>all</PrivateAssets>
17+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
18+
</PackageReference>
1619
</ItemGroup>
1720

1821
<ItemGroup>

‎XAT/XAT/Properties/PublishProfiles/FinalPublish.pubxml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project>
3-
<PropertyGroup>
4-
<Configuration>Release</Configuration>
5-
<Platform>Any CPU</Platform>
6-
<PublishDir>..\..\publish-standalone\</PublishDir>
7-
<PublishProtocol>FileSystem</PublishProtocol>
8-
<TargetFramework>net7.0-windows</TargetFramework>
9-
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
10-
<SelfContained>false</SelfContained>
11-
<PublishSingleFile>true</PublishSingleFile>
12-
<PublishReadyToRun>false</PublishReadyToRun>
13-
</PropertyGroup>
3+
<PropertyGroup>
4+
<Configuration>Release</Configuration>
5+
<Platform>Any CPU</Platform>
6+
<PublishDir>..\..\publish-standalone\</PublishDir>
7+
<PublishProtocol>FileSystem</PublishProtocol>
8+
<TargetFramework>net8.0-windows</TargetFramework>
9+
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
10+
<SelfContained>true</SelfContained>
11+
<PublishSingleFile>true</PublishSingleFile>
12+
<PublishReadyToRun>false</PublishReadyToRun>
13+
</PropertyGroup>
1414
</Project>

‎XAT/XAT/UI/Misc/HelpTab.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@
4141

4242
<Separator Opacity="0" Height="10" />
4343

44-
<Button Click="KoFi_Click">
44+
<Button Click="MoreLinks_Click">
4545
<StackPanel Orientation="Horizontal">
4646
<materialDesign:PackIcon Kind="Dollar" Margin="-8" VerticalAlignment="Center" />
4747
<Separator Opacity="0" Width="10" />
48-
<TextBlock>Ko-Fi</TextBlock>
48+
<TextBlock>More Links</TextBlock>
4949
</StackPanel>
5050
</Button>
5151
</StackPanel>

‎XAT/XAT/UI/Misc/HelpTab.xaml.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ private void Discord_Click(object sender, System.Windows.RoutedEventArgs e)
2929
});
3030
}
3131

32-
private void KoFi_Click(object sender, System.Windows.RoutedEventArgs e)
32+
private void MoreLinks_Click(object sender, System.Windows.RoutedEventArgs e)
3333
{
3434
Process.Start(new ProcessStartInfo
3535
{
36-
FileName = "https://ko-fi.com/Asgard",
36+
FileName = "https://etheirystools.carrd.co/",
3737
UseShellExecute = true
3838
});
3939
}

‎XAT/XAT/XAT.csproj

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
5-
<TargetFramework>net7.0-windows</TargetFramework>
5+
<TargetFramework>net8.0-windows</TargetFramework>
66
<Nullable>enable</Nullable>
77
<UseWPF>true</UseWPF>
88
<ApplicationIcon>Properties\icon.ico</ApplicationIcon>
9-
<Copyright>Asgard</Copyright>
10-
<Authors>Asgard</Authors>
9+
<Copyright>Asgard, Minmoose and Contributors</Copyright>
10+
<Authors>Asgard, Minmoose and Contributors</Authors>
1111
</PropertyGroup>
1212

1313
<ItemGroup>
@@ -22,18 +22,18 @@
2222
</ItemGroup>
2323

2424
<ItemGroup>
25-
<PackageReference Include="Autoupdater.NET.Official" Version="1.7.3" />
26-
<PackageReference Include="Fody" Version="6.6.3">
25+
<PackageReference Include="Autoupdater.NET.Official" Version="1.9.2" />
26+
<PackageReference Include="MaterialDesignThemes" Version="4.5.0" />
27+
<PackageReference Include="Serilog" Version="4.0.2-dev-02220" />
28+
<PackageReference Include="Serilog.Sinks.Debug" Version="3.0.0" />
29+
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
30+
<PackageReference Include="Fody" Version="6.8.1">
2731
<PrivateAssets>all</PrivateAssets>
2832
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2933
</PackageReference>
30-
<PackageReference Include="MaterialDesignThemes" Version="4.5.0" />
31-
<PackageReference Include="PropertyChanged.Fody" Version="3.4.1">
34+
<PackageReference Include="PropertyChanged.Fody" Version="4.1.0">
3235
<PrivateAssets>all</PrivateAssets>
3336
</PackageReference>
34-
<PackageReference Include="Serilog" Version="2.11.0" />
35-
<PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" />
36-
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
3737
</ItemGroup>
3838

3939
</Project>

‎base_repo.json

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

0 commit comments

Comments
 (0)