Skip to content

Commit

Permalink
5.7.3 (#632)
Browse files Browse the repository at this point in the history
* Option to fade out chaperone when HMD goes below a configured height

Useful for setups in which you have a seat just outside your VR space,
or like to sit in the middle of your space for any amount of time. Will
fade out the boundaries to 0% opacity over 5 seconds, 5 seconds after
you sit down. Standing back up to the configured height will make them
pop back in immediately.

Can be found under Chaperone -> Additional Settings.

* Update format.sh to require clang-format v10

* Use fade distance instead of opacity, opacity inconsistently applied

* Bugfixes (#624)

* stop crashing on HMD Init Errors, as well as bypass force quit on all steamvr Init Errors

* add qtc clang to gitignore

* add app volume adjustment

* adjust app volume placement in menu

* fix type error

* Revert 1.26.3 chaperone adjust changes

* fix setting bug increment version

---------

Co-authored-by: Chelsea Jaggi <[email protected]>
  • Loading branch information
ykeara and feilen authored Jul 13, 2023
1 parent f095d2d commit 30343ce
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 3 deletions.
2 changes: 1 addition & 1 deletion build_scripts/compile_version_string.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.7.2-release
5.7.3-release
4 changes: 4 additions & 0 deletions src/settings/internal/settings_controller.h
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,10 @@ class SettingsController
SettingCategory::Playspace,
QtInfo{ "adjustChaperone3" },
true },
BoolSettingValue{ BoolSetting::PLAYSPACE_adjustChaperone4,
SettingCategory::Playspace,
QtInfo{ "adjustChaperone4" },
false },

BoolSettingValue{ BoolSetting::APPLICATION_disableVersionCheck,
SettingCategory::Application,
Expand Down
1 change: 1 addition & 0 deletions src/settings/settings.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ enum class BoolSetting
PLAYSPACE_adjustChaperone2,
PLAYSPACE_enableUncalMotion,
PLAYSPACE_adjustChaperone3,
PLAYSPACE_adjustChaperone4,

APPLICATION_disableVersionCheck,
APPLICATION_previousShutdownSafe,
Expand Down
7 changes: 5 additions & 2 deletions src/tabcontrollers/MoveCenterTabController.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -457,12 +457,12 @@ void MoveCenterTabController::setFrictionPercent( int value, bool notify )
bool MoveCenterTabController::adjustChaperone() const
{
return settings::getSetting(
settings::BoolSetting::PLAYSPACE_adjustChaperone3 );
settings::BoolSetting::PLAYSPACE_adjustChaperone4 );
}

void MoveCenterTabController::setAdjustChaperone( bool value, bool notify )
{
settings::setSetting( settings::BoolSetting::PLAYSPACE_adjustChaperone3,
settings::setSetting( settings::BoolSetting::PLAYSPACE_adjustChaperone4,
value );

if ( notify )
Expand Down Expand Up @@ -2771,6 +2771,9 @@ void MoveCenterTabController::updateSpace( bool forceUpdate )
// behavior
// as of SVR 1.26.3 instead of 2x offset we have 1x offset and universe
// centerS
// as of SVR 1.26.4 1.26.3 changes are reverted as Such Adjust Chaperone
// Should Not Be Needed We Will leave in Adjust Chaperone at this point but
// make sure it defaults to off

if ( adjustChaperone() )
{
Expand Down

0 comments on commit 30343ce

Please sign in to comment.