Skip to content

Commit

Permalink
Merge branch 'develop' into steam-beta
Browse files Browse the repository at this point in the history
  • Loading branch information
Raphiiko committed Oct 30, 2024
2 parents caea0d1 + 125f258 commit 31e192b
Show file tree
Hide file tree
Showing 10 changed files with 23 additions and 11 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.5]

### Fixed

- Linking your Pulsoid account through the Pulsoid integration no longer functioning.
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "oyasumi",
"version": "1.14.4",
"version": "1.14.5",
"author": "Raphiiko",
"license": "MIT",
"type": "module",
Expand Down
4 changes: 2 additions & 2 deletions src-core/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src-core/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "oyasumivr"
version = "1.14.4"
version = "1.14.5"
description = ""
authors = ["Raphiiko"]
license = "MIT"
Expand Down
6 changes: 3 additions & 3 deletions src-core/tauri.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"package": {
"productName": "OyasumiVR",
"version": "1.14.4"
"version": "1.14.5"
},
"tauri": {
"allowlist": {
Expand Down Expand Up @@ -201,7 +201,7 @@
"center": true,
"theme": "Dark",
"transparent": true,
"userAgent": "OyasumiVR/1.14.4 (https://github.com/Raphiiko/OyasumiVR)"
"userAgent": "OyasumiVR/1.14.5 (https://github.com/Raphiiko/OyasumiVR)"
},
{
"width": 700,
Expand All @@ -216,7 +216,7 @@
"skipTaskbar": true,
"minimizable": false,
"alwaysOnTop": true,
"userAgent": "OyasumiVR/1.14.4 (https://github.com/Raphiiko/OyasumiVR)"
"userAgent": "OyasumiVR/1.14.5 (https://github.com/Raphiiko/OyasumiVR)"
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion src-elevated-sidecar/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "oyasumivr-elevated-sidecar"
version = "1.14.4"
version = "1.14.5"
authors = ["Raphiiko"]
license = "MIT"
edition = "2021"
Expand Down
2 changes: 1 addition & 1 deletion src-overlay-ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "oyasumivr-overlay-ui",
"version": "1.14.4",
"version": "1.14.5",
"private": true,
"scripts": {
"dev": "vite dev",
Expand Down
2 changes: 1 addition & 1 deletion src-shared-rust/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "oyasumivr-shared"
version = "1.14.4"
version = "1.14.5"
authors = ["Raphiiko"]
edition = "2021"
license = "MIT"
Expand Down
2 changes: 1 addition & 1 deletion src-shared-ts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "src-shared-ts",
"description": "Shared typescript code for Oyasumi modules",
"scripts": {},
"version": "1.14.4",
"version": "1.14.5",
"author": "Raphiiko",
"license": "MIT",
"type": "module",
Expand Down
10 changes: 10 additions & 0 deletions src-ui/app/services/telemetry.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ export class TelemetryService {
);
public settings: Observable<TelemetrySettings> = this._settings.asObservable();

private trackedJSErrors: string[] = [];

constructor() {}

async init() {
Expand All @@ -48,6 +50,14 @@ export class TelemetryService {
});

window.addEventListener('error', (e) => {
const errorData = JSON.stringify({
filename: e.filename,
lineno: e.lineno,
colno: e.colno,
message: e.message,
});
if (this.trackedJSErrors.includes(errorData)) return;
this.trackedJSErrors.push(errorData);
this.trackEvent('ui_js_error', {
message: e.message,
});
Expand Down

0 comments on commit 31e192b

Please sign in to comment.