Merge branch 'release/1.9.0' into main

.github/workflows/build-development.yml

@@ -18,23 +18,30 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Setup NodeJS
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
           node-version: 16
+          cache: npm
       - name: Initialize the project
-        run: npm run init
-      - name: Set app version to DEV version
-        run: npm run set-version DEV
+        run: npm run ci
       - name: Lint Angular project
         run: npm run lint
+      - name: Set app version to DEV version
+        run: npm run set-version DEV
+      - name: Set flavour to DEV
+        run: npm run set-flavour DEV
+      - name: Set build id
+        run: npm run set-build-id
       - name: Install Rust stable toolchain
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: stable
+          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:

.github/workflows/build-release.yml

@@ -22,19 +22,26 @@ jobs:
         id: get-package-version
         uses: stevenbenitez/get-package-version-action@v1
       - name: Setup NodeJS
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
           node-version: 16
+          cache: npm
       - name: Initialize the project
-        run: npm run init
+        run: npm run ci
+      - name: Set flavour to STANDALONE
+        run: npm run set-flavour STANDALONE
+      - name: Set build id
+        run: npm run set-build-id
       - name: Install Rust stable toolchain
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: stable
+          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:
@@ -58,7 +65,7 @@ jobs:
           TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
           TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
         with:
-          tagName: oyasumi-v${{ steps.get-package-version.outputs.version }}
+          tagName: oyasumivr-v${{ steps.get-package-version.outputs.version }}
           releaseName: OyasumiVR v${{ steps.get-package-version.outputs.version }}
           releaseBody: ${{ steps.changelog_reader.outputs.changes }}
           releaseDraft: false

.github/workflows/build-steam-release.yml

@@ -0,0 +1,84 @@
+name: 'Steam Release Build'
+on:
+  push:
+    branches:
+      - master
+      - main
+
+jobs:
+  build-steam-release:
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.ref }}-steam
+      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 }}
+        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

.github/workflows/pr-and-feature-check.yml

@@ -3,7 +3,8 @@ on:
   pull_request:
   push:
     branches:
-      - feature/*
+      - 'feature/*'
+      - '!feature/steam-release'
 
 jobs:
   check-pr-or-feature:
@@ -19,23 +20,30 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Setup NodeJS
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
           node-version: 16
+          cache: npm
       - name: Initialize the project
-        run: npm run init
+        run: npm run ci
       - name: Lint Angular project
         run: npm run lint
       - name: Set app version to DEV version
         run: npm run set-version DEV
+      - name: Set flavour to DEV
+        run: npm run set-flavour DEV
+      - name: Set build id
+        run: npm run set-build-id
       - name: Install Rust stable toolchain
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: stable
+          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:
@@ -44,7 +52,7 @@ jobs:
             src-elevated-sidecar
             src-core
       - name: Install development Tauri CLI
-        run: cargo install --git https://github.com/Raphiiko/tauri --branch 1.x tauri-cli
+        run: cargo install --git https://github.com/tauri-apps/tauri --branch 1.x tauri-cli
       - name: Test if OyasumiVR compiles
         uses: tauri-apps/tauri-action@v0
         env:

.gitignore

@@ -51,3 +51,7 @@ Thumbs.db
 # Oyasumi specific
 src-ui/assets/preload-assets.json
 src-ui/assets/splashscreen/splash-blurhash.css
+
+# Steam
+/SteamSDK/
+/steamsdk.zip

CHANGELOG.md

@@ -5,6 +5,35 @@ 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.9.0]
+
+### Added
+
+- Allow limiting sleep detection to certain hours of the day.
+- Automation toggle for sleep detection (by [góngo](https://github.com/TheMrGong))
+- OSC address for toggling the sleep detection automation.
+- Spanish language support (Community contribution by [aacal666](https://twitter.com/aacalde666))
+- Indonesian language support (Community contribution by [a9ito](https://twitter.com/a9ito))
+- Support for a release on [Steam](https://store.steampowered.com/)
+- VR Manifest for registering OyasumiVR with SteamVR.
+- Sleeping animations preset for GoGo Loco 1.8.0+
+- Cute drawings (by [Jun](https://twitter.com/JunHakase)) to the sleep toggle card in the overview
+
+### Changed
+
+- Added missing translations for Traditional and Simplified Chinese. (By [狐 Kon](https://github.com/XoF-eLtTiL))
+
+### 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!)
+
 ## [1.8.0]
 
 ### Added

README.md

@@ -21,19 +21,22 @@
     <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>。
+    <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">
 </p>
 
 ## Download & Install
 
+<img align="right" src="https://github.com/Raphiiko/OyasumiVR/assets/111654848/8a18be5c-6698-420e-847a-a5b6f533c8ed" width="180">
+
 Grab our latest installer from whichever place you prefer:
 
 - 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!
 
@@ -56,8 +59,7 @@ OyasumiVR can **detect when you are asleep**, and help you in various ways such
 <table>
   <tr>
     <td>
-      OyasumiVR can detect automatically when you are asleep, based on your movement! 
-      <br>Simply calibrate once, enable the automation, and you're set.
+      OyasumiVR can detect automatically when you are asleep, based on your movement! Simply calibrate once, enable the automation, and you're set.
       <br><br>
       If automatic detection is not what you're looking for, there's various alternative automations you can use, that are based on:
       <br><br>
@@ -133,7 +135,7 @@ OyasumiVR can **detect when you are asleep**, and help you in various ways such
     <td>
       <b>MSI Afterburner</b>
       <br>
-      If you want more control over your GPU than just setting the power limit, you can have OyasumiVR automatically activate the profiles you've set up in [MSI Afterburner](https://www.msi.com/Landing/afterburner/).
+      If you want more control over your GPU than just setting the power limit, you can have OyasumiVR automatically activate the profiles you've set up in <a href="https://www.msi.com/Landing/afterburner/">MSI Afterburner</a>.
       Tweak your over- or underclocks, power limits and more, and have OyasumiVR call for them when you go to sleep, or wake up!
     </td>
     <td width="380"><img src="https://github.com/Raphiiko/OyasumiVR/assets/111654848/51c39db0-fa11-4612-8975-8bf642befe82"></td>
@@ -157,7 +159,7 @@ OyasumiVR can **detect when you are asleep**, and help you in various ways such
           <br><a href="https://booth.pm/en/items/4233545">EX version</a> also supported!
         </li>
         <li>
-          <a href="https://booth.pm/en/items/3290806">GoGo Loco v1.7.1+</a> by <a href="https://twitter.com/franada">franada</a>
+          <a href="https://booth.pm/en/items/3290806">GoGo Loco v1.7.1+</a> by <a href="https://twitter.com/franadaVRC">franada</a>
         </li>
       </ul>
       <br>
@@ -263,7 +265,9 @@ OyasumiVR currently supports the following languages:
 - 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))
-- French (Français)\* (Community contribution by [neuroblack](https://github.com/neuroblack))
+- 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))
 
 _(\*) This is a community supported language, which means translations might not always be 100% complete with each and every update._
 
@@ -329,6 +333,11 @@ OyasumiVR isn't endorsed by VRChat and doesn't reflect the views or opinions of
 
 The OyasumiVR developer and any of this project's contributors are not responsible for any problems caused by OyasumiVR (to your VRChat account or otherwise). Use at your own risk.
 
+## Support
+If you are having trouble with OyasumiVR, say you have a bug, or a feature request, you can join our [Discord server](https://discord.gg/7MqdPJhYxC).
+
+Alternatively, you can reach out to me directly on [Twitter at @Raphiiko](https://twitter.com/Raphiiko). I'll try to get back to you as soon as possible!
+
 ## License
 
-OyasumiVR is available under the [MIT](https://github.com/Raphiiko/Oyasumi/blob/develop/LICENSE.md) license.
+OyasumiVR is available under the [MIT](https://github.com/Raphiiko/OyasumiVR/blob/develop/LICENSE.md) license.