Compare commits

..
Author SHA1 Message Date
dependabot[bot] 88971f12ae Bump actions/setup-node from 6 to 7
Bumps [actions/setup-node](https://github.com/actions/setup-node) from 6 to 7.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/v6...v7)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-version: '7'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
2026-07-20 14:34:13 +00:00
16 changed files with 57 additions and 211 deletions

No files matched your search

+3 -3
View File
@@ -77,7 +77,7 @@ jobs:
- name: Setup PNPM
uses: pnpm/action-setup@v6
- name: Setup Node
uses: actions/setup-node@v6
uses: actions/setup-node@v7
with:
node-version-file: '.node-version'
cache: 'pnpm'
@@ -145,7 +145,7 @@ jobs:
- name: Setup PNPM
uses: pnpm/action-setup@v6
- name: Setup Node
uses: actions/setup-node@v6
uses: actions/setup-node@v7
with:
node-version-file: '.node-version'
cache: 'pnpm'
@@ -178,7 +178,7 @@ jobs:
- name: Setup PNPM
uses: pnpm/action-setup@v6
- name: Setup Node
uses: actions/setup-node@v6
uses: actions/setup-node@v7
with:
node-version-file: '.node-version'
cache: 'pnpm'
-36
View File
@@ -1,36 +0,0 @@
name: Test Crowdin Sync (Dry Run)
on:
workflow_dispatch:
inputs:
dry_run:
description: 'Perform a dry run (logs changes without modifying repository)'
type: boolean
default: true
localization_branch:
description: 'Branch to target for translations'
type: string
default: 'l10n_main'
jobs:
test-crowdin:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v6
with:
submodules: recursive
- name: Test Crowdin Synchronization
uses: crowdin/github-action@v2
with:
upload_sources: true
upload_translations: false
download_translations: true
localization_branch_name: ${{ inputs.localization_branch }}
dry_run: ${{ inputs.dry_run }}
create_pull_request: false
env:
CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
CROWDIN_API_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
@@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- uses: actions/setup-node@v6
- uses: actions/setup-node@v7
with:
node-version: '22.x'
+2 -3
View File
@@ -3,7 +3,6 @@ on:
push:
branches:
- pontoon
- l10n_main
jobs:
pull_request:
if: ${{ github.repository == 'SlimeVR/SlimeVR-Server' }}
@@ -18,5 +17,5 @@ jobs:
env:
GH_TOKEN: ${{ secrets.PONTOON_BOT_KEY }}
run: |
gh_pr_up() { gh pr create "$@" --draft --base main || gh pr edit "$@"; }
gh_pr_up --title "New translations" --body "Please don't squash me 🥺"
gh_pr_up() { gh pr create "$@" --label "Area: Translation" --base main || gh pr edit "$@"; }
gh_pr_up --title "New Pontoon translations" --body "Please don't squash me 🥺"
+4 -34
View File
@@ -1,44 +1,14 @@
# This workflow will rebase `l10n_main` and `pontoon` with `main` changes, it's for making the
# translation bots not try making commits to main
# This workflow will rebase `pontoon` with `main` changes, it's for making the
# Pontoon bot not try making commits to main
name: Rebase translation branches to main
name: Rebase pontoon branch to main
on:
push:
branches:
- main
jobs:
rebase-l10n:
if: ${{ github.repository == 'SlimeVR/SlimeVR-Server' }}
runs-on: ubuntu-latest
permissions:
contents: write
steps:
- uses: actions/checkout@v6
with:
ref: l10n_main
submodules: recursive
# Get all the git history for rebasing
fetch-depth: 0
- name: Rebase
run: |
git config --local user.name "slimevr-bot"
git config --local user.email '[email protected]'
git fetch origin main
git rebase origin/main
git submodule update
- name: Push rebase
uses: github-actions-x/[email protected]
with:
github-token: ${{ secrets.PONTOON_BOT_KEY }}
push-branch: "l10n_main"
commit-message: "update"
force-push: "true"
name: "slimevr-bot"
email: "[email protected]"
rebase-pontoon:
rebase:
if: ${{ github.repository == 'SlimeVR/SlimeVR-Server' }}
runs-on: ubuntu-latest
permissions:
+1 -7
View File
@@ -25,9 +25,7 @@
.settings
# Node Stuff
node_modules/
dist/
stats.html
/node_modules
.husky
# kotlin stuff
@@ -35,10 +33,6 @@ stats.html
# ignore gradle build folder
build/
server/desktop/config/
# created by clangd for index cache
.cache/
# direnv has been claimed for Nix usage
.direnv/
-2
View File
@@ -1,7 +1,5 @@
# Contributing to SlimeVR
Please follow general contribution guidelines: [CONTRIBUTING.md](https://github.com/SlimeVR/.github/blob/main/profile/CONTRIBUTING.md).
This document describes essential knowledge required to contribute to the SlimeVR Server.
### Prerequisites
-12
View File
@@ -1,12 +0,0 @@
$ErrorActionPreference = "Stop"
if ((Get-Command "clang-format" -ErrorAction SilentlyContinue) -eq $null) {
$errorObj = New-Object System.IO.FileNotFoundException("clang-format is not installed, please install clang-format via your package manager (e.g. winget/chocolatey/scoop) and re-run the script")
throw $errorObj
}
$SourceFiles = Get-ChildItem -Path '.\src\' -Recurse -Include "*.cpp","*.hpp"
foreach ($file in $SourceFiles) {
Write-Output "Formatting $(Resolve-Path -Relative $file.FullName)"
clang-format -i "$($file.FullName)"
}
-12
View File
@@ -1,12 +0,0 @@
#!/bin/bash
if ! command -v clang-format >/dev/null 2>&1; then
echo "clang-format is not installed, please install clang-format via your package manager (e.g. pacman/apt/dnf/winget) and re-run the script" >&2
exit 1
fi
find src/ \( \
-iname '*.cpp' \
-or -iname '*.hpp' \
\) \
-exec echo Formatting {} \; \
-exec clang-format -i {} \;
+11 -26
View File
@@ -102,34 +102,19 @@ static void signal_handler(int signal) {
int main() {
auto &logger = Logger::get();
// Steam and SteamVR respectively set these environment variables on applications that
// they spawn, which the SteamVR client library (vrclient) will then use as the
// application key when initiating the connection with vrserver. This may not
// be ideal if we are launched by another Steam or OpenVR application, as we will inherit
// their app key through the environment, which means SteamVR will load the wrong bindings.
// A real-world example of this is if someone uses an application such as OpenVR-Autostarter
// to start the SlimeVR Server. OpenVR-Autostarter installs an application manifest with the
// app key "dreiekk.openvr-autostarter", so when it starts SlimeVR Server, which then starts us,
// the STEAMVR_APPKEY="dreiekk.openvr-autostarter" environment variable will be set.
//
// We want SteamVR to use the appkey of the Steam version of our application if possible.
// Unfortunately, we cannot install an application vrmanifest to force the app key,
// as SteamVR requires a binary path in the manifest to consider it valid. We do not want to install
// a manifest with a binary path because we want the SlimeVR Server to start us when the
// driver initiates a connection, rather than getting auto-started by SteamVR.
//
// This is not documented anywhere publicly, see CVRClient::SendConnectMessage in vrclient instead.
constexpr const char *STEAM_APPID = "3245490";
constexpr const char *STEAMVR_APPKEY = "steam.overlay.3245490";
// Steam and SteamVR sets these environment variables on applications that it
// spawns, but if an app spawned by Steam then spawns a child that initialises
// OpenVR, SteamVR will give the child the appkey of the root application it
// is a descendant of, e.g. if SteamVR launches SlimeVR as an overlay,
// it will set SteamAppId="3245490" and STEAMVR_APPKEY="steam.overlay.3245490"
// which breaks our bindings. We want SteamVR to use a generated appkey if
// possible.
#ifdef _WIN32
SetEnvironmentVariableA("SteamAppId", STEAM_APPID);
SetEnvironmentVariableA("STEAMVR_APPKEY", STEAMVR_APPKEY);
SetEnvironmentVariableA("SteamAppId", nullptr);
SetEnvironmentVariableA("STEAMVR_APPKEY", nullptr);
#else
setenv("SteamAppId", STEAM_APPID, 1);
setenv("STEAMVR_APPKEY", STEAMVR_APPKEY, 1);
unsetenv("SteamAppId");
unsetenv("STEAMVR_APPKEY");
#endif
try {
+6 -17
View File
@@ -1,9 +1,7 @@
#include "solarxr.hpp"
#include "logger.hpp"
#include "paths.hpp"
#include <stdexcept>
#include <string>
#if defined(__linux__)
#include <sys/socket.h>
@@ -16,24 +14,15 @@
namespace fs = std::filesystem;
static std::string getenvSafe(const char *env) {
char *v = getenv(env);
if (v == nullptr)
return {};
return v;
}
fs::path SolarXRConnection::getSocketPath() {
using namespace std::string_view_literals;
#if defined(__linux__)
#define MAKE_SOCKET_PATH(PATH) \
std::make_pair(PATH##sv, getenvSafe(PATH))
std::make_pair(PATH##sv, static_cast<const char *>(getenv(PATH)))
constexpr std::string_view socketName = "SlimeVRRpc";
std::array<std::pair<std::string_view, fs::path>, 5> socketPaths{
std::array<std::pair<std::string_view, const char *>, 4> socketPaths{
MAKE_SOCKET_PATH("SLIMEVR_SOCKET_DIR"),
{ "Steam socket path", Paths::getDataPath() },
MAKE_SOCKET_PATH("XDG_RUNTIME_DIR"),
MAKE_SOCKET_PATH("TMPDIR"),
{ "/tmp", "/tmp" }
@@ -42,17 +31,17 @@ fs::path SolarXRConnection::getSocketPath() {
#undef MAKE_SOCKET_PATH
for (auto [name, path] : socketPaths) {
if (path.empty()) {
if (path == nullptr) {
Logger::get().info(
"Skipping socket directory '{}' because it doesn't exist", name);
"Skipping socket directory {} because it doesn't exist", name);
continue;
}
fs::path socketPath = path / socketName;
fs::path socketPath = fs::path(path) / socketName;
if (fs::exists(socketPath))
return socketPath;
Logger::get().info(
"Skipping socket directory '{}' because socket does not exist", name);
"Skipping socket directory {} because socket does not exist", name);
}
#elif defined(_WIN32)
throw std::logic_error(
-19
View File
@@ -1,19 +0,0 @@
# Crowdin Configuration File
# https://developer.crowdin.com/configuration-file/
project_id_env: CROWDIN_PROJECT_ID
api_token_env: CROWDIN_PERSONAL_TOKEN
files:
- source: /gui/app/public/i18n/en/translation.ftl
translation: /gui/app/public/i18n/%locale%/%original_file_name%
languages_mapping:
locale:
zh-CN: zh-Hans
zh-TW: zh-Hant
nb: nb-NO
nb-NO: nb-NO
sv: sv-SE
sv-SE: sv-SE
en-OWO: en-x-owo
owo: en-x-owo
+5 -3
View File
@@ -690,15 +690,17 @@ settings-general-gesture_control-trackers = { $amount ->
settings-general-gesture_control-yawResetEnabled = Enable tap to yaw reset
settings-general-gesture_control-yawResetDelay = Yaw reset delay
settings-general-gesture_control-yawResetTaps = Taps for yaw reset
settings-general-gesture_control-yawResetTracker = Yaw reset tracker
settings-general-gesture_control-yawResetTracker = Yaw Reset Tracker
settings-general-gesture_control-fullResetEnabled = Enable tap to full reset
settings-general-gesture_control-fullResetDelay = Full reset delay
settings-general-gesture_control-fullResetTaps = Taps for full reset
settings-general-gesture_control-fullResetTracker = Full reset tracker
settings-general-gesture_control-fullResetTracker = Full Reset Tracker
settings-general-gesture_control-mountingResetEnabled = Enable tap to perform mounting calibration
settings-general-gesture_control-mountingResetDelay = Mounting calibration delay
settings-general-gesture_control-mountingResetTaps = Taps for mounting calibration
settings-general-gesture_control-mountingResetTracker = Mounting reset tracker
settings-general-gesture_control-mountingResetTracker = Mounting Reset Tracker
settings-general-gesture_control-yawResetTracker-title = Yaw Reset Tracker
settings-general-gesture_control-fullResetTracker-title = Full Reset Tracker
# The number of trackers that can have higher acceleration before a tap is rejected
settings-general-gesture_control-numberTrackersOverThreshold = Trackers over threshold
settings-general-gesture_control-numberTrackersOverThreshold-description = Increase this value if tap detection is not working. Do not increase it above what is needed to make tap detection work as it would cause more false positives.
@@ -1317,7 +1317,7 @@ export function GeneralSettings() {
</div>
<div className="grid sm:grid-cols-3 gap-5 pb-2">
<div>
<Typography bold>
<Typography variant="section-title">
{l10n.getString(
'settings-general-gesture_control-yawResetTracker'
)}
@@ -1331,21 +1331,7 @@ export function GeneralSettings() {
/>
</div>
<div>
<Typography bold>
{l10n.getString(
'settings-general-gesture_control-fullResetTracker'
)}
</Typography>
<Dropdown
display="block"
control={control}
placeholder={''}
name="tapDetection.fullResetTracker"
items={bodyParts}
/>
</div>
<div>
<Typography bold>
<Typography variant="section-title">
{l10n.getString(
'settings-general-gesture_control-mountingResetTracker'
)}
@@ -1358,6 +1344,20 @@ export function GeneralSettings() {
items={bodyParts}
/>
</div>
<div>
<Typography variant="section-title">
{l10n.getString(
'settings-general-gesture_control-fullResetTracker'
)}
</Typography>
<Dropdown
display="block"
control={control}
placeholder={''}
name="tapDetection.fullResetTracker"
items={bodyParts}
/>
</div>
</div>
</div>
<div className="grid sm:grid-cols-3 gap-5 pb-2">
@@ -406,9 +406,7 @@ class TrackersUDPServer(private val port: Int, name: String, private val tracker
var rot = packet.rotation
rot = AXES_OFFSET.times(rot)
val tracker = connection?.getTracker(packet.sensorId) ?: return
if (tracker.status == TrackerStatus.DISCONNECTED || tracker.status == TrackerStatus.TIMED_OUT) {
tracker.status = TrackerStatus.OK
}
if (tracker.status == TrackerStatus.DISCONNECTED) tracker.status = TrackerStatus.OK
tracker.setRotation(rot)
if (packet is UDPPacket23RotationAndAcceleration) {
// sensorOffset is applied correctly since protocol 22
@@ -424,9 +422,7 @@ class TrackersUDPServer(private val port: Int, name: String, private val tracker
is UDPPacket17RotationData -> {
val tracker = connection?.getTracker(packet.sensorId) ?: return
if (tracker.status == TrackerStatus.DISCONNECTED || tracker.status == TrackerStatus.TIMED_OUT) {
tracker.status = TrackerStatus.OK
}
if (tracker.status == TrackerStatus.DISCONNECTED) tracker.status = TrackerStatus.OK
var rot17 = packet.rotation
rot17 = AXES_OFFSET * rot17
when (packet.dataType) {
@@ -450,9 +446,7 @@ class TrackersUDPServer(private val port: Int, name: String, private val tracker
is UDPPacket4Acceleration -> {
val tracker = connection?.getTracker(packet.sensorId) ?: return
if (tracker.status == TrackerStatus.DISCONNECTED || tracker.status == TrackerStatus.TIMED_OUT) {
tracker.status = TrackerStatus.OK
}
if (tracker.status == TrackerStatus.DISCONNECTED) tracker.status = TrackerStatus.OK
// sensorOffset is applied correctly since protocol 22
// See: https://github.com/SlimeVR/SlimeVR-Tracker-ESP/pull/480
if (connection.protocolVersion >= 22) {
@@ -58,6 +58,11 @@ class BindingsProviderManager : Runnable {
"BindingsProviderManager already running"
}
val binaryPath = getBinaryPath() ?: throw RuntimeException("Unable to find bindings provider binary")
process = ProcessBuilder(binaryPath.toString())
.redirectErrorStream(true)
.start()
LogManager.info("[BindingsProviderManager] Started process")
watcherThread = Thread(this, "Bindings provider watcher")
watcherThread!!.start()
}
@@ -72,17 +77,6 @@ class BindingsProviderManager : Runnable {
override fun run() {
try {
// Give SteamVR a bit more time to initialise everything
// For some users, starting the executable immediately may cause startup failures
// This feels like a bit of a hack, but whatever
Thread.sleep(3000L)
val binaryPath = getBinaryPath() ?: throw RuntimeException("Unable to find bindings provider binary")
process = ProcessBuilder(binaryPath.toString())
.redirectErrorStream(true)
.start()
LogManager.info("[BindingsProviderManager] Started process")
val interval = 1000L / 30L
while (process?.isAlive == true) {
Thread.sleep(interval)