Skip to content

Commit

Permalink
Merge branch 'release/1.3.0' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
Raphiiko committed Dec 18, 2022
2 parents 573d378 + db7c92d commit 26a3015
Show file tree
Hide file tree
Showing 52 changed files with 8,302 additions and 5,751 deletions.
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,22 @@ 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.3.0]

### Added

- New feature for automatically accepting invite requests while on orange/green status, optionally based on a white- or blacklist.
- Korean language support, thanks to [@soumt-r](https://github.com/soumt-r).

### Changed

- Made sleeping position animation automations automatically trigger when the automation is enabled.
- Prevent Oyasumi from being opened twice and instead focus the window for the instance already running.

## [1.2.2]

### Fixed

- Fixed issue where the main window would load before the app was ready, due to a bug in a new version of the `tao` crate.

## [1.2.1]
Expand Down
46 changes: 42 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,11 @@
</p>

<p align="center">
This is the main repository for Oyasumi.<br>It is an open source tool to assist with sleeping in virtual reality (VRChat).
Oyasumi is an open source tool to assist with sleeping in virtual reality (VRChat).
<br>
Oyasumiは、バーチャルリアリティの中で睡眠をアシストするオープンソースソフトウェアです。
<br>
<a href="https://raphiiko.booth.pm/items/4216880">booth.pmのストアページ</a>には、日本語の説明文が掲載されています。
</p>

<p align="center">
Expand All @@ -28,9 +32,39 @@

Grab the latest installer over on the [Releases](https://github.com/Raphiiko/Oyasumi/releases) page.

|Sleeping Animations |GPU Power Limiting |Sleep Detection |Battery Automations |Device Overview |Status Automations |
|-------------------------------------------------------------------------------------------------------------------------------- |---------------------------------------------------------------------------------------------------------------------------- |----------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------|
|<img src="https://github.com/Raphiiko/Oyasumi/raw/develop/docs/img/screenshot_sleeping_animations.png" width="100%" crossorigin> |<img src="https://github.com/Raphiiko/Oyasumi/raw/develop/docs/img/screenshot_gpu_automations.png" width="100%" crossorigin> |<img src="https://github.com/Raphiiko/Oyasumi/raw/develop/docs/img/screenshot_sleep_detection.png" width="100%" crossorigin>|<img src="https://github.com/Raphiiko/Oyasumi/raw/develop/docs/img/screenshot_battery_automations.png" width="100%" crossorigin>|<img src="https://github.com/Raphiiko/Oyasumi/raw/develop/docs/img/screenshot_overview.png" width="100%" crossorigin>|<img src="https://github.com/Raphiiko/Oyasumi/raw/develop/docs/img/screenshot_status_automations.png" width="100%" crossorigin>|
<p align="center">
<table>
<tr>
<td><p align="center"><b>Device Overview</b></p></td>
<td><p align="center"><b>Sleeping Animations</b></p></td>
<td><p align="center"><b>GPU Power Limiting</b></p></td>
<td><p align="center"><b>Sleep Detection</b></p></td>
<td><p align="center"><b>Battery Automations</b></p></td>

</tr>
<tr>
<td><p align="center"><img src="https://github.com/Raphiiko/Oyasumi/raw/develop/docs/img/screenshot_overview.png" width="100%" crossorigin></p></td>
<td><p align="center"><img src="https://github.com/Raphiiko/Oyasumi/raw/develop/docs/img/screenshot_sleeping_animations.png" width="100%" crossorigin></p></td>
<td><p align="center"><img src="https://github.com/Raphiiko/Oyasumi/raw/develop/docs/img/screenshot_gpu_automations.png" width="100%" crossorigin></p></td>
<td><p align="center"><img src="https://github.com/Raphiiko/Oyasumi/raw/develop/docs/img/screenshot_sleep_detection.png" width="100%" crossorigin></p></td>
<td><p align="center"><img src="https://github.com/Raphiiko/Oyasumi/raw/develop/docs/img/screenshot_battery_automations.png" width="100%" crossorigin></p></td>
</tr>
<tr>
<td><p align="center"><b></b></p></td>
<td><p align="center"><b>Status Automations</b></p></td>
<td><p align="center"><b>General Settings</b></p></td>
<td><p align="center"><b>Auto Accept Invite Requests</b></p></td>
<td><p align="center"><b></b></p></td>
</tr>
<tr>
<td><p align="center"></p></td>
<td><p align="center"><img src="https://github.com/Raphiiko/Oyasumi/raw/develop/docs/img/screenshot_status_automations.png" width="100%" crossorigin></p></td>
<td><p align="center"><img src="https://github.com/Raphiiko/Oyasumi/raw/develop/docs/img/screenshot_settings.png" width="100%" crossorigin></p></td>
<td><p align="center"><img src="https://github.com/Raphiiko/Oyasumi/raw/develop/docs/img/screenshot_auto_accept_invite_requests.png" width="100%" crossorigin></p></td>
<td><p align="center"></p></td>
</tr>
</table>
</p>

## Features
<table align="right">
Expand All @@ -57,6 +91,9 @@ Grab the latest installer over on the [Releases](https://github.com/Raphiiko/Oya
- Automatically change your status based on the number of players in your world:
<br>_Switch to blue when you are sleeping alone so your friends can join you, and switch to orange when there's enough people around!_
- :wrench: Turning off all trackers and/or controllers with a single click.
- :email: Automatically accept invite requests
- Automatically let friends in while you are asleep!
- Configure whose invite requests are accepted using a black- or whitelist.
- :zzz: Manage automations with a sleep mode in various ways:
- Detect falling asleep:
- When a controller or tracker battery percentage falls below a threshold
Expand All @@ -70,6 +107,7 @@ Grab the latest installer over on the [Releases](https://github.com/Raphiiko/Oya
- English
- Dutch (Nederlands)
- Japanese (日本語)
- Korean (한국어) (Community contribution by [Soumt](https://github.com/soumt-r))

If you would like to help out with adding more languages and/or missing translations, please check out [the wiki page on adding translations](https://github.com/Raphiiko/Oyasumi/wiki/Adding-Translations) for instructions on how to get started!

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/img/screenshot_friend_select.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "oyasumi",
"version": "1.2.2",
"version": "1.3.0",
"author": "Raphiiko",
"license": "MIT",
"type": "module",
Expand All @@ -26,13 +26,15 @@
"@angular/router": "^14.2.9",
"@fontsource/fira-code": "^4.5.12",
"@fontsource/noto-sans-jp": "^4.5.12",
"@fontsource/noto-sans-kr": "^4.5.12",
"@fontsource/poppins": "^4.5.10",
"@fortawesome/fontawesome-free": "^6.2.0",
"@ngx-translate/core": "^14.0.0",
"@ngx-translate/http-loader": "^7.0.0",
"@tauri-apps/api": "^1.2.0",
"cookie": "^0.5.0",
"flag-icons": "^6.6.6",
"fuse.js": "^6.6.2",
"lodash": "^4.17.21",
"marked": "^4.2.2",
"material-icons": "^1.12.1",
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 = "oyasumi-elevated-sidecar"
version = "1.2.2"
version = "1.3.0"
authors = ["Raphiiko"]
license = "MIT"
edition = "2021"
Expand Down
2 changes: 1 addition & 1 deletion src-shared/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "oyasumi-shared"
version = "1.2.2"
version = "1.3.0"
authors = ["Raphiiko"]
edition = "2021"
license = "MIT"
Expand Down
Loading

0 comments on commit 26a3015

Please sign in to comment.