From 712392c79daadfd535b59f9d0062965815e9ddb2 Mon Sep 17 00:00:00 2001 From: kaczy93 Date: Thu, 9 Nov 2023 10:26:19 +0100 Subject: [PATCH] CentrED release (#15) * CentrED release * Recursive checkout * Filter window placeholder * Application icon * Fix connect window --- .github/workflows/build.yml | 13 ++++++++----- CentrED/CentrED.csproj | 4 ++++ CentrED/UI/Windows/ConnectWindow.cs | 1 + CentrED/UI/Windows/FilterWindow.cs | 21 +++++++++++++++++++++ CentrED/icon.ico | Bin 0 -> 67646 bytes 5 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 CentrED/UI/Windows/FilterWindow.cs create mode 100644 CentrED/icon.ico 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 0000000000000000000000000000000000000000..d2082e46f172880b388c0d8487d10194bcc0cd06 GIT binary patch literal 67646 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 literal 0 HcmV?d00001