Skip to content

Commit

Permalink
Merge branch 'release/1.10' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
Raphiiko committed Oct 28, 2023
2 parents 5c97ce0 + e741968 commit 81db47f
Show file tree
Hide file tree
Showing 309 changed files with 28,676 additions and 14,065 deletions.
4 changes: 2 additions & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
"error",
{
"type": "attribute",
"prefix": "app",
"style": "camelCase"
}
],
Expand All @@ -54,7 +53,8 @@
"no-constant-condition": "off",
"no-prototype-builtins": "off",
"@typescript-eslint/no-non-null-assertion": "off",
"@typescript-eslint/no-explicit-any": "off"
"@typescript-eslint/no-explicit-any": "off",
"@angular-eslint/no-input-rename": "off"
}
},
{
Expand Down
83 changes: 83 additions & 0 deletions .github/workflows/build-steam-beta-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
name: 'Steam Beta Build'
on:
push:
branches:
- steam-beta

jobs:
build-steam-release:
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-steam-beta
cancel-in-progress: true
strategy:
fail-fast: false
matrix:
platform: [ windows-latest ]
runs-on: ${{ matrix.platform }}
steps:
- uses: actions/checkout@v2
- name: Get Package Version
id: get-package-version
uses: stevenbenitez/get-package-version-action@v1
- name: Setup NodeJS
uses: actions/setup-node@v3
with:
node-version: 16
cache: npm
- name: Initialize the project
run: npm run ci
- name: Install Rust stable toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: 1.70.0
default: true
override: true
- name: Install Protoc
uses: arduino/setup-protoc@v2
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- name: Configure Rust cache
uses: Swatinem/rust-cache@v2
with:
workspaces: |
src-shared-rust
src-elevated-sidecar
src-core
- name: Install development Tauri CLI
run: cargo install --git https://github.com/tauri-apps/tauri --branch 1.x tauri-cli
- name: Get Changelog Entry
id: changelog_reader
uses: mindsers/changelog-reader-action@v2
with:
validation_level: warn
version: ${{ steps.get-package-version.outputs.version }}
path: ./CHANGELOG.md
- name: Prepare Steamworks SDK
env:
STEAM_CONFIG_VDF: ${{ secrets.STEAM_CONFIG_VDF }}
STEAM_APP_ID: '2538150'
APP_VERSION: v${{ steps.get-package-version.outputs.version }}-beta
shell: bash
run: chmod +x ./scripts/steam/1-prepare-steam-sdk.sh && ./scripts/steam/1-prepare-steam-sdk.sh
- name: Set build id
run: npm run set-build-id
- name: Set flavour to STEAM
run: npm run set-flavour STEAM
- name: Build OyasumiVR (STEAM Flavour)
run: cargo-tauri build -b none
- name: Copy STEAM build
shell: bash
run: chmod +x ./scripts/steam/2-move-build-steam.sh && ./scripts/steam/2-move-build-steam.sh
- name: Set flavour to STEAM_CN
run: npm run set-flavour STEAM_CN
- name: Build OyasumiVR (STEAM_CN Flavour)
run: cargo-tauri build -b none
- name: Copy STEAM_CN build
shell: bash
run: chmod +x ./scripts/steam/3-move-build-steam-cn.sh && ./scripts/steam/3-move-build-steam-cn.sh
- name: Deploy to Steam
env:
STEAM_BUILD_USER: ${{ secrets.STEAM_BUILD_USER }}
STEAM_APP_ID: '2538150'
shell: bash
run: chmod +x ./scripts/steam/4-steam-deploy.sh && ./scripts/steam/4-steam-deploy.sh
46 changes: 44 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,47 @@ 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.10.0]

### Added

- Simple mode for brightness control that consolidates image- and display brightness.
- Brightness control dialog to directly control brightness from the main window.
- Brightness control sliders to directly control brightness from the overlay.
- Sleep preparation automation for brightness control, to allow for dimming brightness levels already before going to sleep.
- Sleep preparation button in the overlay and on the overview, to trigger automations that support this feature.
- Copy buttons to the brightness automation configuration for copying current brightness levels.
- Options to apply sleep-mode based brightness levels on OyasumiVR and SteamVR startup.
- Automation for enabling the sleep mode based on your heart rate. ([Pulsoid](https://pulsoid.net) integration)
- Automation for detecting possible nightmares based on your heart rate. ([Pulsoid](https://pulsoid.net) integration)
- Setting for OyasumiVR to quit alongside SteamVR.
- Instructions on how to start OyasumiVR alongside SteamVR.
- Automations for turning off devices when their battery levels reach below a threshold.
- Shortcut to VRChat related settings from the status bar pill.
- Option for dismissing the sleep check by pressing controller buttons.
- Option for changing the volume of general notification sounds.
- Optional fix for running the SteamVR overlay on systems with hybrid graphics.

### Changed

- Updated translations to use ICU syntax.
- Migrated from Legacy OpenVR Input system to SteamVR's current input system (Controller bindings are now configured in SteamVR!)
- Bundled dotnet runtime requirements with overlay sidecar module. (Separate installation no longer required)

### Fixed

- Improvements to the Simplified Chinese translations (by [雾雨花精灵](https://twitter.com/u_flower_elf)).
- Disabling OSC features leading to a crash
- A configuration saving loop in status automations view
- Malformed OSC packets causing a crash
- OSC message processing being slower than necessary
- Date formatting for Korean language
- Long VRChat usernames sometimes overflowing on the player list for automatic invite request accepts
- Added workaround for bug in SteamVR 2.0 regarding IVROverlay::ComputeOverlayIntersection.

### Removed
- Dotnet version checking and installation.

## [1.9.0]

### Added
Expand All @@ -22,14 +63,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed

- Added missing translations for Traditional and Simplified Chinese. (By [狐 Kon](https://github.com/XoF-eLtTiL))
- Gamma corrected image brightness control (You might have to readjust your brightness settings)

### Fixed

- Fixed issues with detection and installation of missing .NET runtimes
- Fixed Japanese date formatting
- Fixed Japanese font rendering in overlay
- Upgraded various dependencies

### Removed

- Custom VRCFury installation prefabs for GoGo Loco. (You can now use GoGo Loco's own installation prefabs from GoGo Loco 1.8.0 onwards!)
Expand Down Expand Up @@ -79,7 +121,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [1.7.2]

### Changed
### Fixed

- Updated Japanese Translations
- Updated references to the new GitHub repository, following the rebrand to OyasumiVR
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,20 @@

<p align="center">
<a><img alt="Latest Version" src="https://img.shields.io/github/v/tag/Raphiiko/Oyasumi?color=informational&label=version&sort=semver"></a>
<a><img alt="Production Build Status" src="https://github.com/Raphiiko/Oyasumi/actions/workflows/build-release.yml/badge.svg"/></a>
<a><img alt="Development Build Status" src="https://github.com/Raphiiko/Oyasumi/actions/workflows/build-development.yml/badge.svg"/></a>
<a href="https://github.com/Raphiiko/Oyasumi/blob/develop/LICENSE"><img alt="License" src="https://img.shields.io/github/license/Raphiiko/Oyasumi"></a>
<br>
<a href="https://discord.gg/7MqdPJhYxC"><img alt="Discord Badge" src="https://img.shields.io/discord/1023672078672609382?color=5865f2&label=Discord&logo=discord&logoColor=https%3A%2F%2Fshields.io%2Fcategory%2Fother"/></a>
<a href="https://raphiiko.booth.pm/items/4216880"><img alt="Booth.pm Page" src="https://img.shields.io/badge/Store-BOOTH.PM-red"/></a>
<a href="https://store.steampowered.com/app/2538150/OyasumiVR__VR_Sleeping_Utilities"><img alt="Steam Page" src="https://img.shields.io/badge/Store-Steam-black?logo=steam"/></a>
<a href="https://raphiiko.booth.pm/items/4216880"><img alt="Booth.pm Page" src="https://img.shields.io/badge/Store-Booth.pm-red"/></a>
<a href="https://raphiiko.gumroad.com/l/oyasumi?layout=profile"><img alt="Gumroad Page" src="https://img.shields.io/badge/Store-Gumroad-important"/></a>
<br>
If you want to come chat, join our <a href="https://discord.gg/7MqdPJhYxC"><img src="https://user-images.githubusercontent.com/111654848/192362041-f09cc066-a964-446f-aa2c-fa7a7a31ec05.png" width="16" style="fill: white" /> Discord Server!</a>
<br>
<a href="https://raphiiko.booth.pm/items/4216880">booth.pmのストアページ</a>には、日本語の説明文が掲載されています。<a href="https://github.com/Raphiiko/OyasumiVR/blob/develop/README_TW.md">中文的說明手冊在這裡</a>。
<br>
<br>
<img src="https://github.com/Raphiiko/OyasumiVR/assets/111654848/88e23f9b-9c28-45e3-b2fb-2f420095affe" width="640">
<img src="https://github.com/Raphiiko/OyasumiVR/assets/111654848/597f53c7-73b8-46bb-a118-96dccae6730c" width="640">
</p>

## Download & Install
Expand All @@ -33,10 +33,10 @@

Grab our latest installer from whichever place you prefer:

- [Steam](https://store.steampowered.com/app/2538150/OyasumiVR__VR_Sleeping_Utilities/) (_The **recommended method**_)
- Our [releases page](https://github.com/Raphiiko/Oyasumi/releases)
- Our page on [BOOTH.pm](https://raphiiko.booth.pm/items/4216880)
- Our page on [Gumroad](https://raphiiko.gumroad.com/l/oyasumi?layout=profile)
- (Coming Soon!) [Steam](https://store.steampowered.com/app/2538150/OyasumiVR__VR_Sleeping_Utilities/)

Just run the installer and you should be good to go!

Expand Down Expand Up @@ -264,7 +264,7 @@ OyasumiVR currently supports the following languages:
- Japanese (日本語) (Outsourced + Community contributions by [なき](https://twitter.com/NoYu_idea))
- Korean\* (한국어) (Community contribution by [Soumt](https://github.com/soumt-r))
- Traditional Chinese\* (繁體中文) (Community contribution by [狐 Kon](https://github.com/XoF-eLtTiL))
- Simplified Chinese\* (简体中文) (Community contribution by [狐 Kon](https://github.com/XoF-eLtTiL))
- Simplified Chinese\* (简体中文) (Community contributions by [狐 Kon](https://github.com/XoF-eLtTiL) and [雾雨花精灵](https://twitter.com/u_flower_elf))
- French (Français)\* (Community contribution by [neuroblack](https://github.com/neuroblack)) (**Looking for additional maintainer!**)
- Spanish (Español)\* (Community contribution by [aacal666](https://twitter.com/aacalde666))
- Indonesian (Bahasa Indonesia)\* (Community contribution by [a9ito](https://twitter.com/a9ito))
Expand Down
6 changes: 4 additions & 2 deletions README_TW.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
<a href="https://github.com/Raphiiko/Oyasumi/blob/develop/LICENSE"><img alt="授權條款" src="https://img.shields.io/github/license/Raphiiko/Oyasumi"></a>
<br>
<a href="https://discord.gg/7MqdPJhYxC"><img alt="Discord 徽章" src="https://img.shields.io/discord/1023672078672609382?color=5865f2&label=Discord&logo=discord&logoColor=https%3A%2F%2Fshields.io%2Fcategory%2Fother"/></a>
<a href="https://raphiiko.booth.pm/items/4216880"><img alt="Booth.pm 頁面" src="https://img.shields.io/badge/商店-BOOTH.PM-red"/></a>
<a href="https://store.steampowered.com/app/2538150/OyasumiVR__VR_Sleeping_Utilities"><img alt="Steam 頁面" src="https://img.shields.io/badge/商店-Steam-black?logo=steam"/></a>
<a href="https://raphiiko.booth.pm/items/4216880"><img alt="Booth.pm 頁面" src="https://img.shields.io/badge/商店-Booth.pm-red"/></a>
<a href="https://raphiiko.gumroad.com/l/oyasumi?layout=profile"><img alt="Gumroad 頁面" src="https://img.shields.io/badge/商店-Gumroad-important"/></a>
<br>
如果你想來聊聊天,加入我們的 <a href="https://discord.gg/7MqdPJhYxC"><img src="https://user-images.githubusercontent.com/111654848/192362041-f09cc066-a964-446f-aa2c-fa7a7a31ec05.png" width="16" style="fill: white" /> Discord 伺服器!</a>
Expand All @@ -26,6 +27,7 @@

從你喜歡的地方取得我們的最新安裝程式:

- 我們的 [Steam 上的頁面](https://store.steampowered.com/app/2538150/OyasumiVR__VR_Sleeping_Utilities/)
- 我們的 [發布頁面](https://github.com/Raphiiko/Oyasumi/releases)
- 我們在 [BOOTH.pm 上的頁面](https://raphiiko.booth.pm/items/4216880)
- 我們在 [Gumroad 上的頁面](https://raphiiko.gumroad.com/l/oyasumi?layout=profile)
Expand Down Expand Up @@ -256,7 +258,7 @@ OyasumiVR 可以**自動偵測你何時入睡**,並以多種方式協助你,
- 日文 (日本語)(外包 + 社群貢獻由 [なき](https://twitter.com/NoYu_idea) 提供)
- 韓文\* (한국어)(社群貢獻由 [Soumt](https://github.com/soumt-r) 提供)
- 繁體中文\*(社群貢獻由 [狐 Kon](https://github.com/XoF-eLtTiL) 提供)
- 簡體中文\*(社群貢獻由 [狐 Kon](https://github.com/XoF-eLtTiL) 提供)
- 簡體中文\*(社群貢獻由 [狐 Kon](https://github.com/XoF-eLtTiL) [雾雨花精灵](https://twitter.com/u_flower_elf) 提供)
- 法文 (Français)\*(社群貢獻由 [neuroblack](https://github.com/neuroblack) 提供)(**尋找額外的維護者!**
- 西班牙文 (Español)\*(社群貢獻由 [aacal666](https://twitter.com/aacalde666) 提供)

Expand Down
Loading

0 comments on commit 81db47f

Please sign in to comment.