Merge branch 'develop' into steam-beta

Raphiiko · Nov 3, 2024 · d1ba78a · d1ba78a
2 parents 881218d + 806b613
commit d1ba78a
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - GPU acceleration for SteamVR overlays (Community contribution by [BenjaminZehowlt](https://github.com/BenjaminZehowlt))
 
+## [1.14.6]
+
 ### Fixed
 
 - Fixed parsing of new VRChat join/leave log format

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "oyasumi",
-  "version": "1.14.5",
+  "version": "1.14.6",
   "author": "Raphiiko",
   "license": "MIT",
   "type": "module",

diff --git a/scripts/steam/1-prepare-steam-sdk.sh b/scripts/steam/1-prepare-steam-sdk.sh
@@ -6,7 +6,7 @@
 # Clean up pre-existing files
 rm -rf SteamSDK
 # Unzip the SteamWorks SDK
-unzip scripts/steam/lib/steamworks_sdk_159.zip -d SteamSDK
+unzip scripts/steam/lib/steamworks_sdk_160.zip -d SteamSDK
 # Create Depot folders
 mkdir -p SteamSDK/sdk/tools/ContentBuilder/content/Win64
 mkdir -p SteamSDK/sdk/tools/ContentBuilder/content/Win64_CN

diff --git a/scripts/steam/lib/steamworks_sdk_159.zip → scripts/steam/lib/steamworks_sdk_160.zip b/scripts/steam/lib/steamworks_sdk_159.zip → scripts/steam/lib/steamworks_sdk_160.zip
diff --git a/src-core/Cargo.lock b/src-core/Cargo.lock
diff --git a/src-core/Cargo.toml b/src-core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "oyasumivr"
-version = "1.14.5"
+version = "1.14.6"
 description = ""
 authors = ["Raphiiko"]
 license = "MIT"

diff --git a/src-core/tauri.conf.json b/src-core/tauri.conf.json
@@ -9,7 +9,7 @@
   },
   "package": {
     "productName": "OyasumiVR",
-    "version": "1.14.5"
+    "version": "1.14.6"
   },
   "tauri": {
     "allowlist": {
@@ -201,7 +201,7 @@
         "center": true,
         "theme": "Dark",
         "transparent": true,
-        "userAgent": "OyasumiVR/1.14.5 (https://github.com/Raphiiko/OyasumiVR)"
+        "userAgent": "OyasumiVR/1.14.6 (https://github.com/Raphiiko/OyasumiVR)"
       },
       {
         "width": 700,
@@ -216,7 +216,7 @@
         "skipTaskbar": true,
         "minimizable": false,
         "alwaysOnTop": true,
-        "userAgent": "OyasumiVR/1.14.5 (https://github.com/Raphiiko/OyasumiVR)"
+        "userAgent": "OyasumiVR/1.14.6 (https://github.com/Raphiiko/OyasumiVR)"
       }
     ]
   }

diff --git a/src-elevated-sidecar/Cargo.toml b/src-elevated-sidecar/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "oyasumivr-elevated-sidecar"
-version = "1.14.5"
+version = "1.14.6"
 authors = ["Raphiiko"]
 license = "MIT"
 edition = "2021"

diff --git a/src-overlay-ui/package.json b/src-overlay-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "oyasumivr-overlay-ui",
-  "version": "1.14.5",
+  "version": "1.14.6",
   "private": true,
   "scripts": {
     "dev": "vite dev",

diff --git a/src-shared-rust/Cargo.toml b/src-shared-rust/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "oyasumivr-shared"
-version = "1.14.5"
+version = "1.14.6"
 authors = ["Raphiiko"]
 edition = "2021"
 license = "MIT"

diff --git a/src-shared-ts/package.json b/src-shared-ts/package.json
@@ -2,7 +2,7 @@
   "name": "src-shared-ts",
   "description": "Shared typescript code for Oyasumi modules",
   "scripts": {},
-  "version": "1.14.5",
+  "version": "1.14.6",
   "author": "Raphiiko",
   "license": "MIT",
   "type": "module",

diff --git a/src-ui/app/services/telemetry.service.ts b/src-ui/app/services/telemetry.service.ts
@@ -59,7 +59,7 @@ export class TelemetryService {
       if (this.trackedJSErrors.includes(errorData)) return;
       this.trackedJSErrors.push(errorData);
       this.trackEvent('ui_js_error', {
-        message: e.message,
+        errorData,
       });
     });
   }