Skip to content

Commit 30343ce

Browse files
ykearafeilen
andauthored
5.7.3 (#632)
* 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 <feilen1000@gmail.com>
1 parent f095d2d commit 30343ce

4 files changed

Lines changed: 11 additions & 3 deletions

File tree

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.7.2-release
1+
5.7.3-release

src/settings/internal/settings_controller.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,10 @@ class SettingsController
289289
SettingCategory::Playspace,
290290
QtInfo{ "adjustChaperone3" },
291291
true },
292+
BoolSettingValue{ BoolSetting::PLAYSPACE_adjustChaperone4,
293+
SettingCategory::Playspace,
294+
QtInfo{ "adjustChaperone4" },
295+
false },
292296

293297
BoolSettingValue{ BoolSetting::APPLICATION_disableVersionCheck,
294298
SettingCategory::Application,

src/settings/settings.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ enum class BoolSetting
2525
PLAYSPACE_adjustChaperone2,
2626
PLAYSPACE_enableUncalMotion,
2727
PLAYSPACE_adjustChaperone3,
28+
PLAYSPACE_adjustChaperone4,
2829

2930
APPLICATION_disableVersionCheck,
3031
APPLICATION_previousShutdownSafe,

src/tabcontrollers/MoveCenterTabController.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -457,12 +457,12 @@ void MoveCenterTabController::setFrictionPercent( int value, bool notify )
457457
bool MoveCenterTabController::adjustChaperone() const
458458
{
459459
return settings::getSetting(
460-
settings::BoolSetting::PLAYSPACE_adjustChaperone3 );
460+
settings::BoolSetting::PLAYSPACE_adjustChaperone4 );
461461
}
462462

463463
void MoveCenterTabController::setAdjustChaperone( bool value, bool notify )
464464
{
465-
settings::setSetting( settings::BoolSetting::PLAYSPACE_adjustChaperone3,
465+
settings::setSetting( settings::BoolSetting::PLAYSPACE_adjustChaperone4,
466466
value );
467467

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

27752778
if ( adjustChaperone() )
27762779
{

0 commit comments

Comments
 (0)