Skip to content
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.

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

CentrED release #15

Merged
merged 6 commits into from
Nov 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 8 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 4 additions & 0 deletions CentrED/CentrED.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

<OutDir>../output</OutDir>
<PublishDir>../publish</PublishDir>
<ApplicationIcon>icon.ico</ApplicationIcon>
</PropertyGroup>

<ItemGroup>
Expand All @@ -38,6 +39,9 @@
<ItemGroup>
<DataFiles_libs Include="..\external\fna-libs\**" />
<DataFiles_libs Include="..\lib\**" />
<DataFiles_libs Remove="..\external\fna-libs\.github\**" />
<DataFiles_libs Remove="..\external\fna-libs\.git" />
<DataFiles_libs Remove="..\external\fna-libs\README.txt" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions CentrED/UI/Windows/ConnectWindow.cs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
21 changes: 21 additions & 0 deletions CentrED/UI/Windows/FilterWindow.cs
Original file line number Diff line number Diff line change
@@ -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();
}
}
Binary file added CentrED/icon.ico
Binary file not shown.
Loading