Skip to content

Commit 67ba6c0

Browse files
authored
Merge branch 'main' into differentiable-reset-sounds
2 parents c225a09 + 79eb43f commit 67ba6c0

File tree

194 files changed

+7597
-2357
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

194 files changed

+7597
-2357
lines changed

.github/workflows/build-gui.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757

5858
- if: matrix.os == 'ubuntu-22.04'
5959
name: Set up Linux dependencies
60-
uses: awalsh128/cache-apt-pkgs-action@v1.4.3
60+
uses: awalsh128/cache-apt-pkgs-action@v1.5.0
6161
with:
6262
packages: libgtk-3-dev webkit2gtk-4.1 libappindicator3-dev librsvg2-dev patchelf
6363
# Increment to invalidate the cache
@@ -87,6 +87,7 @@ jobs:
8787
shell: bash
8888
env:
8989
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
90+
NODE_OPTIONS: ${{ matrix.os == 'macos-latest' && '--max-old-space-size=4096' || '' }}
9091
run: pnpm run skipbundler --config $( ./gui/scripts/gitversion.mjs )
9192

9293
- if: matrix.os == 'windows-latest'

.github/workflows/gradle.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ jobs:
161161
path: server/desktop/build/libs/
162162

163163
- name: Set up Linux dependencies
164-
uses: awalsh128/cache-apt-pkgs-action@v1.4.3
164+
uses: awalsh128/cache-apt-pkgs-action@v1.5.0
165165
with:
166166
packages: |
167167
build-essential curl wget file libssl-dev libgtk-3-dev libappindicator3-dev librsvg2-dev
@@ -280,6 +280,7 @@ jobs:
280280
- name: Build
281281
env:
282282
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
283+
NODE_OPTIONS: --max-old-space-size=4096
283284
run: pnpm run tauri build --target universal-apple-darwin --config $( ./gui/scripts/gitversion.mjs )
284285

285286
- name: Modify Application

CONTRIBUTING.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ When touching SolarXR:
105105
- After editing files, you should run `cd solarxr-protocol`, then either run
106106
`./generate-flatbuffer.ps1` (Windows) or `./generate-flatbuffer.sh` (Linux/OSX)
107107
- Make sure to commit your changes inside the submodule.
108+
- To make sure the gui use the latest generated code, run `pnpm i`.
108109

109110
## Code Licensing
110111
SlimeVR uses dual MIT and Apache-2.0 license. Be sure that any code that you reference,

dev.slimevr.SlimeVR.metainfo.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,16 @@ work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
6565
</provides>
6666

6767
<releases>
68+
<release version="0.16.0~rc.1" type="development" date="2025-05-27"><url>https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v0.16.0-rc.1</url></release>
69+
<release version="0.15.0" date="2025-05-19"><url>https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v0.15.0</url></release>
70+
<release version="0.15.0~rc.4" type="development" date="2025-05-12"><url>https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v0.15.0-rc.4</url></release>
71+
<release version="0.15.0~rc.3" type="development" date="2025-04-28"><url>https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v0.15.0-rc.3</url></release>
72+
<release version="0.15.0~rc.2" type="development" date="2025-04-25"><url>https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v0.15.0-rc.2</url></release>
73+
<release version="0.15.0~rc.1" type="development" date="2025-04-23"><url>https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v0.15.0-rc.1</url></release>
74+
<release version="0.14.1" date="2025-04-15"><url>https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v0.14.1</url></release>
75+
<release version="0.14.0" date="2025-04-10"><url>https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v0.14.0</url></release>
76+
<release version="0.14.0~rc.2" type="development" date="2025-03-25"><url>https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v0.14.0-rc.2</url></release>
77+
<release version="0.14.0~rc.1" type="development" date="2025-02-12"><url>https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v0.14.0-rc1</url></release>
6878
<release version="0.13.2" date="2024-11-06"><url>https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v0.13.2</url></release>
6979
<release version="0.13.1" date="2024-11-05"><url>https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v0.13.1</url></release>
7080
<release version="0.13.1~rc.3" type="development" date="2024-10-31"><url>https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v0.13.1-rc.3</url></release>

gui/.lintstagedrc.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export default {
22
'**/*.{ts,tsx}': () => 'tsc -p tsconfig.json --noEmit',
33
'src/**/*.{js,jsx,ts,tsx}': 'eslint --max-warnings=0 --no-warn-ignored --cache --fix',
4-
'**/*.{js,jsx,ts,tsx,css,md,json}': 'prettier --write',
4+
'**/*.{js,jsx,ts,tsx,css,scss,md,json}': 'prettier --write',
55
};

gui/package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"@fontsource/poppins": "^5.1.0",
1010
"@formatjs/intl-localematcher": "^0.2.32",
1111
"@hookform/resolvers": "^3.6.0",
12+
"@react-hookz/deep-equal": "^3.0.3",
1213
"@react-three/drei": "^9.114.3",
1314
"@react-three/fiber": "^8.17.10",
1415
"@sentry/react": "^9.9.0",
@@ -21,11 +22,14 @@
2122
"@tauri-apps/plugin-os": "^2.0.0",
2223
"@tauri-apps/plugin-shell": "^2.0.0",
2324
"@tauri-apps/plugin-store": "^2.0.0",
25+
"@tweenjs/tween.js": "^25.0.0",
26+
"@twemoji/svg": "^15.0.0",
2427
"browser-fs-access": "^0.35.0",
2528
"classnames": "^2.5.1",
2629
"flatbuffers": "22.10.26",
2730
"intl-pluralrules": "^2.0.1",
2831
"ip-num": "^1.5.1",
32+
"jotai": "^2.12.2",
2933
"prompts": "^2.4.2",
3034
"react": "^18.3.1",
3135
"react-dom": "^18.3.1",
@@ -96,4 +100,4 @@
96100
"typescript-eslint": "^8.8.0",
97101
"vite": "^5.4.8"
98102
}
99-
}
103+
}
-571 KB
Binary file not shown.
-1.12 MB
Binary file not shown.

gui/public/i18n/de/translation.ftl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,7 @@ tracker-settings-forget = Tracker Vergessen
306306
tracker-settings-forget-description = Entfernt den Tracker vom SlimeVR Server und verhindert, dass er sich wieder verbindet, bis der Server neu gestartet wurde. Die Konfiguration des Trackers geht nicht verloren.
307307
tracker-settings-forget-label = Tracker Vergessen
308308
tracker-settings-update-unavailable = Kann nicht aktualisiert werden (DIY)
309+
tracker-settings-update-low-battery = Aktualisierung nicht möglich. Akku unter 50 %
309310
tracker-settings-update-up_to_date = Auf dem neusten Stand
310311
tracker-settings-update-available = { $versionName } ist jetzt Verfügbar
311312
tracker-settings-update = Jetzt aktualisieren
@@ -1297,7 +1298,7 @@ firmware_tool-build_step = Building
12971298
firmware_tool-build_step-description = Die Firmware wird erstellt, bitte warten.
12981299
firmware_tool-flashing_step = Flashen
12991300
firmware_tool-flashing_step-description = Ihre Tracker werden geflasht, bitte folgen Sie den Anweisungen auf dem Bildschirm.
1300-
firmware_tool-flashing_step-warning = Trennen Sie den Tracker während des Upload-Prozesses nicht vom Computer und starten Sie ihn nicht neu, es sei denn, Sie werden dazu aufgefordert. Andernfalls könnte Ihr Board unbrauchbar werden.
1301+
firmware_tool-flashing_step-warning-v2 = Trennen oder schalten Sie den Tracker während des Upload-Vorgangs nicht aus, es sei denn, Sie werden dazu aufgefordert, da dies den Tracker unbrauchbar machen kann.
13011302
firmware_tool-flashing_step-flash_more = Weitere Tracker flashen
13021303
firmware_tool-flashing_step-exit = Schließen
13031304
@@ -1315,7 +1316,7 @@ firmware_tool-build-ERROR = Die Firmware konnte nicht erstellt werden
13151316
## Firmware update status
13161317

13171318
firmware_update-status-DOWNLOADING = Lade die Firmware herunter
1318-
firmware_update-status-NEED_MANUAL_REBOOT = Bitte starten Sie den Tracker neu
1319+
firmware_update-status-NEED_MANUAL_REBOOT-v2 = Bitte schalten Sie Ihren Tracker aus und wieder ein.
13191320
firmware_update-status-AUTHENTICATING = Authentifizierung mit dem Mikrokontroller
13201321
firmware_update-status-UPLOADING = Lade die Firmware hoch
13211322
firmware_update-status-SYNCING_WITH_MCU = Synchronisieren mit dem Mikrokontroller

0 commit comments

Comments
 (0)