diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f0bd57e..b1f8243 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,21 +24,23 @@ jobs: strategy: matrix: runner: [ windows-latest, ubuntu-latest, macos-latest ] - project: [ Server ] + project: [ {name: Server, extraArgs: ' -p:PublishSingleFile=true --self-contained false'}, {name: CentrED, extraArgs: ''} ] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 + with: + submodules: recursive - name: Setup .NET uses: actions/setup-dotnet@v3 with: dotnet-version: 7.0.x - name: Publish - run: dotnet publish ${{ matrix.project }} -c Release -o release -p:PublishSingleFile=true --self-contained false '-p:DebugType=None' + run: dotnet publish ${{ matrix.project.name }} -c Release -o release_${{ matrix.project.name }} -p:DebugType=None ${{ matrix.project.extraArgs }} - name: Upload Build Artifact uses: actions/upload-artifact@v3 with: - name: ${{ matrix.project }}-${{ runner.os }}-${{ runner.arch }} - path: ${{ github.workspace }}/release/* + name: ${{ matrix.project.name }}-${{ runner.os }}-${{ runner.arch }} + path: ${{ github.workspace }}/release_${{ matrix.project.name }}/* release: runs-on: ubuntu-latest @@ -58,6 +60,7 @@ jobs: mkdir release for arch in Linux Windows macOS; do zip -qq -r release/Cedserver-$arch-x64.zip artifacts/Server-$arch-X64/ + zip -qq -r release/CentrED-$arch-x64.zip artifacts/CentrED-$arch-X64/ done - name: Create Release diff --git a/CentrED/CentrED.csproj b/CentrED/CentrED.csproj index afb1dff..430b0bc 100644 --- a/CentrED/CentrED.csproj +++ b/CentrED/CentrED.csproj @@ -17,6 +17,7 @@ ../output ../publish + icon.ico @@ -38,6 +39,9 @@ + + + diff --git a/CentrED/UI/Windows/ConnectWindow.cs b/CentrED/UI/Windows/ConnectWindow.cs index 216b917..e79641c 100644 --- a/CentrED/UI/Windows/ConnectWindow.cs +++ b/CentrED/UI/Windows/ConnectWindow.cs @@ -1,6 +1,7 @@ using System.Net.Sockets; using System.Numerics; using CentrED.IO; +using CentrED.IO.Models; using ClassicUO.Utility; using ImGuiNET; using static CentrED.Application; diff --git a/CentrED/UI/Windows/FilterWindow.cs b/CentrED/UI/Windows/FilterWindow.cs new file mode 100644 index 0000000..bb5f5a2 --- /dev/null +++ b/CentrED/UI/Windows/FilterWindow.cs @@ -0,0 +1,21 @@ +using ImGuiNET; + +namespace CentrED.UI.Windows; + +public class FilterWindow : Window{ + public override string Name => "Filter"; + + private int minZ = -127; + private int maxZ = 127; + + public int MinZ => minZ; + public int MaxZ => maxZ; + + public override void Draw() { + if (!Show) return; + ImGui.Begin(Name, ref _show); + ImGui.SliderInt("Min Z render", ref minZ, -127, 127); + ImGui.SliderInt("Max Z render", ref maxZ, -127, 127); + ImGui.End(); + } +} \ No newline at end of file diff --git a/CentrED/icon.ico b/CentrED/icon.ico new file mode 100644 index 0000000..d2082e4 Binary files /dev/null and b/CentrED/icon.ico differ