Skip to content
Open
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
22 changes: 11 additions & 11 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
cancel-in-progress: true
steps:
- name: Checkout Code and Submodules
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
submodules: recursive

Expand All @@ -41,7 +41,7 @@ jobs:
# cURL
- name: Cache cURL
id: cache-curl
uses: actions/cache@v4
uses: actions/cache@v5
with:
path: "C:\\hostedtoolcache\\windows\\libcurl"
key: "ukcp-curl-build"
Expand Down Expand Up @@ -79,7 +79,7 @@ jobs:
run: echo "::set-output name=dir::$(yarn cache dir)"

- name: Load Yarn Cache
uses: actions/cache@v4
uses: actions/cache@v5
id: yarn-cache
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
Expand All @@ -88,7 +88,7 @@ jobs:
${{ runner.os }}-yarn-

- name: Load Cached Node Modules
uses: actions/cache@v4
uses: actions/cache@v5
with:
path: "**/node_modules"
key: ${{ runner.os }}-node-modules-${{ hashFiles('**/yarn.lock') }}
Expand Down Expand Up @@ -136,19 +136,19 @@ jobs:

# Upload artifacts
- name: Upload Core Binary As Artifact
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
with:
name: UKControllerPluginCore.dll
path: ".\\build\\bin\\UKControllerPluginCore.dll"

- name: Upload Updater Binary As Artifact
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
with:
name: UKControllerPluginUpdater.dll
path: ".\\build\\bin\\UKControllerPluginUpdater.dll"

- name: Upload Loader Binary As Artifact
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
with:
name: UKControllerPlugin.dll
path: ".\\build\\bin\\UKControllerPlugin.dll"
Expand All @@ -161,7 +161,7 @@ jobs:
cancel-in-progress: true
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
persist-credentials: false

Expand Down Expand Up @@ -193,7 +193,7 @@ jobs:
cancel-in-progress: false
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
persist-credentials: false

Expand All @@ -208,7 +208,7 @@ jobs:
run: echo "::set-output name=dir::$(yarn cache dir)"

- name: Load Yarn Cache
uses: actions/cache@v4
uses: actions/cache@v5
id: yarn-cache
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
Expand All @@ -217,7 +217,7 @@ jobs:
${{ runner.os }}-yarn-

- name: Load Cached Node Modules
uses: actions/cache@v4
uses: actions/cache@v5
with:
path: "**/node_modules"
key: ${{ runner.os }}-node-modules-${{ hashFiles('**/yarn.lock') }}
Expand Down
8 changes: 8 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,14 @@ if(MSVC)
set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "${CMAKE_STATIC_LINKER_FLAGS}")
endif()

################################################################################
# Global compile definitions for all targets
################################################################################
add_compile_definitions(
$<$<CONFIG:Debug>:_DEBUG>
$<$<CONFIG:Release>:NDEBUG>
)

################################################################################
# Nuget packages function stub.
################################################################################
Expand Down
7 changes: 7 additions & 0 deletions docs/UserGuide/Changelog/Changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# UK Controller Plugin Changelog

## [5.18.1](https://github.com/VATSIM-UK/uk-controller-plugin/compare/5.18.0...5.18.1) (2025-12-01)


### Bug Fixes

* configure debug options compile targets ([b21d96b](https://github.com/VATSIM-UK/uk-controller-plugin/commit/b21d96b8099bb7f054c9d164d52bffb1d1fdf87f))

# [5.18.0](https://github.com/VATSIM-UK/uk-controller-plugin/compare/5.17.4...5.18.0) (2025-11-03)


Expand Down
4 changes: 2 additions & 2 deletions src/plugin/radarscreen/ScreenControls.h
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ namespace UKControllerPlugin::RadarScreen {
const int toggleboxIdEuroscope;

// Height for each control
const int controlHeight = 25;
const int controlHeight = 22;

// Width for each control
const int controlWidth = 25;
const int controlWidth = 22;

// Title for the options
const std::string menuName = "UKCP Options";
Expand Down
6 changes: 3 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2226,9 +2226,9 @@ lodash.uniqby@^4.7.0:
integrity sha1-2ZwHpmnp5tJOE2Lf4mbGdhavEwI=

lodash@^4.17.12, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4:
version "4.17.21"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
version "4.17.23"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.23.tgz#f113b0378386103be4f6893388c73d0bde7f2c5a"
integrity sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==

longest@^2.0.1:
version "2.0.1"
Expand Down
Loading