Skip to content

Commit

Permalink
Merge branch 'release/1.11.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
Raphiiko committed Dec 21, 2023
2 parents 97ff259 + 37b7848 commit 4b630b2
Show file tree
Hide file tree
Showing 15 changed files with 53 additions and 15 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [1.11.1]

### Added

- Option for opening the developer tools in release builds.

## [1.11.0]

### Added
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "oyasumi",
"version": "1.11.0",
"version": "1.11.1",
"author": "Raphiiko",
"license": "MIT",
"type": "module",
Expand Down Expand Up @@ -138,4 +138,4 @@
"git add"
]
}
}
}
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.

3 changes: 2 additions & 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.11.0"
version = "1.11.1"
description = ""
authors = ["Raphiiko"]
license = "MIT"
Expand Down Expand Up @@ -112,6 +112,7 @@ features = [
"shell-execute",
"shell-open",
"updater",
"devtools",
]

[dependencies.ovr_overlay]
Expand Down
6 changes: 6 additions & 0 deletions src-core/src/commands/debug.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
use tauri::Manager;

#[tauri::command]
pub async fn open_dev_tools(app_handle: tauri::AppHandle) {
app_handle.get_window("main").unwrap().open_devtools();
}
1 change: 1 addition & 0 deletions src-core/src/commands/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ pub mod log_utils;
pub mod notifications;
pub mod nvml;
pub mod splash;
pub mod debug;
1 change: 1 addition & 0 deletions src-core/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ fn configure_command_handlers() -> impl Fn(tauri::Invoke) {
commands::nvml::nvml_status,
commands::nvml::nvml_get_devices,
commands::nvml::nvml_set_power_management_limit,
commands::debug::open_dev_tools,
grpc::commands::get_core_grpc_port,
grpc::commands::get_core_grpc_web_port,
]
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.11.0"
"version": "1.11.1"
},
"tauri": {
"allowlist": {
Expand Down Expand Up @@ -179,7 +179,7 @@
"center": true,
"theme": "Dark",
"transparent": true,
"userAgent": "OyasumiVR/1.11.0 (https://github.com/Raphiiko/OyasumiVR)"
"userAgent": "OyasumiVR/1.11.1 (https://github.com/Raphiiko/OyasumiVR)"
},
{
"width": 700,
Expand All @@ -191,7 +191,7 @@
"center": true,
"theme": "Dark",
"transparent": true,
"userAgent": "OyasumiVR/1.11.0 (https://github.com/Raphiiko/OyasumiVR)"
"userAgent": "OyasumiVR/1.11.1 (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.11.0"
version = "1.11.1"
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.11.0",
"version": "1.11.1",
"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.11.0"
version = "1.11.1"
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.11.0",
"version": "1.11.1",
"author": "Raphiiko",
"license": "MIT",
"type": "module",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,20 @@ <h2 translate>settings.advanced.fixes.title</h2>
</button>
</div>
</div>
<div class="setting-row">
<div class="setting-row-label" translate>
<span translate>settings.advanced.fixes.devTools.title</span>
<span translate>settings.advanced.fixes.devTools.description</span>
</div>
<div class="setting-row-action">
<button
class="btn btn-primary"
(click)="openDevTools()"
>
<span translate>settings.advanced.fixes.devTools.action</span>
</button>
</div>
</div>
</div>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -335,4 +335,8 @@ export class SettingsAdvancedViewComponent {
.subscribe();
}
}

async openDevTools() {
await invoke('open_dev_tools');
}
}
11 changes: 8 additions & 3 deletions src-ui/assets/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -1128,10 +1128,10 @@
},
"fixes": {
"title": "Fixes & Troubleshooting",
"description": "This section contains some options and actions related to fixing problems and troubleshooting. You generally shouldn't use these unless you know what you are doing, or if you're being asked to use these when getting support.",
"description": "This section contains some options and actions related to fixing problems and troubleshooting. You generally shouldn't use these unless you know what you are doing, or if you're being asked to use these when getting support",
"vrManifestReregister": {
"title": "Reregister SteamVR application manifest",
"description": "Reregisters OyasumiVR's VR application manifest with SteamVR.",
"description": "Reregisters OyasumiVR's VR application manifest with SteamVR",
"action": "Reregister Manifest",
"modal": {
"success": {
Expand Down Expand Up @@ -1179,9 +1179,14 @@
}
}
},
"devTools": {
"title": "Open Developer Tools",
"description": "Opens the Edge Developer Tools, for debugging purposes",
"action": "Open DevTools"
},
"memoryWatcher": {
"title": "Memory Watcher",
"description": "Activate the memory watcher to monitor all child processes. An error dialog will be shown if any processes exceed a gigabyte of memory usage, and extra information will be logged.",
"description": "Activate the memory watcher to monitor all child processes. An error dialog will be shown if any processes exceed a gigabyte of memory usage, and extra information will be logged",
"action": "Activate",
"modal": {
"error": {
Expand Down

0 comments on commit 4b630b2

Please sign in to comment.