update ovr to 1.8.19, audio key update (#314)

* added get/setters for override keys * adjusted QML for new overrides and proper initialized * replaced work-around key with proper key * removed workaround from header * updated OVR to 1.8.19 * changed other new audio variables * temporarily disabled audio profiles as required api keys are questionable use-ability atm
2019-11-09 10:16:14 -06:00
parent 05c12cd4a0
commit 4a98ed436e
24 changed files with 734 additions and 568 deletions
@@ -14,7 +14,6 @@ MyStackViewPage {

    content: ColumnLayout {
        spacing: 24
-
        AudioDeviceSelector {
        }

@@ -12,13 +12,24 @@ RowLayout {
    property alias deviceIndex: selector.currentIndex
    MyText {
        text: deviceText
-        Layout.preferredWidth: 260
+        Layout.preferredWidth: 200
    }
+
+    MyToggleButton {
+        id: playbackOverrideToggle
+        Layout.preferredWidth: 250
+        text: "Toggle Override"
+        onClicked: {
+            AudioTabController.setPlaybackOverride(this.checked, false)
+        }
+        onCheckedChanged: {
+            selector.enabled = this.checked
+        }
+    }
+
    MyComboBox {
        id: selector
-        Layout.maximumWidth: 850
-        Layout.minimumWidth: 850
-        Layout.preferredWidth: 850
+        Layout.fillWidth: true
        onActivated: {
            if (deviceIndex >= 0) {
                AudioTabController.setPlaybackDeviceIndex(deviceIndex)
@@ -28,6 +39,7 @@ RowLayout {
    Component.onCompleted: {
        audioPlaybackNameCombo.devices = getAudioDeviceList()
        setShownAudioDevice(AudioTabController.playbackDeviceIndex)
+        playbackOverrideToggle.checked = AudioTabController.playbackOverride
    }

    Connections {
@@ -39,6 +51,9 @@ RowLayout {
            audioPlaybackNameCombo.devices = getAudioDeviceList()
            setShownAudioDevice(AudioTabController.playbackDeviceIndex)
        }
+        onPlaybackOverrideChanged: {
+            playbackOverrideToggle.value = AudioTabController.playbackOverride
+        }
    }
    function getAudioDeviceList() {
        var devices = []
@@ -15,13 +15,22 @@ RowLayout {
    property alias deviceIndex: selector.currentIndex
    MyText {
        text: deviceText
-        Layout.preferredWidth: 260
+        Layout.preferredWidth: 200
+    }
+    MyToggleButton {
+        id: recordingOverrideToggle
+        Layout.preferredWidth: 250
+        text: "Toggle Override"
+        onClicked: {
+            AudioTabController.setRecordingOverride(this.checked, false)
+        }
+        onCheckedChanged: {
+            selector.enabled = this.checked
+        }
    }
    MyComboBox {
        id: selector
-        Layout.maximumWidth: 850
-        Layout.minimumWidth: 850
-        Layout.preferredWidth: 850
+        Layout.fillWidth: true
        onActivated: {
            if (deviceIndex >= 0) {
                AudioTabController.setMicDeviceIndex(currentIndex)
@@ -50,6 +59,7 @@ RowLayout {
    Component.onCompleted: {
        devices = getAudioDeviceList()
        setShownAudioDevice(AudioTabController.micDeviceIndex)
+        recordingOverrideToggle.checked = AudioTabController.recordingOverride
    }
    Connections {
        target: AudioTabController
@@ -60,5 +70,8 @@ RowLayout {
            devices = getAudioDeviceList()
            setShownAudioDevice(AudioTabController.micDeviceIndex)
        }
+        onRecordingOverrideChanged: {
+            recordingOverrideToggle.value = AudioTabController.recordingOverride
+        }
    }
 }
@@ -58,12 +58,6 @@ MyDialogOkCancelPopup {
            }
        }
    }
-    Connections {
-        target: AudioTabController
-        onAudioProfileDefaultChanged: {
-            defaultProfileToggle = AudioTabController.audioProfileDefault
-        }
-    }

    function openPopup() {
        audioNewProfileName.text = ""
@@ -5,6 +5,7 @@ import ovras.advsettings 1.0
 import "../../common"
 import "../dialog_boxes"

+//Audio Profiles temporarily disabled.
 ColumnLayout {
    AudioMessageDialog {
        id: audioMessageDialog
@@ -30,6 +31,7 @@ ColumnLayout {
            id: audioProfileComboBox
            Layout.preferredWidth: 250
            model: [""]
+            enabled: false
            onCurrentIndexChanged: {
                if (currentIndex > 0) {
                    audioApplyProfileButton.enabled = true
@@ -43,7 +45,7 @@ ColumnLayout {

        MyPushButton {
            id: audioApplyProfileButton
-            enabled: true
+            enabled: false
            Layout.preferredWidth: 150
            text: "Apply"
            onClicked: {
@@ -63,7 +65,7 @@ ColumnLayout {

        MyPushButton {
            id: audioDeleteProfileButton
-            enabled: true
+            enabled: false
            Layout.preferredWidth: 200
            text: "Delete Profile"
            onClicked: {
@@ -74,6 +76,7 @@ ColumnLayout {
            }
        }
        MyPushButton {
+            enabled: false
            Layout.preferredWidth: 200
            text: "New Profile"
            onClicked: {
@@ -86,7 +89,7 @@ ColumnLayout {
        }
    }
    Component.onCompleted: {
-        reloadAudioProfiles()
+        //reloadAudioProfiles()
    }
    Connections {
        target: AudioTabController
@@ -22,20 +22,20 @@ void AudioTabController::initStage1()
    audioManager->init( this );
    m_k_audioSettingsUpdateCounter
        = utils::adjustUpdateRate( k_audioSettingsUpdateCounter );
+    initOverride();
    m_playbackDevices = audioManager->getPlaybackDevices();
    m_recordingDevices = audioManager->getRecordingDevices();
    findPlaybackDeviceIndex( audioManager->getPlaybackDevId(), false );
    char deviceId[1024];
-    vr::VRSettings()->GetString(
-        vr::k_pch_audio_Section,
-        k_pch_audio_OnPlaybackMirrorDevice_String_WORKAROUND,
-        deviceId,
-        1024,
-        &vrSettingsError );
+    vr::VRSettings()->GetString( vr::k_pch_audio_Section,
+                                 vr::k_pch_audio_PlaybackMirrorDevice_String,
+                                 deviceId,
+                                 1024,
+                                 &vrSettingsError );
    if ( vrSettingsError != vr::VRSettingsError_None )
    {
        LOG( WARNING ) << "Could not read \""
-                       << k_pch_audio_OnPlaybackMirrorDevice_String_WORKAROUND
+                       << vr::k_pch_audio_PlaybackMirrorDevice_String
                       << "\" setting: "
                       << vr::VRSettings()->GetSettingsErrorNameFromEnum(
                              vrSettingsError );
@@ -53,7 +53,8 @@ void AudioTabController::initStage1()
    m_micMuted = audioManager->getMicMuted();
    reloadPttProfiles();
    reloadPttConfig();
-    reloadAudioProfiles();
+    // Temporarily disabled audio profiles for 1.8.19 until api is clear.
+    // reloadAudioProfiles();
    reloadAudioSettings();

    eventLoopTick();
@@ -173,18 +174,17 @@ void AudioTabController::eventLoopTick()
        char mirrorDeviceId[1024];
        vr::VRSettings()->GetString(
            vr::k_pch_audio_Section,
-            k_pch_audio_OnPlaybackMirrorDevice_String_WORKAROUND,
+            vr::k_pch_audio_PlaybackMirrorDevice_String,
            mirrorDeviceId,
            1024,
            &vrSettingsError );
        if ( vrSettingsError != vr::VRSettingsError_None )
        {
-            LOG( WARNING )
-                << "Could not read \""
-                << k_pch_audio_OnPlaybackMirrorDevice_String_WORKAROUND
-                << "\" setting: "
-                << vr::VRSettings()->GetSettingsErrorNameFromEnum(
-                       vrSettingsError );
+            LOG( WARNING ) << "Could not read \""
+                           << vr::k_pch_audio_PlaybackMirrorDevice_String
+                           << "\" setting: "
+                           << vr::VRSettings()->GetSettingsErrorNameFromEnum(
+                                  vrSettingsError );
        }
        if ( lastMirrorDevId.compare( mirrorDeviceId ) != 0 )
        {
@@ -526,13 +526,13 @@ void AudioTabController::setMirrorDeviceIndex( int index, bool notify )
            vr::EVRSettingsError vrSettingsError;
            vr::VRSettings()->RemoveKeyInSection(
                vr::k_pch_audio_Section,
-                k_pch_audio_OnPlaybackMirrorDevice_String_WORKAROUND,
+                vr::k_pch_audio_PlaybackMirrorDevice_String,
                &vrSettingsError );
            if ( vrSettingsError != vr::VRSettingsError_None )
            {
                LOG( WARNING )
                    << "Could not remove \""
-                    << k_pch_audio_OnPlaybackMirrorDevice_String_WORKAROUND
+                    << vr::k_pch_audio_PlaybackMirrorDevice_String
                    << "\" setting: "
                    << vr::VRSettings()->GetSettingsErrorNameFromEnum(
                           vrSettingsError );
@@ -551,14 +551,14 @@ void AudioTabController::setMirrorDeviceIndex( int index, bool notify )
            vr::EVRSettingsError vrSettingsError;
            vr::VRSettings()->SetString(
                vr::k_pch_audio_Section,
-                k_pch_audio_OnPlaybackMirrorDevice_String_WORKAROUND,
+                vr::k_pch_audio_PlaybackMirrorDevice_String,
                m_playbackDevices[static_cast<size_t>( index )].first.c_str(),
                &vrSettingsError );
            if ( vrSettingsError != vr::VRSettingsError_None )
            {
                LOG( WARNING )
                    << "Could not write \""
-                    << k_pch_audio_OnPlaybackMirrorDevice_String_WORKAROUND
+                    << vr::k_pch_audio_PlaybackMirrorDevice_String
                    << "\" setting: "
                    << vr::VRSettings()->GetSettingsErrorNameFromEnum(
                           vrSettingsError );
@@ -938,13 +938,14 @@ void AudioTabController::deleteAudioProfile( unsigned index )
            vr::EVRSettingsError vrSettingsError;
            vr::VRSettings()->RemoveKeyInSection(
                vr::k_pch_audio_Section,
-                vr::k_pch_audio_OnPlaybackDevice_String,
+                vr::k_pch_audio_PlaybackDeviceOverrideName_String,
                &vrSettingsError );
            if ( vrSettingsError != vr::VRSettingsError_None )
            {
                LOG( WARNING )
                    << "Could not remove \""
-                    << vr::k_pch_audio_OnPlaybackDevice_String << "\" setting: "
+                    << vr::k_pch_audio_PlaybackDeviceOverrideName_String
+                    << "\" setting: "
                    << vr::VRSettings()->GetSettingsErrorNameFromEnum(
                           vrSettingsError );
            }
@@ -955,13 +956,14 @@ void AudioTabController::deleteAudioProfile( unsigned index )

            vr::VRSettings()->RemoveKeyInSection(
                vr::k_pch_audio_Section,
-                vr::k_pch_audio_OnRecordDevice_String,
+                vr::k_pch_audio_RecordingDeviceOverrideName_String,
                &vrSettingsError );
            if ( vrSettingsError != vr::VRSettingsError_None )
            {
                LOG( WARNING )
                    << "Could not remove \""
-                    << vr::k_pch_audio_OnRecordDevice_String << "\" setting: "
+                    << vr::k_pch_audio_RecordingDeviceOverrideName_String
+                    << "\" setting: "
                    << vr::VRSettings()->GetSettingsErrorNameFromEnum(
                           vrSettingsError );
            }
@@ -977,6 +979,99 @@ void AudioTabController::deleteAudioProfile( unsigned index )
    }
 }

+// 1.8.19 changes
+//********************
+
+bool AudioTabController::playbackOverride() const
+{
+    return m_isPlaybackOverride;
+}
+
+bool AudioTabController::recordingOverride() const
+{
+    return m_isRecordingOverride;
+}
+void AudioTabController::setPlaybackOverride( bool value, bool notify )
+{
+    if ( value != m_isPlaybackOverride )
+    {
+        m_isPlaybackOverride = value;
+        vr::EVRSettingsError vrSettingsError;
+        vr::VRSettings()->SetBool(
+            vr::k_pch_audio_Section,
+            vr::k_pch_audio_EnablePlaybackDeviceOverride_Bool,
+            m_isPlaybackOverride,
+            &vrSettingsError );
+        if ( vrSettingsError != vr::VRSettingsError_None )
+        {
+            LOG( ERROR ) << "Could not set playback override setting: "
+                         << vr::VRSettings()->GetSettingsErrorNameFromEnum(
+                                vrSettingsError );
+        }
+        if ( notify )
+        {
+            emit playbackOverrideChanged();
+        }
+    }
+}
+void AudioTabController::setRecordingOverride( bool value, bool notify )
+{
+    if ( value != m_isRecordingOverride )
+    {
+        m_isRecordingOverride = value;
+        vr::EVRSettingsError vrSettingsError;
+        vr::VRSettings()->SetBool(
+            vr::k_pch_audio_Section,
+            vr::k_pch_audio_EnableRecordingDeviceOverride_Bool,
+            m_isRecordingOverride,
+            &vrSettingsError );
+        if ( vrSettingsError != vr::VRSettingsError_None )
+        {
+            LOG( ERROR ) << "Could not set recording override setting: "
+                         << vr::VRSettings()->GetSettingsErrorNameFromEnum(
+                                vrSettingsError );
+        }
+        if ( notify )
+        {
+            emit playbackOverrideChanged();
+        }
+    }
+}
+
+void AudioTabController::initOverride()
+{
+    vr::EVRSettingsError vrSettingsError;
+    auto temp = vr::VRSettings()->GetBool(
+        vr::k_pch_audio_Section,
+        vr::k_pch_audio_EnableRecordingDeviceOverride_Bool,
+        &vrSettingsError );
+    if ( vrSettingsError != vr::VRSettingsError_None )
+    {
+        LOG( ERROR ) << "Could not get recording override setting: "
+                     << vr::VRSettings()->GetSettingsErrorNameFromEnum(
+                            vrSettingsError );
+    }
+    else
+    {
+        setRecordingOverride( temp );
+    }
+    temp = vr::VRSettings()->GetBool(
+        vr::k_pch_audio_Section,
+        vr::k_pch_audio_EnablePlaybackDeviceOverride_Bool,
+        &vrSettingsError );
+    if ( vrSettingsError != vr::VRSettingsError_None )
+    {
+        LOG( ERROR ) << "Could not get playback override setting: "
+                     << vr::VRSettings()->GetSettingsErrorNameFromEnum(
+                            vrSettingsError );
+    }
+    else
+    {
+        setPlaybackOverride( temp );
+    }
+}
+//********************
+
 unsigned AudioTabController::getAudioProfileCount()
 {
    return static_cast<unsigned int>( audioProfiles.size() );
@@ -1055,13 +1150,13 @@ void AudioTabController::setDefaultPlayback( int index, bool notify )
    vr::EVRSettingsError vrSettingsError;
    vr::VRSettings()->SetString(
        vr::k_pch_audio_Section,
-        vr::k_pch_audio_OnPlaybackDevice_String,
+        vr::k_pch_audio_PlaybackDeviceOverrideName_String,
        m_playbackDevices[static_cast<size_t>( index )].first.c_str(),
        &vrSettingsError );
    if ( vrSettingsError != vr::VRSettingsError_None )
    {
        LOG( WARNING ) << "Could not write \""
-                       << vr::k_pch_audio_OnPlaybackDevice_String
+                       << vr::k_pch_audio_PlaybackDeviceOverrideName_String
                       << "\" setting: "
                       << vr::VRSettings()->GetSettingsErrorNameFromEnum(
                              vrSettingsError );
@@ -1079,13 +1174,13 @@ void AudioTabController::setDefaultMic( int index, bool notify )
    vr::EVRSettingsError vrSettingsError;
    vr::VRSettings()->SetString(
        vr::k_pch_audio_Section,
-        vr::k_pch_audio_OnRecordDevice_String,
+        vr::k_pch_audio_RecordingDeviceOverrideName_String,
        m_recordingDevices[static_cast<size_t>( index )].first.c_str(),
        &vrSettingsError );
    if ( vrSettingsError != vr::VRSettingsError_None )
    {
        LOG( WARNING ) << "Could not write \""
-                       << vr::k_pch_audio_OnRecordDevice_String
+                       << vr::k_pch_audio_RecordingDeviceOverrideName_String
                       << "\" setting: "
                       << vr::VRSettings()->GetSettingsErrorNameFromEnum(
                              vrSettingsError );
@@ -1105,16 +1200,15 @@ void AudioTabController::setDefaultMirror( int index, bool notify )
        vr::EVRSettingsError vrSettingsError;
        vr::VRSettings()->RemoveKeyInSection(
            vr::k_pch_audio_Section,
-            k_pch_audio_OnPlaybackMirrorDevice_String_WORKAROUND,
+            vr::k_pch_audio_PlaybackMirrorDevice_String,
            &vrSettingsError );
        if ( vrSettingsError != vr::VRSettingsError_None )
        {
-            LOG( WARNING )
-                << "Could not remove \""
-                << k_pch_audio_OnPlaybackMirrorDevice_String_WORKAROUND
-                << "\" setting: "
-                << vr::VRSettings()->GetSettingsErrorNameFromEnum(
-                       vrSettingsError );
+            LOG( WARNING ) << "Could not remove \""
+                           << vr::k_pch_audio_PlaybackMirrorDevice_String
+                           << "\" setting: "
+                           << vr::VRSettings()->GetSettingsErrorNameFromEnum(
+                                  vrSettingsError );
        }
        else
        {
@@ -1127,17 +1221,16 @@ void AudioTabController::setDefaultMirror( int index, bool notify )
        vr::EVRSettingsError vrSettingsError;
        vr::VRSettings()->SetString(
            vr::k_pch_audio_Section,
-            k_pch_audio_OnPlaybackMirrorDevice_String_WORKAROUND,
+            vr::k_pch_audio_PlaybackMirrorDevice_String,
            m_playbackDevices[static_cast<size_t>( index )].first.c_str(),
            &vrSettingsError );
        if ( vrSettingsError != vr::VRSettingsError_None )
        {
-            LOG( WARNING )
-                << "Could not write \""
-                << k_pch_audio_OnPlaybackMirrorDevice_String_WORKAROUND
-                << "\" setting: "
-                << vr::VRSettings()->GetSettingsErrorNameFromEnum(
-                       vrSettingsError );
+            LOG( WARNING ) << "Could not write \""
+                           << vr::k_pch_audio_PlaybackMirrorDevice_String
+                           << "\" setting: "
+                           << vr::VRSettings()->GetSettingsErrorNameFromEnum(
+                                  vrSettingsError );
        }
        else
        {
@@ -11,9 +11,6 @@ class QQuickWindow;
 namespace advsettings
 {
 // forward declaration
-// the following key used to be "onPlaybackMirrorDevice" using a workaround:
-static const char* const k_pch_audio_OnPlaybackMirrorDevice_String_WORKAROUND
-    = "playbackMirrorDevice";
 class OverlayController;

 struct AudioProfile
@@ -56,6 +53,10 @@ class AudioTabController : public PttController
                    NOTIFY micReversePttChanged )
    Q_PROPERTY( bool audioProfileDefault READ audioProfileDefault WRITE
                    setAudioProfileDefault NOTIFY audioProfileDefaultChanged )
+    Q_PROPERTY( bool playbackOverride READ playbackOverride WRITE
+                    setPlaybackOverride NOTIFY playbackOverrideChanged )
+    Q_PROPERTY( bool recordingOverride READ recordingOverride WRITE
+                    setRecordingOverride NOTIFY recordingOverrideChanged )

 private:
    vr::VROverlayHandle_t m_ulNotificationOverlayHandle
@@ -73,6 +74,8 @@ private:
    bool m_micProximitySensorCanMute = false;
    bool m_micReversePtt = false;
    bool m_isDefaultAudioProfile = false;
+    bool m_isPlaybackOverride = false;
+    bool m_isRecordingOverride = false;

    unsigned int m_k_audioSettingsUpdateCounter = 90;

@@ -117,6 +120,8 @@ private:
    void setDefaultMirror( int index, bool notify = true );
    void setDefaultMic( int index, bool notify = true );

+    void initOverride();
+
    std::vector<AudioProfile> audioProfiles;

 public:
@@ -142,6 +147,8 @@ public:
    bool micProximitySensorCanMute() const;
    bool micReversePtt() const;
    bool audioProfileDefault() const;
+    bool playbackOverride() const;
+    bool recordingOverride() const;

    void reloadAudioProfiles();
    void saveAudioProfiles();
@@ -180,6 +187,9 @@ public slots:
    void applyAudioProfile( unsigned index );
    void deleteAudioProfile( unsigned index );

+    void setPlaybackOverride( bool value, bool notify = true );
+    void setRecordingOverride( bool value, bool notify = true );
+
    void setAudioProfileDefault( bool value, bool notify = true );

 signals:
@@ -202,6 +212,9 @@ signals:
    void audioProfileAdded();
    void audioProfileDefaultChanged( bool value );

+    void playbackOverrideChanged();
+    void recordingOverrideChanged();
+
    void defaultProfileDisplay();
 };
 } // namespace advsettings
@@ -15,8 +15,8 @@
 namespace vr
 {
 	static const uint32_t k_nSteamVRVersionMajor = 1;
-	static const uint32_t k_nSteamVRVersionMinor = 6;
-	static const uint32_t k_nSteamVRVersionBuild = 10;
+	static const uint32_t k_nSteamVRVersionMinor = 8;
+	static const uint32_t k_nSteamVRVersionBuild = 19;
 } // namespace vr

 // vrtypes.h
@@ -432,6 +432,7 @@ enum ETrackedDeviceProperty
 	Prop_ExpectedControllerType_String			= 2074,
 	Prop_HmdTrackingStyle_Int32					= 2075, // one of EHmdTrackingStyle
 	Prop_DriverProvidedChaperoneVisibility_Bool = 2076,
+	Prop_HmdProvidesDisplaySettings_Bool		= 2077,


 	Prop_DisplayAvailableFrameRates_Float_Array = 2080, // populated by compositor from actual EDID list when available from GPU driver
@@ -439,7 +440,10 @@ enum ETrackedDeviceProperty
 	Prop_DisplayColorMultLeft_Vector3			= 2082,
 	Prop_DisplayColorMultRight_Vector3			= 2083,

-	Prop_DashboardLayoutPathName_String			= 2090,
+	Prop_DashboardLayoutPathName_String 		= 2090,
+	Prop_DashboardScale_Float 					= 2091,
+	Prop_IpdUIRangeMinMeters_Float 				= 2100,
+	Prop_IpdUIRangeMaxMeters_Float 				= 2101,

 	// Driver requested mura correction properties
 	Prop_DriverRequestedMuraCorrectionMode_Int32		= 2200,
@@ -452,6 +456,10 @@ enum ETrackedDeviceProperty
 	Prop_DriverRequestedMuraFeather_OuterTop_Int32		= 2207,
 	Prop_DriverRequestedMuraFeather_OuterBottom_Int32	= 2208,

+	Prop_Audio_DefaultPlaybackDeviceId_String		= 2300,
+	Prop_Audio_DefaultRecordingDeviceId_String		= 2301,
+	Prop_Audio_DefaultPlaybackDeviceVolume_Float	= 2302,
+
 	// Properties that are unique to TrackedDeviceClass_Controller
 	Prop_AttachedDeviceId_String				= 3000,
 	Prop_SupportedButtons_Uint64				= 3001,
@@ -483,11 +491,13 @@ enum ETrackedDeviceProperty
 	Prop_NamedIconPathDeviceNotReady_String			= 5006, // {driver}/icons/icon_filename - PNG for static icon, or GIF for animation, 50x32 for headsets and 32x32 for others
 	Prop_NamedIconPathDeviceStandby_String			= 5007, // {driver}/icons/icon_filename - PNG for static icon, or GIF for animation, 50x32 for headsets and 32x32 for others
 	Prop_NamedIconPathDeviceAlertLow_String			= 5008, // {driver}/icons/icon_filename - PNG for static icon, or GIF for animation, 50x32 for headsets and 32x32 for others
+	Prop_NamedIconPathDeviceStandbyAlert_String		= 5009, // {driver}/icons/icon_filename - PNG for static icon, or GIF for animation, 50x32 for headsets and 32x32 for others

 	// Properties that are used by helpers, but are opaque to applications
 	Prop_DisplayHiddenArea_Binary_Start				= 5100,
 	Prop_DisplayHiddenArea_Binary_End				= 5150,
 	Prop_ParentContainer							= 5151,
+	Prop_OverrideContainer_Uint64					= 5152,

 	// Properties that are unique to drivers
 	Prop_UserConfigPath_String					= 6000,
@@ -693,18 +703,20 @@ enum EVREventType

 	VREvent_InputFocusCaptured			= 400, // data is process DEPRECATED
 	VREvent_InputFocusReleased			= 401, // data is process DEPRECATED
-	VREvent_SceneFocusLost				= 402, // data is process
-	VREvent_SceneFocusGained			= 403, // data is process
+	// VREvent_SceneFocusLost			= 402, // data is process
+	// VREvent_SceneFocusGained			= 403, // data is process
 	VREvent_SceneApplicationChanged		= 404, // data is process - The App actually drawing the scene changed (usually to or from the compositor)
 	VREvent_SceneFocusChanged			= 405, // data is process - New app got access to draw the scene
 	VREvent_InputFocusChanged			= 406, // data is process
-	VREvent_SceneApplicationSecondaryRenderingStarted = 407, // data is process
+	// VREvent_SceneApplicationSecondaryRenderingStarted = 407,
 	VREvent_SceneApplicationUsingWrongGraphicsAdapter = 408, // data is process
 	VREvent_ActionBindingReloaded		 = 409, // data is process - The App that action binds reloaded for

 	VREvent_HideRenderModels			= 410, // Sent to the scene application to request hiding render models temporarily
 	VREvent_ShowRenderModels			= 411, // Sent to the scene application to request restoring render model visibility

+	VREvent_SceneApplicationStateChanged = 412, // No data; but query VRApplications()->GetSceneApplicationState();
+
 	VREvent_ConsoleOpened               = 420,
 	VREvent_ConsoleClosed               = 421,

@@ -749,7 +761,7 @@ enum EVREventType

 	VREvent_Quit							= 700, // data is process
 	VREvent_ProcessQuit						= 701, // data is process
-	VREvent_QuitAborted_UserPrompt			= 702, // data is process
+	//VREvent_QuitAborted_UserPrompt			= 702, // data is process
 	VREvent_QuitAcknowledged				= 703, // data is process
 	VREvent_DriverRequestedQuit				= 704, // The driver has requested that SteamVR shut down
 	VREvent_RestartRequested				= 705, // A driver or other component wants the user to restart SteamVR
@@ -798,17 +810,17 @@ enum EVREventType
 	VREvent_KeyboardCharInput				= 1201,
 	VREvent_KeyboardDone					= 1202, // Sent when DONE button clicked on keyboard

-	VREvent_ApplicationTransitionStarted		= 1300,
-	VREvent_ApplicationTransitionAborted		= 1301,
-	VREvent_ApplicationTransitionNewAppStarted	= 1302,
+	//VREvent_ApplicationTransitionStarted		= 1300,
+	//VREvent_ApplicationTransitionAborted		= 1301,
+	//VREvent_ApplicationTransitionNewAppStarted	= 1302,
 	VREvent_ApplicationListUpdated				= 1303,
 	VREvent_ApplicationMimeTypeLoad				= 1304,
-	VREvent_ApplicationTransitionNewAppLaunchComplete = 1305,
+	// VREvent_ApplicationTransitionNewAppLaunchComplete = 1305,
 	VREvent_ProcessConnected					= 1306,
 	VREvent_ProcessDisconnected					= 1307,

-	VREvent_Compositor_MirrorWindowShown		= 1400,
-	VREvent_Compositor_MirrorWindowHidden		= 1401,
+	//VREvent_Compositor_MirrorWindowShown		= 1400, // DEPRECATED
+	//VREvent_Compositor_MirrorWindowHidden		= 1401, // DEPRECATED
 	VREvent_Compositor_ChaperoneBoundsShown		= 1410,
 	VREvent_Compositor_ChaperoneBoundsHidden	= 1411,
 	VREvent_Compositor_DisplayDisconnected		= 1412,
@@ -817,6 +829,7 @@ enum EVREventType
 	VREvent_Compositor_ApplicationNotResponding	= 1415,
 	VREvent_Compositor_ApplicationResumed		= 1416,
 	VREvent_Compositor_OutOfVideoMemory			= 1417,
+	VREvent_Compositor_DisplayModeNotSupported	= 1418, // k_pch_SteamVR_PreferredRefreshRate

 	VREvent_TrackedCamera_StartVideoStream  = 1500,
 	VREvent_TrackedCamera_StopVideoStream   = 1501,
@@ -847,6 +860,9 @@ enum EVREventType

 	VREvent_SystemReport_Started			= 1900, // user or system initiated generation of a system report. broadcast

+	VREvent_Monitor_ShowHeadsetView			= 2000, // data is process
+	VREvent_Monitor_HideHeadsetView			= 2001, // data is process
+
 	// Vendors are free to expose private events in this reserved region
 	VREvent_VendorSpecific_Reserved_Start	= 10000,
 	VREvent_VendorSpecific_Reserved_End		= 19999,
@@ -865,6 +881,7 @@ enum EDeviceActivityLevel
 	k_EDeviceActivityLevel_UserInteraction = 1,				// Activity (movement or prox sensor) is happening now	
 	k_EDeviceActivityLevel_UserInteraction_Timeout = 2,		// No activity for the last 0.5 seconds
 	k_EDeviceActivityLevel_Standby = 3,						// Idle for at least 5 seconds (configurable in Settings -> Power Management)
+	k_EDeviceActivityLevel_Idle_Timeout = 4,
 };


@@ -1531,6 +1548,7 @@ enum EVRInitError
 	VRInitError_Init_AlreadyRunning					= 143,
 	VRInitError_Init_FailedForVrMonitor				= 144,
 	VRInitError_Init_PropertyManagerInitFailed		= 145,
+	VRInitError_Init_WebServerFailed				= 146,

 	VRInitError_Driver_Failed						= 200,
 	VRInitError_Driver_Unknown						= 201,
@@ -1546,6 +1564,7 @@ enum EVRInitError
 	VRInitError_Driver_HmdDriverIdOutOfBounds		= 211,
 	VRInitError_Driver_HmdDisplayMirrored			= 212,
 	VRInitError_Driver_HmdDisplayNotFoundLaptop		= 213,
+	// Never make error 259 because we return it from main and it would conflict with STILL_ACTIVE

 	VRInitError_IPC_ServerInitFailed				= 300,
 	VRInitError_IPC_ConnectFailed					= 301,
@@ -1646,6 +1665,7 @@ enum EVRInitError
 	VRInitError_Compositor_CreateLastFrameRenderTexture							= 484,
 	VRInitError_Compositor_CreateMirrorOverlay									= 485,
 	VRInitError_Compositor_FailedToCreateVirtualDisplayBackbuffer				= 486,
+	VRInitError_Compositor_DisplayModeNotSupported								= 487,

 	VRInitError_VendorSpecific_UnableToConnectToOculusRuntime		= 1000,
 	VRInitError_VendorSpecific_WindowsNotInDevMode					= 1001,
@@ -1747,7 +1767,7 @@ struct CameraVideoStreamFrameHeader_t

 	uint32_t nFrameSequence;

-	TrackedDevicePose_t standingTrackedDevicePose;
+	TrackedDevicePose_t trackedDevicePose;
 	
 	uint64_t ulFrameExposureTime;						// mid-point of the exposure of the image in host system ticks
 };
@@ -2211,11 +2231,6 @@ public:
 	* This extends the timeout until the process is killed. */
 	virtual void AcknowledgeQuit_Exiting() = 0;

-	/** Call this to tell the system that the user is being prompted to save data. This
-	* halts the timeout and dismisses the dashboard (if it was up). Applications should be sure to actually 
-	* prompt the user to save and then exit afterward, otherwise the user will be left in a confusing state. */
-	virtual void AcknowledgeQuit_UserPrompt() = 0;
-
 	// -------------------------------------
 	// App container sandbox methods
 	// -------------------------------------
@@ -2238,7 +2253,7 @@ public:

 };

-static const char * const IVRSystem_Version = "IVRSystem_020";
+static const char * const IVRSystem_Version = "IVRSystem_021";

 }

@@ -2300,19 +2315,18 @@ namespace vr
 		VRApplicationProperty_IsInstanced_Bool			= 62,
 		VRApplicationProperty_IsInternal_Bool			= 63,
 		VRApplicationProperty_WantsCompositorPauseInStandby_Bool = 64,
+		VRApplicationProperty_IsHidden_Bool				= 65,

 		VRApplicationProperty_LastLaunchTime_Uint64		= 70,
 	};

-	/** These are states the scene application startup process will go through. */
-	enum EVRApplicationTransitionState
+	enum EVRSceneApplicationState
 	{
-		VRApplicationTransition_None = 0,
-
-		VRApplicationTransition_OldAppQuitSent = 10,
-		VRApplicationTransition_WaitingForExternalLaunch = 11,
-		
-		VRApplicationTransition_NewAppLaunched = 20,
+		EVRSceneApplicationState_None						      = 0, // Scene Application is not running
+		EVRSceneApplicationState_Starting					      = 1, // Scene Application is starting
+		EVRSceneApplicationState_Quitting					      = 2, // Scene Application is quitting
+		EVRSceneApplicationState_Running						  = 3, // Scene Application is running, and submitting frames, a custom skybox, or a visible overlay
+		EVRSceneApplicationState_Waiting						  = 4, // Scene Application is running, but not drawing anything
 	};

 	struct AppOverrideKeys_t
@@ -2422,7 +2436,7 @@ namespace vr
 		virtual EVRApplicationError GetStartingApplication( VR_OUT_STRING() char *pchAppKeyBuffer, uint32_t unAppKeyBufferLen ) = 0;

 		/** Returns the application transition state */
-		virtual EVRApplicationTransitionState GetTransitionState() = 0;
+		virtual EVRSceneApplicationState GetSceneApplicationState() = 0;

 		/** Returns errors that would prevent the specified application from launching immediately. Calling this function will
 		* cause the current scene application to quit, so only call it when you are actually about to launch something else.
@@ -2436,10 +2450,7 @@ namespace vr
 		virtual EVRApplicationError PerformApplicationPrelaunchCheck( const char *pchAppKey ) = 0;

 		/** Returns a string for an application transition state */
-		virtual const char *GetApplicationsTransitionStateNameFromEnum( EVRApplicationTransitionState state ) = 0;
-
-		/** Returns true if the outgoing scene app has requested a save prompt before exiting */
-		virtual bool IsQuitUserPromptRequested() = 0;
+		virtual const char *GetSceneApplicationStateNameFromEnum( EVRSceneApplicationState state ) = 0;

 		/** Starts a subprocess within the calling application. This
 		* suppresses all application transition UI and automatically identifies the new executable 
@@ -2454,7 +2465,7 @@ namespace vr
 		virtual uint32_t GetCurrentSceneProcessId() = 0;
 	};

-	static const char * const IVRApplications_Version = "IVRApplications_006";
+	static const char * const IVRApplications_Version = "IVRApplications_007";

 } // namespace vr

@@ -2604,19 +2615,25 @@ namespace vr
 	static const char * const k_pch_SteamVR_BackgroundDomeRadius_Float = "backgroundDomeRadius";
 	static const char * const k_pch_SteamVR_GridColor_String = "gridColor";
 	static const char * const k_pch_SteamVR_PlayAreaColor_String = "playAreaColor";
+	static const char * const k_pch_SteamVR_TrackingLossColor_String = "trackingLossColor";
 	static const char * const k_pch_SteamVR_ShowStage_Bool = "showStage";
 	static const char * const k_pch_SteamVR_ActivateMultipleDrivers_Bool = "activateMultipleDrivers";
 	static const char * const k_pch_SteamVR_UsingSpeakers_Bool = "usingSpeakers";
 	static const char * const k_pch_SteamVR_SpeakersForwardYawOffsetDegrees_Float = "speakersForwardYawOffsetDegrees";
 	static const char * const k_pch_SteamVR_BaseStationPowerManagement_Int32 = "basestationPowerManagement";
+	static const char * const k_pch_SteamVR_ShowBaseStationPowerManagementTip_Int32 = "ShowBaseStationPowerManagementTip";
 	static const char * const k_pch_SteamVR_NeverKillProcesses_Bool = "neverKillProcesses";
 	static const char * const k_pch_SteamVR_SupersampleScale_Float = "supersampleScale";
 	static const char * const k_pch_SteamVR_MaxRecommendedResolution_Int32 = "maxRecommendedResolution";
 	static const char * const k_pch_SteamVR_MotionSmoothing_Bool = "motionSmoothing";
 	static const char * const k_pch_SteamVR_MotionSmoothingOverride_Int32 = "motionSmoothingOverride";
+	static const char * const k_pch_SteamVR_DisableAsyncReprojection_Bool = "disableAsync";
 	static const char * const k_pch_SteamVR_ForceFadeOnBadTracking_Bool = "forceFadeOnBadTracking";
 	static const char * const k_pch_SteamVR_DefaultMirrorView_Int32 = "mirrorView";
-	static const char * const k_pch_SteamVR_ShowMirrorView_Bool = "showMirrorView";
+	static const char * const k_pch_SteamVR_ShowLegacyMirrorView_Bool = "showLegacyMirrorView";
+	static const char * const k_pch_SteamVR_MirrorViewVisibility_Bool = "showMirrorView";
+	static const char * const k_pch_SteamVR_MirrorViewDisplayMode_Int32 = "mirrorViewDisplayMode";
+	static const char * const k_pch_SteamVR_MirrorViewEye_Int32 = "mirrorViewEye";
 	static const char * const k_pch_SteamVR_MirrorViewGeometry_String = "mirrorViewGeometry";
 	static const char * const k_pch_SteamVR_MirrorViewGeometryMaximized_String = "mirrorViewGeometryMaximized";
 	static const char * const k_pch_SteamVR_StartMonitorFromAppLaunch = "startMonitorFromAppLaunch";
@@ -2645,6 +2662,9 @@ namespace vr
 	static const char * const k_pch_SteamVR_HmdDisplayColorGainR_Float = "hmdDisplayColorGainR";
 	static const char * const k_pch_SteamVR_HmdDisplayColorGainG_Float = "hmdDisplayColorGainG";
 	static const char * const k_pch_SteamVR_HmdDisplayColorGainB_Float = "hmdDisplayColorGainB";
+	static const char * const k_pch_SteamVR_CustomIconStyle_String = "customIconStyle";
+	static const char * const k_pch_SteamVR_CustomOffIconStyle_String = "customOffIconStyle";
+	static const char * const k_pch_SteamVR_CustomIconForceUpdate_String = "customIconForceUpdate";

 	//-----------------------------------------------------------------------------
 	// direct mode keys
@@ -2668,7 +2688,6 @@ namespace vr
 	static const char * const k_pch_Lighthouse_PowerManagedBaseStations2_String = "PowerManagedBaseStations2";
 	static const char * const k_pch_Lighthouse_InactivityTimeoutForBaseStations_Int32 = "InactivityTimeoutForBaseStations";
 	static const char * const k_pch_Lighthouse_EnableImuFallback_Bool = "enableImuFallback";
-	static const char * const k_pch_Lighthouse_NewPairing_Bool = "newPairing";

 	//-----------------------------------------------------------------------------
 	// null keys
@@ -2730,6 +2749,7 @@ namespace vr
 	static const char * const k_pch_CollisionBounds_ColorGammaG_Int32 = "CollisionBoundsColorGammaG";
 	static const char * const k_pch_CollisionBounds_ColorGammaB_Int32 = "CollisionBoundsColorGammaB";
 	static const char * const k_pch_CollisionBounds_ColorGammaA_Int32 = "CollisionBoundsColorGammaA";
+	static const char * const k_pch_CollisionBounds_EnableDriverImport = "enableDriverBoundsImport";

 	//-----------------------------------------------------------------------------
 	// camera keys
@@ -2748,11 +2768,19 @@ namespace vr
 	//-----------------------------------------------------------------------------
 	// audio keys
 	static const char * const k_pch_audio_Section = "audio";
-	static const char * const k_pch_audio_OnPlaybackDevice_String = "onPlaybackDevice";
-	static const char * const k_pch_audio_OnRecordDevice_String = "onRecordDevice";
-	static const char * const k_pch_audio_OnPlaybackMirrorDevice_String = "onPlaybackMirrorDevice";
-	static const char * const k_pch_audio_OffPlaybackDevice_String = "offPlaybackDevice";
-	static const char * const k_pch_audio_OffRecordDevice_String = "offRecordDevice";
+	static const char * const k_pch_audio_SetOsDefaultPlaybackDevice_Bool = "setOsDefaultPlaybackDevice";
+	static const char * const k_pch_audio_EnablePlaybackDeviceOverride_Bool = "enablePlaybackDeviceOverride";
+	static const char * const k_pch_audio_PlaybackDeviceOverride_String = "playbackDeviceOverride";
+	static const char * const k_pch_audio_PlaybackDeviceOverrideName_String = "playbackDeviceOverrideName";
+	static const char * const k_pch_audio_SetOsDefaultRecordingDevice_Bool = "setOsDefaultRecordingDevice";
+	static const char * const k_pch_audio_EnableRecordingDeviceOverride_Bool = "enableRecordingDeviceOverride";
+	static const char * const k_pch_audio_RecordingDeviceOverride_String = "recordingDeviceOverride";
+	static const char * const k_pch_audio_RecordingDeviceOverrideName_String = "recordingDeviceOverrideName";
+	static const char * const k_pch_audio_EnablePlaybackMirror_Bool = "enablePlaybackMirror";
+	static const char * const k_pch_audio_PlaybackMirrorDevice_String = "playbackMirrorDevice";
+	static const char * const k_pch_audio_PlaybackMirrorDeviceName_String = "playbackMirrorDeviceName";
+	static const char * const k_pch_audio_OldPlaybackMirrorDevice_String = "onPlaybackMirrorDevice";
+	static const char * const k_pch_audio_LastHmdPlaybackDeviceId_String = "lastHmdPlaybackDeviceId";
 	static const char * const k_pch_audio_VIVEHDMIGain = "viveHDMIGain";

 	//-----------------------------------------------------------------------------
@@ -2770,10 +2798,8 @@ namespace vr
 	static const char * const k_pch_Dashboard_Section = "dashboard";
 	static const char * const k_pch_Dashboard_EnableDashboard_Bool = "enableDashboard";
 	static const char * const k_pch_Dashboard_ArcadeMode_Bool = "arcadeMode";
-	static const char * const k_pch_Dashboard_UseWebDashboard = "useWebDashboard";
+	static const char * const k_pch_Dashboard_UseWebKeyboard = "useWebKeyboard";
 	static const char * const k_pch_Dashboard_UseWebSettings = "useWebSettings";
-	static const char * const k_pch_Dashboard_UseWebIPD = "useWebIPD";
-	static const char * const k_pch_Dashboard_UseWebPowerMenu = "useWebPowerMenu";

 	//-----------------------------------------------------------------------------
 	// model skin keys
@@ -2787,8 +2813,6 @@ namespace vr
 	//-----------------------------------------------------------------------------
 	// web interface keys
 	static const char* const k_pch_WebInterface_Section = "WebInterface";
-	static const char* const k_pch_WebInterface_WebEnable_Bool = "WebEnable";
-	static const char* const k_pch_WebInterface_WebPort_String = "WebPort";

 	//-----------------------------------------------------------------------------
 	// vrwebhelper keys
@@ -3186,14 +3210,14 @@ public:
 	/** Returns true if the current process has the scene focus */
 	virtual bool CanRenderScene() = 0;

-	/** Opens the headset view (as either a window or docked widget depending on user's preferences) that displays what the user
+	/** DEPRECATED: Opens the headset view (as either a window or docked widget depending on user's preferences) that displays what the user
 	* sees in the headset. */
 	virtual void ShowMirrorWindow() = 0;

-	/** Closes the headset view, either as a window or docked widget. */
+	/** DEPRECATED: Closes the headset view, either as a window or docked widget. */
 	virtual void HideMirrorWindow() = 0;

-	/** Returns true if the headset view (either as a window or docked widget) is shown. */
+	/** DEPRECATED: Returns true if the headset view (either as a window or docked widget) is shown. */
 	virtual bool IsMirrorWindowVisible() = 0;

 	/** Writes back buffer and stereo left/right pair from the application to a 'screenshots' folder in the SteamVR runtime root. */
@@ -3404,60 +3428,52 @@ namespace vr
 	/** Overlay control settings */
 	enum VROverlayFlags
 	{
-		VROverlayFlags_None			= 0,
-
-		// The following only take effect when rendered using the high quality render path (see SetHighQualityOverlay).
-		VROverlayFlags_Curved		= 1,
-		VROverlayFlags_RGSS4X		= 2,
-
 		// Set this flag on a dashboard overlay to prevent a tab from showing up for that overlay
-		VROverlayFlags_NoDashboardTab = 3,
-
-		// Set this flag on a dashboard that is able to deal with gamepad focus events
-		VROverlayFlags_AcceptsGamepadEvents = 4,
-
-		// Indicates that the overlay should dim/brighten to show gamepad focus
-		VROverlayFlags_ShowGamepadFocus = 5,
+		VROverlayFlags_NoDashboardTab = 1 << 3,

 		// When this is set the overlay will receive VREvent_ScrollDiscrete events like a mouse wheel. 
 		// Requires mouse input mode.
-		VROverlayFlags_SendVRDiscreteScrollEvents = 6,
+		VROverlayFlags_SendVRDiscreteScrollEvents = 1 << 6,

 		// Indicates that the overlay would like to receive
-		VROverlayFlags_SendVRTouchpadEvents = 7,
+		VROverlayFlags_SendVRTouchpadEvents = 1 << 7,

 		// If set this will render a vertical scroll wheel on the primary controller, 
 		//  only needed if not using VROverlayFlags_SendVRScrollEvents but you still want to represent a scroll wheel
-		VROverlayFlags_ShowTouchPadScrollWheel = 8,
+		VROverlayFlags_ShowTouchPadScrollWheel = 1 << 8,

 		// If this is set ownership and render access to the overlay are transferred 
 		// to the new scene process on a call to IVRApplications::LaunchInternalProcess
-		VROverlayFlags_TransferOwnershipToInternalProcess = 9,
+		VROverlayFlags_TransferOwnershipToInternalProcess = 1 << 9,

 		// If set, renders 50% of the texture in each eye, side by side
-		VROverlayFlags_SideBySide_Parallel = 10, // Texture is left/right
-		VROverlayFlags_SideBySide_Crossed = 11, // Texture is crossed and right/left
+		VROverlayFlags_SideBySide_Parallel = 1 << 10, // Texture is left/right
+		VROverlayFlags_SideBySide_Crossed = 1 << 11, // Texture is crossed and right/left

-		VROverlayFlags_Panorama = 12, // Texture is a panorama
-		VROverlayFlags_StereoPanorama = 13, // Texture is a stereo panorama
+		VROverlayFlags_Panorama = 1 << 12, // Texture is a panorama
+		VROverlayFlags_StereoPanorama = 1 << 13, // Texture is a stereo panorama

 		// If this is set on an overlay owned by the scene application that overlay
 		// will be sorted with the "Other" overlays on top of all other scene overlays
-		VROverlayFlags_SortWithNonSceneOverlays = 14,
+		VROverlayFlags_SortWithNonSceneOverlays = 1 << 14,

 		// If set, the overlay will be shown in the dashboard, otherwise it will be hidden.
-		VROverlayFlags_VisibleInDashboard = 15,
+		VROverlayFlags_VisibleInDashboard = 1 << 15,

 		// If this is set and the overlay's input method is not none, the system-wide laser mouse
 		// mode will be activated whenever this overlay is visible.
-		VROverlayFlags_MakeOverlaysInteractiveIfVisible = 16,
+		VROverlayFlags_MakeOverlaysInteractiveIfVisible = 1 << 16,

 		// If this is set the overlay will receive smooth VREvent_ScrollSmooth that emulate trackpad scrolling.
 		// Requires mouse input mode.
-		VROverlayFlags_SendVRSmoothScrollEvents = 17,
+		VROverlayFlags_SendVRSmoothScrollEvents = 1 << 17,

 		// If this is set, the overlay texture will be protected content, preventing unauthorized reads.
-		VROverlayFlags_ProtectedContent = 18,
+		VROverlayFlags_ProtectedContent = 1 << 18,
+
+		// If this is set, the laser mouse splat will not be drawn over this overlay. The overlay will
+		// be responsible for drawing its own "cursor".
+		VROverlayFlags_HideLaserIntersection = 1 << 19,
 	};

 	enum VRMessageOverlayResponse
@@ -3501,17 +3517,6 @@ namespace vr
 		k_EGamepadTextInputLineModeMultipleLines = 1
 	};

-	/** Directions for changing focus between overlays with the gamepad */
-	enum EOverlayDirection
-	{
-		OverlayDirection_Up = 0,
-		OverlayDirection_Down = 1,
-		OverlayDirection_Left = 2,
-		OverlayDirection_Right = 3,
-		
-		OverlayDirection_Count = 4,
-	};
-
 	enum EVROverlayIntersectionMaskPrimitiveType
 	{
 		OverlayIntersectionPrimitiveType_Rectangle,
@@ -3564,17 +3569,6 @@ namespace vr
 		* automatically destroyed. */
 		virtual EVROverlayError DestroyOverlay( VROverlayHandle_t ulOverlayHandle ) = 0;

-		/** Specify which overlay to use the high quality render path.  This overlay will be composited in during the distortion pass which
-		* results in it drawing on top of everything else, but also at a higher quality as it samples the source texture directly rather than
-		* rasterizing into each eye's render texture first.  Because if this, only one of these is supported at any given time.  It is most useful
-		* for overlays that are expected to take up most of the user's view (e.g. streaming video).
-		* This mode does not support mouse input to your overlay. */
-		virtual EVROverlayError SetHighQualityOverlay( VROverlayHandle_t ulOverlayHandle ) = 0;
-
-		/** Returns the overlay handle of the current overlay being rendered using the single high quality overlay render path.
-		* Otherwise it will return k_ulOverlayHandleInvalid. */
-		virtual vr::VROverlayHandle_t GetHighQualityOverlay() = 0;
-
 		/** Fills the provided buffer with the string key of the overlay. Returns the size of buffer required to store the key, including
 		* the terminating null character. k_unVROverlayMaxKeyLength will be enough bytes to fit the string. */
 		virtual uint32_t GetOverlayKey( VROverlayHandle_t ulOverlayHandle, VR_OUT_STRING() char *pchValue, uint32_t unBufferSize, EVROverlayError *pError = 0L ) = 0;
@@ -3649,13 +3643,12 @@ namespace vr
 		/** Returns the width of the overlay quad in meters. By default overlays are rendered on a quad that is 1 meter across */
 		virtual EVROverlayError GetOverlayWidthInMeters( VROverlayHandle_t ulOverlayHandle, float *pfWidthInMeters ) = 0;

-		/** For high-quality curved overlays only, sets the distance range in meters from the overlay used to automatically curve
-		* the surface around the viewer.  Min is distance is when the surface will be most curved.  Max is when least curved. */
-		virtual EVROverlayError SetOverlayAutoCurveDistanceRangeInMeters( VROverlayHandle_t ulOverlayHandle, float fMinDistanceInMeters, float fMaxDistanceInMeters ) = 0;
+		/** Use to draw overlay as a curved surface. Curvature is a percentage from (0..1] where 1 is a fully closed cylinder.
+		* For a specific radius, curvature can be computed as: overlay.width / (2 PI r). */
+		virtual EVROverlayError SetOverlayCurvature( VROverlayHandle_t ulOverlayHandle, float fCurvature ) = 0;

-		/** For high-quality curved overlays only, gets the distance range in meters from the overlay used to automatically curve
-		* the surface around the viewer.  Min is distance is when the surface will be most curved.  Max is when least curved. */
-		virtual EVROverlayError GetOverlayAutoCurveDistanceRangeInMeters( VROverlayHandle_t ulOverlayHandle, float *pfMinDistanceInMeters, float *pfMaxDistanceInMeters ) = 0;
+		/** Returns the curvature of the overlay as a percentage from (0..1] where 1 is a fully closed cylinder. */
+		virtual EVROverlayError GetOverlayCurvature( VROverlayHandle_t ulOverlayHandle, float *pfCurvature ) = 0;

 		/** Sets the colorspace the overlay texture's data is in.  Defaults to 'auto'.
 		* If the texture needs to be resolved, you should call SetOverlayTexture with the appropriate colorspace instead. */
@@ -3747,21 +3740,6 @@ namespace vr
 		* by the virtual mouse pointer */
 		virtual bool IsHoverTargetOverlay( VROverlayHandle_t ulOverlayHandle ) = 0;

-		/** Returns the current Gamepad focus overlay */
-		virtual vr::VROverlayHandle_t GetGamepadFocusOverlay() = 0;
-
-		/** Sets the current Gamepad focus overlay */
-		virtual EVROverlayError SetGamepadFocusOverlay( VROverlayHandle_t ulNewFocusOverlay ) = 0;
-
-		/** Sets an overlay's neighbor. This will also set the neighbor of the "to" overlay
-		* to point back to the "from" overlay. If an overlay's neighbor is set to invalid both
-		* ends will be cleared */
-		virtual EVROverlayError SetOverlayNeighbor( EOverlayDirection eDirection, VROverlayHandle_t ulFrom, VROverlayHandle_t ulTo ) = 0;
-
-		/** Changes the Gamepad focus from one overlay to one of its neighbors. Returns VROverlayError_NoNeighbor if there is no
-		* neighbor in that direction */
-		virtual EVROverlayError MoveGamepadFocusToNeighbor( EOverlayDirection eDirection, VROverlayHandle_t ulFrom ) = 0;
-
 		/** Sets the analog input to Dual Analog coordinate scale for the specified overlay. */
 		virtual EVROverlayError SetOverlayDualAnalogTransform( VROverlayHandle_t ulOverlay, EDualAnalogWhich eWhich, const HmdVector2_t *pvCenter, float fRadius ) = 0;

@@ -3877,7 +3855,7 @@ namespace vr
 		virtual void CloseMessageOverlay() = 0;
 	};

-	static const char * const IVROverlay_Version = "IVROverlay_019";
+	static const char * const IVROverlay_Version = "IVROverlay_021";

 } // namespace vr

@@ -4167,9 +4145,11 @@ public:
 	/** Access a shared GL texture for the specified tracked camera stream */
 	virtual vr::EVRTrackedCameraError GetVideoStreamTextureGL( vr::TrackedCameraHandle_t hTrackedCamera, vr::EVRTrackedCameraFrameType eFrameType, vr::glUInt_t *pglTextureId, vr::CameraVideoStreamFrameHeader_t *pFrameHeader, uint32_t nFrameHeaderSize ) = 0;
 	virtual vr::EVRTrackedCameraError ReleaseVideoStreamTextureGL( vr::TrackedCameraHandle_t hTrackedCamera, vr::glUInt_t glTextureId ) = 0;
+	virtual void SetCameraTrackingSpace( vr::ETrackingUniverseOrigin eUniverse ) = 0;
+	virtual vr::ETrackingUniverseOrigin GetCameraTrackingSpace( ) = 0;
 };

-static const char * const IVRTrackedCamera_Version = "IVRTrackedCamera_005";
+static const char * const IVRTrackedCamera_Version = "IVRTrackedCamera_006";

 } // namespace vr

@@ -4525,7 +4505,9 @@ namespace vr
 		virtual EVRInputError GetActionHandle( const char *pchActionName, VRActionHandle_t *pHandle ) = 0;

 		/** Returns a handle for any path in the input system. E.g. /user/hand/right */
-		virtual EVRInputError GetInputSourceHandle( const char *pchInputSourcePath, VRInputValueHandle_t  *pHandle ) = 0;
+		virtual EVRInputError GetInputSourceHandle( const char *pchInputSourcePath, VRInputValueHandle_t *pHandle ) = 0;
+
+

 		// --------------- Reading action state ------------------- //

@@ -4613,6 +4595,13 @@ namespace vr

 		// --------------- Legacy Input ------------------- //
 		virtual bool IsUsingLegacyInput() = 0;
+
+
+		// --------------- Utilities ------------------- //
+
+		/** Opens the binding user interface. If no app key is provided it will use the key from the calling process.
+		* If no set is provided it will open to the root of the app binding page. */
+		virtual EVRInputError OpenBindingUI( const char* pchAppKey, VRActionSetHandle_t ulActionSetHandle, VRInputValueHandle_t ulDeviceHandle, bool bShowOnDesktop ) = 0;
 	};

 	static const char * const IVRInput_Version = "IVRInput_007";
@@ -9,6 +9,10 @@ using System;
 using System.Runtime.InteropServices;
 using Valve.VR;

+#if UNITY_5_3_OR_NEWER
+using UnityEngine;
+#endif
+
 namespace Valve.VR
 {

@@ -240,11 +244,6 @@ public struct IVRSystem
 	[MarshalAs(UnmanagedType.FunctionPtr)]
 	internal _AcknowledgeQuit_Exiting AcknowledgeQuit_Exiting;

-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _AcknowledgeQuit_UserPrompt();
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _AcknowledgeQuit_UserPrompt AcknowledgeQuit_UserPrompt;
-
 	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
 	internal delegate uint _GetAppContainerFilePaths(System.Text.StringBuilder pchBuffer, uint unBufferSize);
 	[MarshalAs(UnmanagedType.FunctionPtr)]
@@ -340,6 +339,16 @@ public struct IVRTrackedCamera
 	[MarshalAs(UnmanagedType.FunctionPtr)]
 	internal _ReleaseVideoStreamTextureGL ReleaseVideoStreamTextureGL;

+	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
+	internal delegate void _SetCameraTrackingSpace(ETrackingUniverseOrigin eUniverse);
+	[MarshalAs(UnmanagedType.FunctionPtr)]
+	internal _SetCameraTrackingSpace SetCameraTrackingSpace;
+
+	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
+	internal delegate ETrackingUniverseOrigin _GetCameraTrackingSpace();
+	[MarshalAs(UnmanagedType.FunctionPtr)]
+	internal _GetCameraTrackingSpace GetCameraTrackingSpace;
+
 }

 [StructLayout(LayoutKind.Sequential)]
@@ -471,9 +480,9 @@ public struct IVRApplications
 	internal _GetStartingApplication GetStartingApplication;

 	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVRApplicationTransitionState _GetTransitionState();
+	internal delegate EVRSceneApplicationState _GetSceneApplicationState();
 	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetTransitionState GetTransitionState;
+	internal _GetSceneApplicationState GetSceneApplicationState;

 	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
 	internal delegate EVRApplicationError _PerformApplicationPrelaunchCheck(string pchAppKey);
@@ -481,14 +490,9 @@ public struct IVRApplications
 	internal _PerformApplicationPrelaunchCheck PerformApplicationPrelaunchCheck;

 	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate IntPtr _GetApplicationsTransitionStateNameFromEnum(EVRApplicationTransitionState state);
+	internal delegate IntPtr _GetSceneApplicationStateNameFromEnum(EVRSceneApplicationState state);
 	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetApplicationsTransitionStateNameFromEnum GetApplicationsTransitionStateNameFromEnum;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate bool _IsQuitUserPromptRequested();
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _IsQuitUserPromptRequested IsQuitUserPromptRequested;
+	internal _GetSceneApplicationStateNameFromEnum GetSceneApplicationStateNameFromEnum;

 	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
 	internal delegate EVRApplicationError _LaunchInternalProcess(string pchBinaryPath, string pchArguments, string pchWorkingDirectory);
@@ -905,16 +909,6 @@ public struct IVROverlay
 	[MarshalAs(UnmanagedType.FunctionPtr)]
 	internal _DestroyOverlay DestroyOverlay;

-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _SetHighQualityOverlay(ulong ulOverlayHandle);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _SetHighQualityOverlay SetHighQualityOverlay;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate ulong _GetHighQualityOverlay();
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetHighQualityOverlay GetHighQualityOverlay;
-
 	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
 	internal delegate uint _GetOverlayKey(ulong ulOverlayHandle, System.Text.StringBuilder pchValue, uint unBufferSize, ref EVROverlayError pError);
 	[MarshalAs(UnmanagedType.FunctionPtr)]
@@ -1011,14 +1005,14 @@ public struct IVROverlay
 	internal _GetOverlayWidthInMeters GetOverlayWidthInMeters;

 	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _SetOverlayAutoCurveDistanceRangeInMeters(ulong ulOverlayHandle, float fMinDistanceInMeters, float fMaxDistanceInMeters);
+	internal delegate EVROverlayError _SetOverlayCurvature(ulong ulOverlayHandle, float fCurvature);
 	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _SetOverlayAutoCurveDistanceRangeInMeters SetOverlayAutoCurveDistanceRangeInMeters;
+	internal _SetOverlayCurvature SetOverlayCurvature;

 	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _GetOverlayAutoCurveDistanceRangeInMeters(ulong ulOverlayHandle, ref float pfMinDistanceInMeters, ref float pfMaxDistanceInMeters);
+	internal delegate EVROverlayError _GetOverlayCurvature(ulong ulOverlayHandle, ref float pfCurvature);
 	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetOverlayAutoCurveDistanceRangeInMeters GetOverlayAutoCurveDistanceRangeInMeters;
+	internal _GetOverlayCurvature GetOverlayCurvature;

 	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
 	internal delegate EVROverlayError _SetOverlayTextureColorSpace(ulong ulOverlayHandle, EColorSpace eTextureColorSpace);
@@ -1150,26 +1144,6 @@ public struct IVROverlay
 	[MarshalAs(UnmanagedType.FunctionPtr)]
 	internal _IsHoverTargetOverlay IsHoverTargetOverlay;

-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate ulong _GetGamepadFocusOverlay();
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetGamepadFocusOverlay GetGamepadFocusOverlay;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _SetGamepadFocusOverlay(ulong ulNewFocusOverlay);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _SetGamepadFocusOverlay SetGamepadFocusOverlay;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _SetOverlayNeighbor(EOverlayDirection eDirection, ulong ulFrom, ulong ulTo);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _SetOverlayNeighbor SetOverlayNeighbor;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _MoveGamepadFocusToNeighbor(EOverlayDirection eDirection, ulong ulFrom);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _MoveGamepadFocusToNeighbor MoveGamepadFocusToNeighbor;
-
 	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
 	internal delegate EVROverlayError _SetOverlayDualAnalogTransform(ulong ulOverlay, EDualAnalogWhich eWhich, ref HmdVector2_t pvCenter, float fRadius);
 	[MarshalAs(UnmanagedType.FunctionPtr)]
@@ -1700,6 +1674,11 @@ public struct IVRInput
 	[MarshalAs(UnmanagedType.FunctionPtr)]
 	internal _IsUsingLegacyInput IsUsingLegacyInput;

+	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
+	internal delegate EVRInputError _OpenBindingUI(string pchAppKey, ulong ulActionSetHandle, ulong ulDeviceHandle, bool bShowOnDesktop);
+	[MarshalAs(UnmanagedType.FunctionPtr)]
+	internal _OpenBindingUI OpenBindingUI;
+
 }

 [StructLayout(LayoutKind.Sequential)]
@@ -2099,10 +2078,6 @@ public class CVRSystem
 	{
 		FnTable.AcknowledgeQuit_Exiting();
 	}
-	public void AcknowledgeQuit_UserPrompt()
-	{
-		FnTable.AcknowledgeQuit_UserPrompt();
-	}
 	public uint GetAppContainerFilePaths(System.Text.StringBuilder pchBuffer,uint unBufferSize)
 	{
 		uint result = FnTable.GetAppContainerFilePaths(pchBuffer,unBufferSize);
@@ -2223,6 +2198,15 @@ public class CVRTrackedCamera
 		EVRTrackedCameraError result = FnTable.ReleaseVideoStreamTextureGL(hTrackedCamera,glTextureId);
 		return result;
 	}
+	public void SetCameraTrackingSpace(ETrackingUniverseOrigin eUniverse)
+	{
+		FnTable.SetCameraTrackingSpace(eUniverse);
+	}
+	public ETrackingUniverseOrigin GetCameraTrackingSpace()
+	{
+		ETrackingUniverseOrigin result = FnTable.GetCameraTrackingSpace();
+		return result;
+	}
 }


@@ -2358,9 +2342,9 @@ public class CVRApplications
 		EVRApplicationError result = FnTable.GetStartingApplication(pchAppKeyBuffer,unAppKeyBufferLen);
 		return result;
 	}
-	public EVRApplicationTransitionState GetTransitionState()
+	public EVRSceneApplicationState GetSceneApplicationState()
 	{
-		EVRApplicationTransitionState result = FnTable.GetTransitionState();
+		EVRSceneApplicationState result = FnTable.GetSceneApplicationState();
 		return result;
 	}
 	public EVRApplicationError PerformApplicationPrelaunchCheck(string pchAppKey)
@@ -2368,16 +2352,11 @@ public class CVRApplications
 		EVRApplicationError result = FnTable.PerformApplicationPrelaunchCheck(pchAppKey);
 		return result;
 	}
-	public string GetApplicationsTransitionStateNameFromEnum(EVRApplicationTransitionState state)
+	public string GetSceneApplicationStateNameFromEnum(EVRSceneApplicationState state)
 	{
-		IntPtr result = FnTable.GetApplicationsTransitionStateNameFromEnum(state);
+		IntPtr result = FnTable.GetSceneApplicationStateNameFromEnum(state);
 		return Marshal.PtrToStringAnsi(result);
 	}
-	public bool IsQuitUserPromptRequested()
-	{
-		bool result = FnTable.IsQuitUserPromptRequested();
-		return result;
-	}
 	public EVRApplicationError LaunchInternalProcess(string pchBinaryPath,string pchArguments,string pchWorkingDirectory)
 	{
 		EVRApplicationError result = FnTable.LaunchInternalProcess(pchBinaryPath,pchArguments,pchWorkingDirectory);
@@ -2793,16 +2772,6 @@ public class CVROverlay
 		EVROverlayError result = FnTable.DestroyOverlay(ulOverlayHandle);
 		return result;
 	}
-	public EVROverlayError SetHighQualityOverlay(ulong ulOverlayHandle)
-	{
-		EVROverlayError result = FnTable.SetHighQualityOverlay(ulOverlayHandle);
-		return result;
-	}
-	public ulong GetHighQualityOverlay()
-	{
-		ulong result = FnTable.GetHighQualityOverlay();
-		return result;
-	}
 	public uint GetOverlayKey(ulong ulOverlayHandle,System.Text.StringBuilder pchValue,uint unBufferSize,ref EVROverlayError pError)
 	{
 		uint result = FnTable.GetOverlayKey(ulOverlayHandle,pchValue,unBufferSize,ref pError);
@@ -2908,16 +2877,15 @@ public class CVROverlay
 		EVROverlayError result = FnTable.GetOverlayWidthInMeters(ulOverlayHandle,ref pfWidthInMeters);
 		return result;
 	}
-	public EVROverlayError SetOverlayAutoCurveDistanceRangeInMeters(ulong ulOverlayHandle,float fMinDistanceInMeters,float fMaxDistanceInMeters)
+	public EVROverlayError SetOverlayCurvature(ulong ulOverlayHandle,float fCurvature)
 	{
-		EVROverlayError result = FnTable.SetOverlayAutoCurveDistanceRangeInMeters(ulOverlayHandle,fMinDistanceInMeters,fMaxDistanceInMeters);
+		EVROverlayError result = FnTable.SetOverlayCurvature(ulOverlayHandle,fCurvature);
 		return result;
 	}
-	public EVROverlayError GetOverlayAutoCurveDistanceRangeInMeters(ulong ulOverlayHandle,ref float pfMinDistanceInMeters,ref float pfMaxDistanceInMeters)
+	public EVROverlayError GetOverlayCurvature(ulong ulOverlayHandle,ref float pfCurvature)
 	{
-		pfMinDistanceInMeters = 0;
-		pfMaxDistanceInMeters = 0;
-		EVROverlayError result = FnTable.GetOverlayAutoCurveDistanceRangeInMeters(ulOverlayHandle,ref pfMinDistanceInMeters,ref pfMaxDistanceInMeters);
+		pfCurvature = 0;
+		EVROverlayError result = FnTable.GetOverlayCurvature(ulOverlayHandle,ref pfCurvature);
 		return result;
 	}
 	public EVROverlayError SetOverlayTextureColorSpace(ulong ulOverlayHandle,EColorSpace eTextureColorSpace)
@@ -3079,26 +3047,6 @@ public class CVROverlay
 		bool result = FnTable.IsHoverTargetOverlay(ulOverlayHandle);
 		return result;
 	}
-	public ulong GetGamepadFocusOverlay()
-	{
-		ulong result = FnTable.GetGamepadFocusOverlay();
-		return result;
-	}
-	public EVROverlayError SetGamepadFocusOverlay(ulong ulNewFocusOverlay)
-	{
-		EVROverlayError result = FnTable.SetGamepadFocusOverlay(ulNewFocusOverlay);
-		return result;
-	}
-	public EVROverlayError SetOverlayNeighbor(EOverlayDirection eDirection,ulong ulFrom,ulong ulTo)
-	{
-		EVROverlayError result = FnTable.SetOverlayNeighbor(eDirection,ulFrom,ulTo);
-		return result;
-	}
-	public EVROverlayError MoveGamepadFocusToNeighbor(EOverlayDirection eDirection,ulong ulFrom)
-	{
-		EVROverlayError result = FnTable.MoveGamepadFocusToNeighbor(eDirection,ulFrom);
-		return result;
-	}
 	public EVROverlayError SetOverlayDualAnalogTransform(ulong ulOverlay,EDualAnalogWhich eWhich,ref HmdVector2_t pvCenter,float fRadius)
 	{
 		EVROverlayError result = FnTable.SetOverlayDualAnalogTransform(ulOverlay,eWhich,ref pvCenter,fRadius);
@@ -3694,6 +3642,11 @@ public class CVRInput
 		bool result = FnTable.IsUsingLegacyInput();
 		return result;
 	}
+	public EVRInputError OpenBindingUI(string pchAppKey,ulong ulActionSetHandle,ulong ulDeviceHandle,bool bShowOnDesktop)
+	{
+		EVRInputError result = FnTable.OpenBindingUI(pchAppKey,ulActionSetHandle,ulDeviceHandle,bShowOnDesktop);
+		return result;
+	}
 }


@@ -3817,6 +3770,8 @@ public class OpenVRInterop
 	internal static extern bool IsRuntimeInstalled();
 	[DllImportAttribute("openvr_api", EntryPoint = "VR_RuntimePath", CallingConvention = CallingConvention.Cdecl)]
 	internal static extern string RuntimePath();
+	[DllImportAttribute("openvr_api", EntryPoint = "VR_GetRuntimePath", CallingConvention = CallingConvention.Cdecl)]
+	internal static extern bool GetRuntimePath(System.Text.StringBuilder pchPathBuffer, uint unBufferSize, ref uint punRequiredBufferSize);
 	[DllImportAttribute("openvr_api", EntryPoint = "VR_GetStringForHmdError", CallingConvention = CallingConvention.Cdecl)]
 	internal static extern IntPtr GetStringForHmdError(EVRInitError error);
 	[DllImportAttribute("openvr_api", EntryPoint = "VR_GetGenericInterface", CallingConvention = CallingConvention.Cdecl)]
@@ -4016,11 +3971,15 @@ public enum ETrackedDeviceProperty
 	Prop_ExpectedControllerType_String = 2074,
 	Prop_HmdTrackingStyle_Int32 = 2075,
 	Prop_DriverProvidedChaperoneVisibility_Bool = 2076,
+	Prop_HmdProvidesDisplaySettings_Bool = 2077,
 	Prop_DisplayAvailableFrameRates_Float_Array = 2080,
 	Prop_DisplaySupportsMultipleFramerates_Bool = 2081,
 	Prop_DisplayColorMultLeft_Vector3 = 2082,
 	Prop_DisplayColorMultRight_Vector3 = 2083,
 	Prop_DashboardLayoutPathName_String = 2090,
+	Prop_DashboardScale_Float = 2091,
+	Prop_IpdUIRangeMinMeters_Float = 2100,
+	Prop_IpdUIRangeMaxMeters_Float = 2101,
 	Prop_DriverRequestedMuraCorrectionMode_Int32 = 2200,
 	Prop_DriverRequestedMuraFeather_InnerLeft_Int32 = 2201,
 	Prop_DriverRequestedMuraFeather_InnerRight_Int32 = 2202,
@@ -4030,6 +3989,9 @@ public enum ETrackedDeviceProperty
 	Prop_DriverRequestedMuraFeather_OuterRight_Int32 = 2206,
 	Prop_DriverRequestedMuraFeather_OuterTop_Int32 = 2207,
 	Prop_DriverRequestedMuraFeather_OuterBottom_Int32 = 2208,
+	Prop_Audio_DefaultPlaybackDeviceId_String = 2300,
+	Prop_Audio_DefaultRecordingDeviceId_String = 2301,
+	Prop_Audio_DefaultPlaybackDeviceVolume_Float = 2302,
 	Prop_AttachedDeviceId_String = 3000,
 	Prop_SupportedButtons_Uint64 = 3001,
 	Prop_Axis0Type_Int32 = 3002,
@@ -4056,9 +4018,11 @@ public enum ETrackedDeviceProperty
 	Prop_NamedIconPathDeviceNotReady_String = 5006,
 	Prop_NamedIconPathDeviceStandby_String = 5007,
 	Prop_NamedIconPathDeviceAlertLow_String = 5008,
+	Prop_NamedIconPathDeviceStandbyAlert_String = 5009,
 	Prop_DisplayHiddenArea_Binary_Start = 5100,
 	Prop_DisplayHiddenArea_Binary_End = 5150,
 	Prop_ParentContainer = 5151,
+	Prop_OverrideContainer_Uint64 = 5152,
 	Prop_UserConfigPath_String = 6000,
 	Prop_InstallPath_String = 6001,
 	Prop_HasDisplayComponent_Bool = 6002,
@@ -4159,16 +4123,14 @@ public enum EVREventType
 	VREvent_ScrollSmooth = 309,
 	VREvent_InputFocusCaptured = 400,
 	VREvent_InputFocusReleased = 401,
-	VREvent_SceneFocusLost = 402,
-	VREvent_SceneFocusGained = 403,
 	VREvent_SceneApplicationChanged = 404,
 	VREvent_SceneFocusChanged = 405,
 	VREvent_InputFocusChanged = 406,
-	VREvent_SceneApplicationSecondaryRenderingStarted = 407,
 	VREvent_SceneApplicationUsingWrongGraphicsAdapter = 408,
 	VREvent_ActionBindingReloaded = 409,
 	VREvent_HideRenderModels = 410,
 	VREvent_ShowRenderModels = 411,
+	VREvent_SceneApplicationStateChanged = 412,
 	VREvent_ConsoleOpened = 420,
 	VREvent_ConsoleClosed = 421,
 	VREvent_OverlayShown = 500,
@@ -4204,7 +4166,6 @@ public enum EVREventType
 	VREvent_Notification_Destroyed = 603,
 	VREvent_Quit = 700,
 	VREvent_ProcessQuit = 701,
-	VREvent_QuitAborted_UserPrompt = 702,
 	VREvent_QuitAcknowledged = 703,
 	VREvent_DriverRequestedQuit = 704,
 	VREvent_RestartRequested = 705,
@@ -4244,16 +4205,10 @@ public enum EVREventType
 	VREvent_KeyboardClosed = 1200,
 	VREvent_KeyboardCharInput = 1201,
 	VREvent_KeyboardDone = 1202,
-	VREvent_ApplicationTransitionStarted = 1300,
-	VREvent_ApplicationTransitionAborted = 1301,
-	VREvent_ApplicationTransitionNewAppStarted = 1302,
 	VREvent_ApplicationListUpdated = 1303,
 	VREvent_ApplicationMimeTypeLoad = 1304,
-	VREvent_ApplicationTransitionNewAppLaunchComplete = 1305,
 	VREvent_ProcessConnected = 1306,
 	VREvent_ProcessDisconnected = 1307,
-	VREvent_Compositor_MirrorWindowShown = 1400,
-	VREvent_Compositor_MirrorWindowHidden = 1401,
 	VREvent_Compositor_ChaperoneBoundsShown = 1410,
 	VREvent_Compositor_ChaperoneBoundsHidden = 1411,
 	VREvent_Compositor_DisplayDisconnected = 1412,
@@ -4262,6 +4217,7 @@ public enum EVREventType
 	VREvent_Compositor_ApplicationNotResponding = 1415,
 	VREvent_Compositor_ApplicationResumed = 1416,
 	VREvent_Compositor_OutOfVideoMemory = 1417,
+	VREvent_Compositor_DisplayModeNotSupported = 1418,
 	VREvent_TrackedCamera_StartVideoStream = 1500,
 	VREvent_TrackedCamera_StopVideoStream = 1501,
 	VREvent_TrackedCamera_PauseVideoStream = 1502,
@@ -4285,6 +4241,8 @@ public enum EVREventType
 	VREvent_SpatialAnchors_RequestPoseUpdate = 1802,
 	VREvent_SpatialAnchors_RequestDescriptorUpdate = 1803,
 	VREvent_SystemReport_Started = 1900,
+	VREvent_Monitor_ShowHeadsetView = 2000,
+	VREvent_Monitor_HideHeadsetView = 2001,
 	VREvent_VendorSpecific_Reserved_Start = 10000,
 	VREvent_VendorSpecific_Reserved_End = 19999,
 }
@@ -4295,6 +4253,7 @@ public enum EDeviceActivityLevel
 	k_EDeviceActivityLevel_UserInteraction = 1,
 	k_EDeviceActivityLevel_UserInteraction_Timeout = 2,
 	k_EDeviceActivityLevel_Standby = 3,
+	k_EDeviceActivityLevel_Idle_Timeout = 4,
 }
 public enum EVRButtonId
 {
@@ -4530,6 +4489,7 @@ public enum EVRInitError
 	Init_AlreadyRunning = 143,
 	Init_FailedForVrMonitor = 144,
 	Init_PropertyManagerInitFailed = 145,
+	Init_WebServerFailed = 146,
 	Driver_Failed = 200,
 	Driver_Unknown = 201,
 	Driver_HmdUnknown = 202,
@@ -4641,6 +4601,7 @@ public enum EVRInitError
 	Compositor_CreateLastFrameRenderTexture = 484,
 	Compositor_CreateMirrorOverlay = 485,
 	Compositor_FailedToCreateVirtualDisplayBackbuffer = 486,
+	Compositor_DisplayModeNotSupported = 487,
 	VendorSpecific_UnableToConnectToOculusRuntime = 1000,
 	VendorSpecific_WindowsNotInDevMode = 1001,
 	VendorSpecific_HmdFound_CantOpenDevice = 1101,
@@ -4777,14 +4738,16 @@ public enum EVRApplicationProperty
 	IsInstanced_Bool = 62,
 	IsInternal_Bool = 63,
 	WantsCompositorPauseInStandby_Bool = 64,
+	IsHidden_Bool = 65,
 	LastLaunchTime_Uint64 = 70,
 }
-public enum EVRApplicationTransitionState
+public enum EVRSceneApplicationState
 {
-	VRApplicationTransition_None = 0,
-	VRApplicationTransition_OldAppQuitSent = 10,
-	VRApplicationTransition_WaitingForExternalLaunch = 11,
-	VRApplicationTransition_NewAppLaunched = 20,
+	None = 0,
+	Starting = 1,
+	Quitting = 2,
+	Running = 3,
+	Waiting = 4,
 }
 public enum ChaperoneCalibrationState
 {
@@ -4844,25 +4807,21 @@ public enum VROverlayTransformType
 }
 public enum VROverlayFlags
 {
-	None = 0,
-	Curved = 1,
-	RGSS4X = 2,
-	NoDashboardTab = 3,
-	AcceptsGamepadEvents = 4,
-	ShowGamepadFocus = 5,
-	SendVRDiscreteScrollEvents = 6,
-	SendVRTouchpadEvents = 7,
-	ShowTouchPadScrollWheel = 8,
-	TransferOwnershipToInternalProcess = 9,
-	SideBySide_Parallel = 10,
-	SideBySide_Crossed = 11,
-	Panorama = 12,
-	StereoPanorama = 13,
-	SortWithNonSceneOverlays = 14,
-	VisibleInDashboard = 15,
-	MakeOverlaysInteractiveIfVisible = 16,
-	SendVRSmoothScrollEvents = 17,
-	ProtectedContent = 18,
+	NoDashboardTab = 8,
+	SendVRDiscreteScrollEvents = 64,
+	SendVRTouchpadEvents = 128,
+	ShowTouchPadScrollWheel = 256,
+	TransferOwnershipToInternalProcess = 512,
+	SideBySide_Parallel = 1024,
+	SideBySide_Crossed = 2048,
+	Panorama = 4096,
+	StereoPanorama = 8192,
+	SortWithNonSceneOverlays = 16384,
+	VisibleInDashboard = 32768,
+	MakeOverlaysInteractiveIfVisible = 65536,
+	SendVRSmoothScrollEvents = 131072,
+	ProtectedContent = 262144,
+	HideLaserIntersection = 524288,
 }
 public enum VRMessageOverlayResponse
 {
@@ -4885,14 +4844,6 @@ public enum EGamepadTextInputLineMode
 	k_EGamepadTextInputLineModeSingleLine = 0,
 	k_EGamepadTextInputLineModeMultipleLines = 1,
 }
-public enum EOverlayDirection
-{
-	Up = 0,
-	Down = 1,
-	Left = 2,
-	Right = 3,
-	Count = 4,
-}
 public enum EVROverlayIntersectionMaskPrimitiveType
 {
 	OverlayIntersectionPrimitiveType_Rectangle = 0,
@@ -5077,6 +5028,42 @@ public enum EVRDebugError
 	public float m9;
 	public float m10;
 	public float m11;
+#if UNITY_5_3_OR_NEWER
+
+	public Vector3 GetPosition()
+	{
+		return new Vector3(m3, m7, -m11);
+	}
+
+	public bool IsRotationValid()
+	{
+		return ((m2 != 0 || m6 != 0 || m10 != 0) && (m1 != 0 || m5 != 0 || m9 != 0));
+	}
+
+	public Quaternion GetRotation()
+	{
+		if (IsRotationValid())
+		{
+			float w = Mathf.Sqrt(Mathf.Max(0, 1 + m0 + m5 + m10)) / 2;
+			float x = Mathf.Sqrt(Mathf.Max(0, 1 + m0 - m5 - m10)) / 2;
+			float y = Mathf.Sqrt(Mathf.Max(0, 1 - m0 + m5 - m10)) / 2;
+			float z = Mathf.Sqrt(Mathf.Max(0, 1 - m0 - m5 + m10)) / 2;
+
+			_copysign(ref x, -m9 - -m6);
+			_copysign(ref y, -m2 - -m8);
+			_copysign(ref z, m4 - m1);
+
+			return new Quaternion(x, y, z, w);
+		}
+		return Quaternion.identity;
+	}
+
+	private static void _copysign(ref float sizeval, float signval)
+	{
+		if (signval > 0 != sizeval > 0)
+			sizeval = -sizeval;
+	}
+#endif
 }
 [StructLayout(LayoutKind.Sequential)] public struct HmdMatrix33_t
 {
@@ -5536,7 +5523,7 @@ public enum EVRDebugError
 	public uint nHeight;
 	public uint nBytesPerPixel;
 	public uint nFrameSequence;
-	public TrackedDevicePose_t standingTrackedDevicePose;
+	public TrackedDevicePose_t trackedDevicePose;
 	public ulong ulFrameExposureTime;
 }
 [StructLayout(LayoutKind.Sequential)] public struct Compositor_FrameTiming
@@ -6530,7 +6517,22 @@ public class OpenVR

 	public static string RuntimePath()
 	{
-		return OpenVRInterop.RuntimePath();
+		try
+		{
+			uint pathSize = 512;
+			uint requiredPathSize = 512;
+			System.Text.StringBuilder path = new System.Text.StringBuilder((int)pathSize);
+			bool success = OpenVRInterop.GetRuntimePath(path, pathSize, ref requiredPathSize);
+			if (success == false)
+			{
+				return null;
+			}
+
+			return path.ToString();
+		} catch
+		{
+			return OpenVRInterop.RuntimePath(); //this api is deprecated but here to support older unity versions
+		}
 	}

 	public static string GetStringForHmdError(EVRInitError error)
@@ -6593,13 +6595,13 @@ public class OpenVR
 	public const ulong k_ulOverlayHandleInvalid = 0;
 	public const uint k_unMaxDistortionFunctionParameters = 8;
 	public const uint k_unScreenshotHandleInvalid = 0;
-	public const string IVRSystem_Version = "IVRSystem_020";
+	public const string IVRSystem_Version = "IVRSystem_021";
 	public const string IVRExtendedDisplay_Version = "IVRExtendedDisplay_001";
-	public const string IVRTrackedCamera_Version = "IVRTrackedCamera_005";
+	public const string IVRTrackedCamera_Version = "IVRTrackedCamera_006";
 	public const uint k_unMaxApplicationKeyLength = 128;
 	public const string k_pch_MimeType_HomeApp = "vr/home";
 	public const string k_pch_MimeType_GameTheater = "vr/game_theater";
-	public const string IVRApplications_Version = "IVRApplications_006";
+	public const string IVRApplications_Version = "IVRApplications_007";
 	public const string IVRChaperone_Version = "IVRChaperone_003";
 	public const string IVRChaperoneSetup_Version = "IVRChaperoneSetup_006";
 	public const string IVRCompositor_Version = "IVRCompositor_022";
@@ -6607,7 +6609,7 @@ public class OpenVR
 	public const uint k_unVROverlayMaxNameLength = 128;
 	public const uint k_unMaxOverlayCount = 64;
 	public const uint k_unMaxOverlayIntersectionMaskPrimitivesCount = 32;
-	public const string IVROverlay_Version = "IVROverlay_019";
+	public const string IVROverlay_Version = "IVROverlay_021";
 	public const string k_pch_Controller_Component_GDC2015 = "gdc2015";
 	public const string k_pch_Controller_Component_Base = "base";
 	public const string k_pch_Controller_Component_Tip = "tip";
@@ -6635,19 +6637,25 @@ public class OpenVR
 	public const string k_pch_SteamVR_BackgroundDomeRadius_Float = "backgroundDomeRadius";
 	public const string k_pch_SteamVR_GridColor_String = "gridColor";
 	public const string k_pch_SteamVR_PlayAreaColor_String = "playAreaColor";
+	public const string k_pch_SteamVR_TrackingLossColor_String = "trackingLossColor";
 	public const string k_pch_SteamVR_ShowStage_Bool = "showStage";
 	public const string k_pch_SteamVR_ActivateMultipleDrivers_Bool = "activateMultipleDrivers";
 	public const string k_pch_SteamVR_UsingSpeakers_Bool = "usingSpeakers";
 	public const string k_pch_SteamVR_SpeakersForwardYawOffsetDegrees_Float = "speakersForwardYawOffsetDegrees";
 	public const string k_pch_SteamVR_BaseStationPowerManagement_Int32 = "basestationPowerManagement";
+	public const string k_pch_SteamVR_ShowBaseStationPowerManagementTip_Int32 = "ShowBaseStationPowerManagementTip";
 	public const string k_pch_SteamVR_NeverKillProcesses_Bool = "neverKillProcesses";
 	public const string k_pch_SteamVR_SupersampleScale_Float = "supersampleScale";
 	public const string k_pch_SteamVR_MaxRecommendedResolution_Int32 = "maxRecommendedResolution";
 	public const string k_pch_SteamVR_MotionSmoothing_Bool = "motionSmoothing";
 	public const string k_pch_SteamVR_MotionSmoothingOverride_Int32 = "motionSmoothingOverride";
+	public const string k_pch_SteamVR_DisableAsyncReprojection_Bool = "disableAsync";
 	public const string k_pch_SteamVR_ForceFadeOnBadTracking_Bool = "forceFadeOnBadTracking";
 	public const string k_pch_SteamVR_DefaultMirrorView_Int32 = "mirrorView";
-	public const string k_pch_SteamVR_ShowMirrorView_Bool = "showMirrorView";
+	public const string k_pch_SteamVR_ShowLegacyMirrorView_Bool = "showLegacyMirrorView";
+	public const string k_pch_SteamVR_MirrorViewVisibility_Bool = "showMirrorView";
+	public const string k_pch_SteamVR_MirrorViewDisplayMode_Int32 = "mirrorViewDisplayMode";
+	public const string k_pch_SteamVR_MirrorViewEye_Int32 = "mirrorViewEye";
 	public const string k_pch_SteamVR_MirrorViewGeometry_String = "mirrorViewGeometry";
 	public const string k_pch_SteamVR_MirrorViewGeometryMaximized_String = "mirrorViewGeometryMaximized";
 	public const string k_pch_SteamVR_StartMonitorFromAppLaunch = "startMonitorFromAppLaunch";
@@ -6676,6 +6684,9 @@ public class OpenVR
 	public const string k_pch_SteamVR_HmdDisplayColorGainR_Float = "hmdDisplayColorGainR";
 	public const string k_pch_SteamVR_HmdDisplayColorGainG_Float = "hmdDisplayColorGainG";
 	public const string k_pch_SteamVR_HmdDisplayColorGainB_Float = "hmdDisplayColorGainB";
+	public const string k_pch_SteamVR_CustomIconStyle_String = "customIconStyle";
+	public const string k_pch_SteamVR_CustomOffIconStyle_String = "customOffIconStyle";
+	public const string k_pch_SteamVR_CustomIconForceUpdate_String = "customIconForceUpdate";
 	public const string k_pch_DirectMode_Section = "direct_mode";
 	public const string k_pch_DirectMode_Enable_Bool = "enable";
 	public const string k_pch_DirectMode_Count_Int32 = "count";
@@ -6693,7 +6704,6 @@ public class OpenVR
 	public const string k_pch_Lighthouse_PowerManagedBaseStations2_String = "PowerManagedBaseStations2";
 	public const string k_pch_Lighthouse_InactivityTimeoutForBaseStations_Int32 = "InactivityTimeoutForBaseStations";
 	public const string k_pch_Lighthouse_EnableImuFallback_Bool = "enableImuFallback";
-	public const string k_pch_Lighthouse_NewPairing_Bool = "newPairing";
 	public const string k_pch_Null_Section = "driver_null";
 	public const string k_pch_Null_SerialNumber_String = "serialNumber";
 	public const string k_pch_Null_ModelNumber_String = "modelNumber";
@@ -6737,6 +6747,7 @@ public class OpenVR
 	public const string k_pch_CollisionBounds_ColorGammaG_Int32 = "CollisionBoundsColorGammaG";
 	public const string k_pch_CollisionBounds_ColorGammaB_Int32 = "CollisionBoundsColorGammaB";
 	public const string k_pch_CollisionBounds_ColorGammaA_Int32 = "CollisionBoundsColorGammaA";
+	public const string k_pch_CollisionBounds_EnableDriverImport = "enableDriverBoundsImport";
 	public const string k_pch_Camera_Section = "camera";
 	public const string k_pch_Camera_EnableCamera_Bool = "enableCamera";
 	public const string k_pch_Camera_EnableCameraInDashboard_Bool = "enableCameraInDashboard";
@@ -6749,11 +6760,19 @@ public class OpenVR
 	public const string k_pch_Camera_BoundsStrength_Int32 = "cameraBoundsStrength";
 	public const string k_pch_Camera_RoomViewMode_Int32 = "cameraRoomViewMode";
 	public const string k_pch_audio_Section = "audio";
-	public const string k_pch_audio_OnPlaybackDevice_String = "onPlaybackDevice";
-	public const string k_pch_audio_OnRecordDevice_String = "onRecordDevice";
-	public const string k_pch_audio_OnPlaybackMirrorDevice_String = "onPlaybackMirrorDevice";
-	public const string k_pch_audio_OffPlaybackDevice_String = "offPlaybackDevice";
-	public const string k_pch_audio_OffRecordDevice_String = "offRecordDevice";
+	public const string k_pch_audio_SetOsDefaultPlaybackDevice_Bool = "setOsDefaultPlaybackDevice";
+	public const string k_pch_audio_EnablePlaybackDeviceOverride_Bool = "enablePlaybackDeviceOverride";
+	public const string k_pch_audio_PlaybackDeviceOverride_String = "playbackDeviceOverride";
+	public const string k_pch_audio_PlaybackDeviceOverrideName_String = "playbackDeviceOverrideName";
+	public const string k_pch_audio_SetOsDefaultRecordingDevice_Bool = "setOsDefaultRecordingDevice";
+	public const string k_pch_audio_EnableRecordingDeviceOverride_Bool = "enableRecordingDeviceOverride";
+	public const string k_pch_audio_RecordingDeviceOverride_String = "recordingDeviceOverride";
+	public const string k_pch_audio_RecordingDeviceOverrideName_String = "recordingDeviceOverrideName";
+	public const string k_pch_audio_EnablePlaybackMirror_Bool = "enablePlaybackMirror";
+	public const string k_pch_audio_PlaybackMirrorDevice_String = "playbackMirrorDevice";
+	public const string k_pch_audio_PlaybackMirrorDeviceName_String = "playbackMirrorDeviceName";
+	public const string k_pch_audio_OldPlaybackMirrorDevice_String = "onPlaybackMirrorDevice";
+	public const string k_pch_audio_LastHmdPlaybackDeviceId_String = "lastHmdPlaybackDeviceId";
 	public const string k_pch_audio_VIVEHDMIGain = "viveHDMIGain";
 	public const string k_pch_Power_Section = "power";
 	public const string k_pch_Power_PowerOffOnExit_Bool = "powerOffOnExit";
@@ -6765,16 +6784,12 @@ public class OpenVR
 	public const string k_pch_Dashboard_Section = "dashboard";
 	public const string k_pch_Dashboard_EnableDashboard_Bool = "enableDashboard";
 	public const string k_pch_Dashboard_ArcadeMode_Bool = "arcadeMode";
-	public const string k_pch_Dashboard_UseWebDashboard = "useWebDashboard";
+	public const string k_pch_Dashboard_UseWebKeyboard = "useWebKeyboard";
 	public const string k_pch_Dashboard_UseWebSettings = "useWebSettings";
-	public const string k_pch_Dashboard_UseWebIPD = "useWebIPD";
-	public const string k_pch_Dashboard_UseWebPowerMenu = "useWebPowerMenu";
 	public const string k_pch_modelskin_Section = "modelskins";
 	public const string k_pch_Driver_Enable_Bool = "enable";
 	public const string k_pch_Driver_LoadPriority_Int32 = "loadPriority";
 	public const string k_pch_WebInterface_Section = "WebInterface";
-	public const string k_pch_WebInterface_WebEnable_Bool = "WebEnable";
-	public const string k_pch_WebInterface_WebPort_String = "WebPort";
 	public const string k_pch_VRWebHelper_Section = "VRWebHelper";
 	public const string k_pch_VRWebHelper_DebuggerEnabled_Bool = "DebuggerEnabled";
 	public const string k_pch_VRWebHelper_DebuggerPort_Int32 = "DebuggerPort";
@@ -220,11 +220,15 @@
 	,{"name": "Prop_ExpectedControllerType_String","value": "2074"}
 	,{"name": "Prop_HmdTrackingStyle_Int32","value": "2075"}
 	,{"name": "Prop_DriverProvidedChaperoneVisibility_Bool","value": "2076"}
+	,{"name": "Prop_HmdProvidesDisplaySettings_Bool","value": "2077"}
 	,{"name": "Prop_DisplayAvailableFrameRates_Float_Array","value": "2080"}
 	,{"name": "Prop_DisplaySupportsMultipleFramerates_Bool","value": "2081"}
 	,{"name": "Prop_DisplayColorMultLeft_Vector3","value": "2082"}
 	,{"name": "Prop_DisplayColorMultRight_Vector3","value": "2083"}
 	,{"name": "Prop_DashboardLayoutPathName_String","value": "2090"}
+	,{"name": "Prop_DashboardScale_Float","value": "2091"}
+	,{"name": "Prop_IpdUIRangeMinMeters_Float","value": "2100"}
+	,{"name": "Prop_IpdUIRangeMaxMeters_Float","value": "2101"}
 	,{"name": "Prop_DriverRequestedMuraCorrectionMode_Int32","value": "2200"}
 	,{"name": "Prop_DriverRequestedMuraFeather_InnerLeft_Int32","value": "2201"}
 	,{"name": "Prop_DriverRequestedMuraFeather_InnerRight_Int32","value": "2202"}
@@ -234,6 +238,9 @@
 	,{"name": "Prop_DriverRequestedMuraFeather_OuterRight_Int32","value": "2206"}
 	,{"name": "Prop_DriverRequestedMuraFeather_OuterTop_Int32","value": "2207"}
 	,{"name": "Prop_DriverRequestedMuraFeather_OuterBottom_Int32","value": "2208"}
+	,{"name": "Prop_Audio_DefaultPlaybackDeviceId_String","value": "2300"}
+	,{"name": "Prop_Audio_DefaultRecordingDeviceId_String","value": "2301"}
+	,{"name": "Prop_Audio_DefaultPlaybackDeviceVolume_Float","value": "2302"}
 	,{"name": "Prop_AttachedDeviceId_String","value": "3000"}
 	,{"name": "Prop_SupportedButtons_Uint64","value": "3001"}
 	,{"name": "Prop_Axis0Type_Int32","value": "3002"}
@@ -260,9 +267,11 @@
 	,{"name": "Prop_NamedIconPathDeviceNotReady_String","value": "5006"}
 	,{"name": "Prop_NamedIconPathDeviceStandby_String","value": "5007"}
 	,{"name": "Prop_NamedIconPathDeviceAlertLow_String","value": "5008"}
+	,{"name": "Prop_NamedIconPathDeviceStandbyAlert_String","value": "5009"}
 	,{"name": "Prop_DisplayHiddenArea_Binary_Start","value": "5100"}
 	,{"name": "Prop_DisplayHiddenArea_Binary_End","value": "5150"}
 	,{"name": "Prop_ParentContainer","value": "5151"}
+	,{"name": "Prop_OverrideContainer_Uint64","value": "5152"}
 	,{"name": "Prop_UserConfigPath_String","value": "6000"}
 	,{"name": "Prop_InstallPath_String","value": "6001"}
 	,{"name": "Prop_HasDisplayComponent_Bool","value": "6002"}
@@ -358,16 +367,14 @@
 	,{"name": "VREvent_ScrollSmooth","value": "309"}
 	,{"name": "VREvent_InputFocusCaptured","value": "400"}
 	,{"name": "VREvent_InputFocusReleased","value": "401"}
-	,{"name": "VREvent_SceneFocusLost","value": "402"}
-	,{"name": "VREvent_SceneFocusGained","value": "403"}
 	,{"name": "VREvent_SceneApplicationChanged","value": "404"}
 	,{"name": "VREvent_SceneFocusChanged","value": "405"}
 	,{"name": "VREvent_InputFocusChanged","value": "406"}
-	,{"name": "VREvent_SceneApplicationSecondaryRenderingStarted","value": "407"}
 	,{"name": "VREvent_SceneApplicationUsingWrongGraphicsAdapter","value": "408"}
 	,{"name": "VREvent_ActionBindingReloaded","value": "409"}
 	,{"name": "VREvent_HideRenderModels","value": "410"}
 	,{"name": "VREvent_ShowRenderModels","value": "411"}
+	,{"name": "VREvent_SceneApplicationStateChanged","value": "412"}
 	,{"name": "VREvent_ConsoleOpened","value": "420"}
 	,{"name": "VREvent_ConsoleClosed","value": "421"}
 	,{"name": "VREvent_OverlayShown","value": "500"}
@@ -403,7 +410,6 @@
 	,{"name": "VREvent_Notification_Destroyed","value": "603"}
 	,{"name": "VREvent_Quit","value": "700"}
 	,{"name": "VREvent_ProcessQuit","value": "701"}
-	,{"name": "VREvent_QuitAborted_UserPrompt","value": "702"}
 	,{"name": "VREvent_QuitAcknowledged","value": "703"}
 	,{"name": "VREvent_DriverRequestedQuit","value": "704"}
 	,{"name": "VREvent_RestartRequested","value": "705"}
@@ -443,16 +449,10 @@
 	,{"name": "VREvent_KeyboardClosed","value": "1200"}
 	,{"name": "VREvent_KeyboardCharInput","value": "1201"}
 	,{"name": "VREvent_KeyboardDone","value": "1202"}
-	,{"name": "VREvent_ApplicationTransitionStarted","value": "1300"}
-	,{"name": "VREvent_ApplicationTransitionAborted","value": "1301"}
-	,{"name": "VREvent_ApplicationTransitionNewAppStarted","value": "1302"}
 	,{"name": "VREvent_ApplicationListUpdated","value": "1303"}
 	,{"name": "VREvent_ApplicationMimeTypeLoad","value": "1304"}
-	,{"name": "VREvent_ApplicationTransitionNewAppLaunchComplete","value": "1305"}
 	,{"name": "VREvent_ProcessConnected","value": "1306"}
 	,{"name": "VREvent_ProcessDisconnected","value": "1307"}
-	,{"name": "VREvent_Compositor_MirrorWindowShown","value": "1400"}
-	,{"name": "VREvent_Compositor_MirrorWindowHidden","value": "1401"}
 	,{"name": "VREvent_Compositor_ChaperoneBoundsShown","value": "1410"}
 	,{"name": "VREvent_Compositor_ChaperoneBoundsHidden","value": "1411"}
 	,{"name": "VREvent_Compositor_DisplayDisconnected","value": "1412"}
@@ -461,6 +461,7 @@
 	,{"name": "VREvent_Compositor_ApplicationNotResponding","value": "1415"}
 	,{"name": "VREvent_Compositor_ApplicationResumed","value": "1416"}
 	,{"name": "VREvent_Compositor_OutOfVideoMemory","value": "1417"}
+	,{"name": "VREvent_Compositor_DisplayModeNotSupported","value": "1418"}
 	,{"name": "VREvent_TrackedCamera_StartVideoStream","value": "1500"}
 	,{"name": "VREvent_TrackedCamera_StopVideoStream","value": "1501"}
 	,{"name": "VREvent_TrackedCamera_PauseVideoStream","value": "1502"}
@@ -484,6 +485,8 @@
 	,{"name": "VREvent_SpatialAnchors_RequestPoseUpdate","value": "1802"}
 	,{"name": "VREvent_SpatialAnchors_RequestDescriptorUpdate","value": "1803"}
 	,{"name": "VREvent_SystemReport_Started","value": "1900"}
+	,{"name": "VREvent_Monitor_ShowHeadsetView","value": "2000"}
+	,{"name": "VREvent_Monitor_HideHeadsetView","value": "2001"}
 	,{"name": "VREvent_VendorSpecific_Reserved_Start","value": "10000"}
 	,{"name": "VREvent_VendorSpecific_Reserved_End","value": "19999"}
 ]}
@@ -493,6 +496,7 @@
 	,{"name": "k_EDeviceActivityLevel_UserInteraction","value": "1"}
 	,{"name": "k_EDeviceActivityLevel_UserInteraction_Timeout","value": "2"}
 	,{"name": "k_EDeviceActivityLevel_Standby","value": "3"}
+	,{"name": "k_EDeviceActivityLevel_Idle_Timeout","value": "4"}
 ]}
 ,	{"enumname": "vr::EVRButtonId","values": [ 
 	{"name": "k_EButton_System","value": "0"}
@@ -710,6 +714,7 @@
 	,{"name": "VRInitError_Init_AlreadyRunning","value": "143"}
 	,{"name": "VRInitError_Init_FailedForVrMonitor","value": "144"}
 	,{"name": "VRInitError_Init_PropertyManagerInitFailed","value": "145"}
+	,{"name": "VRInitError_Init_WebServerFailed","value": "146"}
 	,{"name": "VRInitError_Driver_Failed","value": "200"}
 	,{"name": "VRInitError_Driver_Unknown","value": "201"}
 	,{"name": "VRInitError_Driver_HmdUnknown","value": "202"}
@@ -821,6 +826,7 @@
 	,{"name": "VRInitError_Compositor_CreateLastFrameRenderTexture","value": "484"}
 	,{"name": "VRInitError_Compositor_CreateMirrorOverlay","value": "485"}
 	,{"name": "VRInitError_Compositor_FailedToCreateVirtualDisplayBackbuffer","value": "486"}
+	,{"name": "VRInitError_Compositor_DisplayModeNotSupported","value": "487"}
 	,{"name": "VRInitError_VendorSpecific_UnableToConnectToOculusRuntime","value": "1000"}
 	,{"name": "VRInitError_VendorSpecific_WindowsNotInDevMode","value": "1001"}
 	,{"name": "VRInitError_VendorSpecific_HmdFound_CantOpenDevice","value": "1101"}
@@ -946,13 +952,15 @@
 	,{"name": "VRApplicationProperty_IsInstanced_Bool","value": "62"}
 	,{"name": "VRApplicationProperty_IsInternal_Bool","value": "63"}
 	,{"name": "VRApplicationProperty_WantsCompositorPauseInStandby_Bool","value": "64"}
+	,{"name": "VRApplicationProperty_IsHidden_Bool","value": "65"}
 	,{"name": "VRApplicationProperty_LastLaunchTime_Uint64","value": "70"}
 ]}
-,	{"enumname": "vr::EVRApplicationTransitionState","values": [ 
-	{"name": "VRApplicationTransition_None","value": "0"}
-	,{"name": "VRApplicationTransition_OldAppQuitSent","value": "10"}
-	,{"name": "VRApplicationTransition_WaitingForExternalLaunch","value": "11"}
-	,{"name": "VRApplicationTransition_NewAppLaunched","value": "20"}
+,	{"enumname": "vr::EVRSceneApplicationState","values": [ 
+	{"name": "EVRSceneApplicationState_None","value": "0"}
+	,{"name": "EVRSceneApplicationState_Starting","value": "1"}
+	,{"name": "EVRSceneApplicationState_Quitting","value": "2"}
+	,{"name": "EVRSceneApplicationState_Running","value": "3"}
+	,{"name": "EVRSceneApplicationState_Waiting","value": "4"}
 ]}
 ,	{"enumname": "vr::ChaperoneCalibrationState","values": [ 
 	{"name": "ChaperoneCalibrationState_OK","value": "1"}
@@ -1004,25 +1012,21 @@
 	,{"name": "VROverlayTransform_TrackedComponent","value": "3"}
 ]}
 ,	{"enumname": "vr::VROverlayFlags","values": [ 
-	{"name": "VROverlayFlags_None","value": "0"}
-	,{"name": "VROverlayFlags_Curved","value": "1"}
-	,{"name": "VROverlayFlags_RGSS4X","value": "2"}
-	,{"name": "VROverlayFlags_NoDashboardTab","value": "3"}
-	,{"name": "VROverlayFlags_AcceptsGamepadEvents","value": "4"}
-	,{"name": "VROverlayFlags_ShowGamepadFocus","value": "5"}
-	,{"name": "VROverlayFlags_SendVRDiscreteScrollEvents","value": "6"}
-	,{"name": "VROverlayFlags_SendVRTouchpadEvents","value": "7"}
-	,{"name": "VROverlayFlags_ShowTouchPadScrollWheel","value": "8"}
-	,{"name": "VROverlayFlags_TransferOwnershipToInternalProcess","value": "9"}
-	,{"name": "VROverlayFlags_SideBySide_Parallel","value": "10"}
-	,{"name": "VROverlayFlags_SideBySide_Crossed","value": "11"}
-	,{"name": "VROverlayFlags_Panorama","value": "12"}
-	,{"name": "VROverlayFlags_StereoPanorama","value": "13"}
-	,{"name": "VROverlayFlags_SortWithNonSceneOverlays","value": "14"}
-	,{"name": "VROverlayFlags_VisibleInDashboard","value": "15"}
-	,{"name": "VROverlayFlags_MakeOverlaysInteractiveIfVisible","value": "16"}
-	,{"name": "VROverlayFlags_SendVRSmoothScrollEvents","value": "17"}
-	,{"name": "VROverlayFlags_ProtectedContent","value": "18"}
+	{"name": "VROverlayFlags_NoDashboardTab","value": "8"}
+	,{"name": "VROverlayFlags_SendVRDiscreteScrollEvents","value": "64"}
+	,{"name": "VROverlayFlags_SendVRTouchpadEvents","value": "128"}
+	,{"name": "VROverlayFlags_ShowTouchPadScrollWheel","value": "256"}
+	,{"name": "VROverlayFlags_TransferOwnershipToInternalProcess","value": "512"}
+	,{"name": "VROverlayFlags_SideBySide_Parallel","value": "1024"}
+	,{"name": "VROverlayFlags_SideBySide_Crossed","value": "2048"}
+	,{"name": "VROverlayFlags_Panorama","value": "4096"}
+	,{"name": "VROverlayFlags_StereoPanorama","value": "8192"}
+	,{"name": "VROverlayFlags_SortWithNonSceneOverlays","value": "16384"}
+	,{"name": "VROverlayFlags_VisibleInDashboard","value": "32768"}
+	,{"name": "VROverlayFlags_MakeOverlaysInteractiveIfVisible","value": "65536"}
+	,{"name": "VROverlayFlags_SendVRSmoothScrollEvents","value": "131072"}
+	,{"name": "VROverlayFlags_ProtectedContent","value": "262144"}
+	,{"name": "VROverlayFlags_HideLaserIntersection","value": "524288"}
 ]}
 ,	{"enumname": "vr::VRMessageOverlayResponse","values": [ 
 	{"name": "VRMessageOverlayResponse_ButtonPress_0","value": "0"}
@@ -1042,13 +1046,6 @@
 	{"name": "k_EGamepadTextInputLineModeSingleLine","value": "0"}
 	,{"name": "k_EGamepadTextInputLineModeMultipleLines","value": "1"}
 ]}
-,	{"enumname": "vr::EOverlayDirection","values": [ 
-	{"name": "OverlayDirection_Up","value": "0"}
-	,{"name": "OverlayDirection_Down","value": "1"}
-	,{"name": "OverlayDirection_Left","value": "2"}
-	,{"name": "OverlayDirection_Right","value": "3"}
-	,{"name": "OverlayDirection_Count","value": "4"}
-]}
 ,	{"enumname": "vr::EVROverlayIntersectionMaskPrimitiveType","values": [ 
 	{"name": "OverlayIntersectionPrimitiveType_Rectangle","value": "0"}
 	,{"name": "OverlayIntersectionPrimitiveType_Circle","value": "1"}
@@ -1242,11 +1239,11 @@
 ,{
 	"constname": "k_unScreenshotHandleInvalid","consttype": "const uint32_t", "constval": "0"}
 ,{
-	"constname": "IVRSystem_Version","consttype": "const char *const", "constval": "IVRSystem_020"}
+	"constname": "IVRSystem_Version","consttype": "const char *const", "constval": "IVRSystem_021"}
 ,{
 	"constname": "IVRExtendedDisplay_Version","consttype": "const char *const", "constval": "IVRExtendedDisplay_001"}
 ,{
-	"constname": "IVRTrackedCamera_Version","consttype": "const char *const", "constval": "IVRTrackedCamera_005"}
+	"constname": "IVRTrackedCamera_Version","consttype": "const char *const", "constval": "IVRTrackedCamera_006"}
 ,{
 	"constname": "k_unMaxApplicationKeyLength","consttype": "const uint32_t", "constval": "128"}
 ,{
@@ -1254,7 +1251,7 @@
 ,{
 	"constname": "k_pch_MimeType_GameTheater","consttype": "const char *const", "constval": "vr/game_theater"}
 ,{
-	"constname": "IVRApplications_Version","consttype": "const char *const", "constval": "IVRApplications_006"}
+	"constname": "IVRApplications_Version","consttype": "const char *const", "constval": "IVRApplications_007"}
 ,{
 	"constname": "IVRChaperone_Version","consttype": "const char *const", "constval": "IVRChaperone_003"}
 ,{
@@ -1270,7 +1267,7 @@
 ,{
 	"constname": "k_unMaxOverlayIntersectionMaskPrimitivesCount","consttype": "const uint32_t", "constval": "32"}
 ,{
-	"constname": "IVROverlay_Version","consttype": "const char *const", "constval": "IVROverlay_019"}
+	"constname": "IVROverlay_Version","consttype": "const char *const", "constval": "IVROverlay_021"}
 ,{
 	"constname": "k_pch_Controller_Component_GDC2015","consttype": "const char *const", "constval": "gdc2015"}
 ,{
@@ -1325,6 +1322,8 @@
 	"constname": "k_pch_SteamVR_GridColor_String","consttype": "const char *const", "constval": "gridColor"}
 ,{
 	"constname": "k_pch_SteamVR_PlayAreaColor_String","consttype": "const char *const", "constval": "playAreaColor"}
+,{
+	"constname": "k_pch_SteamVR_TrackingLossColor_String","consttype": "const char *const", "constval": "trackingLossColor"}
 ,{
 	"constname": "k_pch_SteamVR_ShowStage_Bool","consttype": "const char *const", "constval": "showStage"}
 ,{
@@ -1335,6 +1334,8 @@
 	"constname": "k_pch_SteamVR_SpeakersForwardYawOffsetDegrees_Float","consttype": "const char *const", "constval": "speakersForwardYawOffsetDegrees"}
 ,{
 	"constname": "k_pch_SteamVR_BaseStationPowerManagement_Int32","consttype": "const char *const", "constval": "basestationPowerManagement"}
+,{
+	"constname": "k_pch_SteamVR_ShowBaseStationPowerManagementTip_Int32","consttype": "const char *const", "constval": "ShowBaseStationPowerManagementTip"}
 ,{
 	"constname": "k_pch_SteamVR_NeverKillProcesses_Bool","consttype": "const char *const", "constval": "neverKillProcesses"}
 ,{
@@ -1345,12 +1346,20 @@
 	"constname": "k_pch_SteamVR_MotionSmoothing_Bool","consttype": "const char *const", "constval": "motionSmoothing"}
 ,{
 	"constname": "k_pch_SteamVR_MotionSmoothingOverride_Int32","consttype": "const char *const", "constval": "motionSmoothingOverride"}
+,{
+	"constname": "k_pch_SteamVR_DisableAsyncReprojection_Bool","consttype": "const char *const", "constval": "disableAsync"}
 ,{
 	"constname": "k_pch_SteamVR_ForceFadeOnBadTracking_Bool","consttype": "const char *const", "constval": "forceFadeOnBadTracking"}
 ,{
 	"constname": "k_pch_SteamVR_DefaultMirrorView_Int32","consttype": "const char *const", "constval": "mirrorView"}
 ,{
-	"constname": "k_pch_SteamVR_ShowMirrorView_Bool","consttype": "const char *const", "constval": "showMirrorView"}
+	"constname": "k_pch_SteamVR_ShowLegacyMirrorView_Bool","consttype": "const char *const", "constval": "showLegacyMirrorView"}
+,{
+	"constname": "k_pch_SteamVR_MirrorViewVisibility_Bool","consttype": "const char *const", "constval": "showMirrorView"}
+,{
+	"constname": "k_pch_SteamVR_MirrorViewDisplayMode_Int32","consttype": "const char *const", "constval": "mirrorViewDisplayMode"}
+,{
+	"constname": "k_pch_SteamVR_MirrorViewEye_Int32","consttype": "const char *const", "constval": "mirrorViewEye"}
 ,{
 	"constname": "k_pch_SteamVR_MirrorViewGeometry_String","consttype": "const char *const", "constval": "mirrorViewGeometry"}
 ,{
@@ -1407,6 +1416,12 @@
 	"constname": "k_pch_SteamVR_HmdDisplayColorGainG_Float","consttype": "const char *const", "constval": "hmdDisplayColorGainG"}
 ,{
 	"constname": "k_pch_SteamVR_HmdDisplayColorGainB_Float","consttype": "const char *const", "constval": "hmdDisplayColorGainB"}
+,{
+	"constname": "k_pch_SteamVR_CustomIconStyle_String","consttype": "const char *const", "constval": "customIconStyle"}
+,{
+	"constname": "k_pch_SteamVR_CustomOffIconStyle_String","consttype": "const char *const", "constval": "customOffIconStyle"}
+,{
+	"constname": "k_pch_SteamVR_CustomIconForceUpdate_String","consttype": "const char *const", "constval": "customIconForceUpdate"}
 ,{
 	"constname": "k_pch_DirectMode_Section","consttype": "const char *const", "constval": "direct_mode"}
 ,{
@@ -1441,8 +1456,6 @@
 	"constname": "k_pch_Lighthouse_InactivityTimeoutForBaseStations_Int32","consttype": "const char *const", "constval": "InactivityTimeoutForBaseStations"}
 ,{
 	"constname": "k_pch_Lighthouse_EnableImuFallback_Bool","consttype": "const char *const", "constval": "enableImuFallback"}
-,{
-	"constname": "k_pch_Lighthouse_NewPairing_Bool","consttype": "const char *const", "constval": "newPairing"}
 ,{
 	"constname": "k_pch_Null_Section","consttype": "const char *const", "constval": "driver_null"}
 ,{
@@ -1529,6 +1542,8 @@
 	"constname": "k_pch_CollisionBounds_ColorGammaB_Int32","consttype": "const char *const", "constval": "CollisionBoundsColorGammaB"}
 ,{
 	"constname": "k_pch_CollisionBounds_ColorGammaA_Int32","consttype": "const char *const", "constval": "CollisionBoundsColorGammaA"}
+,{
+	"constname": "k_pch_CollisionBounds_EnableDriverImport","consttype": "const char *const", "constval": "enableDriverBoundsImport"}
 ,{
 	"constname": "k_pch_Camera_Section","consttype": "const char *const", "constval": "camera"}
 ,{
@@ -1554,15 +1569,31 @@
 ,{
 	"constname": "k_pch_audio_Section","consttype": "const char *const", "constval": "audio"}
 ,{
-	"constname": "k_pch_audio_OnPlaybackDevice_String","consttype": "const char *const", "constval": "onPlaybackDevice"}
+	"constname": "k_pch_audio_SetOsDefaultPlaybackDevice_Bool","consttype": "const char *const", "constval": "setOsDefaultPlaybackDevice"}
 ,{
-	"constname": "k_pch_audio_OnRecordDevice_String","consttype": "const char *const", "constval": "onRecordDevice"}
+	"constname": "k_pch_audio_EnablePlaybackDeviceOverride_Bool","consttype": "const char *const", "constval": "enablePlaybackDeviceOverride"}
 ,{
-	"constname": "k_pch_audio_OnPlaybackMirrorDevice_String","consttype": "const char *const", "constval": "onPlaybackMirrorDevice"}
+	"constname": "k_pch_audio_PlaybackDeviceOverride_String","consttype": "const char *const", "constval": "playbackDeviceOverride"}
 ,{
-	"constname": "k_pch_audio_OffPlaybackDevice_String","consttype": "const char *const", "constval": "offPlaybackDevice"}
+	"constname": "k_pch_audio_PlaybackDeviceOverrideName_String","consttype": "const char *const", "constval": "playbackDeviceOverrideName"}
 ,{
-	"constname": "k_pch_audio_OffRecordDevice_String","consttype": "const char *const", "constval": "offRecordDevice"}
+	"constname": "k_pch_audio_SetOsDefaultRecordingDevice_Bool","consttype": "const char *const", "constval": "setOsDefaultRecordingDevice"}
+,{
+	"constname": "k_pch_audio_EnableRecordingDeviceOverride_Bool","consttype": "const char *const", "constval": "enableRecordingDeviceOverride"}
+,{
+	"constname": "k_pch_audio_RecordingDeviceOverride_String","consttype": "const char *const", "constval": "recordingDeviceOverride"}
+,{
+	"constname": "k_pch_audio_RecordingDeviceOverrideName_String","consttype": "const char *const", "constval": "recordingDeviceOverrideName"}
+,{
+	"constname": "k_pch_audio_EnablePlaybackMirror_Bool","consttype": "const char *const", "constval": "enablePlaybackMirror"}
+,{
+	"constname": "k_pch_audio_PlaybackMirrorDevice_String","consttype": "const char *const", "constval": "playbackMirrorDevice"}
+,{
+	"constname": "k_pch_audio_PlaybackMirrorDeviceName_String","consttype": "const char *const", "constval": "playbackMirrorDeviceName"}
+,{
+	"constname": "k_pch_audio_OldPlaybackMirrorDevice_String","consttype": "const char *const", "constval": "onPlaybackMirrorDevice"}
+,{
+	"constname": "k_pch_audio_LastHmdPlaybackDeviceId_String","consttype": "const char *const", "constval": "lastHmdPlaybackDeviceId"}
 ,{
 	"constname": "k_pch_audio_VIVEHDMIGain","consttype": "const char *const", "constval": "viveHDMIGain"}
 ,{
@@ -1586,13 +1617,9 @@
 ,{
 	"constname": "k_pch_Dashboard_ArcadeMode_Bool","consttype": "const char *const", "constval": "arcadeMode"}
 ,{
-	"constname": "k_pch_Dashboard_UseWebDashboard","consttype": "const char *const", "constval": "useWebDashboard"}
+	"constname": "k_pch_Dashboard_UseWebKeyboard","consttype": "const char *const", "constval": "useWebKeyboard"}
 ,{
 	"constname": "k_pch_Dashboard_UseWebSettings","consttype": "const char *const", "constval": "useWebSettings"}
-,{
-	"constname": "k_pch_Dashboard_UseWebIPD","consttype": "const char *const", "constval": "useWebIPD"}
-,{
-	"constname": "k_pch_Dashboard_UseWebPowerMenu","consttype": "const char *const", "constval": "useWebPowerMenu"}
 ,{
 	"constname": "k_pch_modelskin_Section","consttype": "const char *const", "constval": "modelskins"}
 ,{
@@ -1601,10 +1628,6 @@
 	"constname": "k_pch_Driver_LoadPriority_Int32","consttype": "const char *const", "constval": "loadPriority"}
 ,{
 	"constname": "k_pch_WebInterface_Section","consttype": "const char *const", "constval": "WebInterface"}
-,{
-	"constname": "k_pch_WebInterface_WebEnable_Bool","consttype": "const char *const", "constval": "WebEnable"}
-,{
-	"constname": "k_pch_WebInterface_WebPort_String","consttype": "const char *const", "constval": "WebPort"}
 ,{
 	"constname": "k_pch_VRWebHelper_Section","consttype": "const char *const", "constval": "VRWebHelper"}
 ,{
@@ -1921,7 +1944,7 @@
 { "fieldname": "nHeight", "fieldtype": "uint32_t"},
 { "fieldname": "nBytesPerPixel", "fieldtype": "uint32_t"},
 { "fieldname": "nFrameSequence", "fieldtype": "uint32_t"},
-{ "fieldname": "standingTrackedDevicePose", "fieldtype": "struct vr::TrackedDevicePose_t"},
+{ "fieldname": "trackedDevicePose", "fieldtype": "struct vr::TrackedDevicePose_t"},
 { "fieldname": "ulFrameExposureTime", "fieldtype": "uint64_t"}]}
 ,{"struct": "vr::Compositor_FrameTiming","fields": [
 { "fieldname": "m_nSize", "fieldtype": "uint32_t"},
@@ -2477,11 +2500,6 @@
 	"methodname": "AcknowledgeQuit_Exiting",
 	"returntype": "void"
 }
-,{
-	"classname": "vr::IVRSystem",
-	"methodname": "AcknowledgeQuit_UserPrompt",
-	"returntype": "void"
-}
 ,{
 	"classname": "vr::IVRSystem",
 	"methodname": "GetAppContainerFilePaths",
@@ -2658,6 +2676,19 @@
 {	"paramname": "glTextureId" ,"paramtype": "vr::glUInt_t"}
 	 ]
 }
+,{
+	"classname": "vr::IVRTrackedCamera",
+	"methodname": "SetCameraTrackingSpace",
+	"returntype": "void",
+	"params": [ 
+{	"paramname": "eUniverse" ,"paramtype": "vr::ETrackingUniverseOrigin"}
+	 ]
+}
+,{
+	"classname": "vr::IVRTrackedCamera",
+	"methodname": "GetCameraTrackingSpace",
+	"returntype": "vr::ETrackingUniverseOrigin"
+}
 ,{
 	"classname": "vr::IVRApplications",
 	"methodname": "AddApplicationManifest",
@@ -2886,8 +2917,8 @@
 }
 ,{
 	"classname": "vr::IVRApplications",
-	"methodname": "GetTransitionState",
-	"returntype": "vr::EVRApplicationTransitionState"
+	"methodname": "GetSceneApplicationState",
+	"returntype": "vr::EVRSceneApplicationState"
 }
 ,{
 	"classname": "vr::IVRApplications",
@@ -2899,17 +2930,12 @@
 }
 ,{
 	"classname": "vr::IVRApplications",
-	"methodname": "GetApplicationsTransitionStateNameFromEnum",
+	"methodname": "GetSceneApplicationStateNameFromEnum",
 	"returntype": "const char *",
 	"params": [ 
-{	"paramname": "state" ,"paramtype": "vr::EVRApplicationTransitionState"}
+{	"paramname": "state" ,"paramtype": "vr::EVRSceneApplicationState"}
 	 ]
 }
-,{
-	"classname": "vr::IVRApplications",
-	"methodname": "IsQuitUserPromptRequested",
-	"returntype": "bool"
-}
 ,{
 	"classname": "vr::IVRApplications",
 	"methodname": "LaunchInternalProcess",
@@ -3495,19 +3521,6 @@
 {	"paramname": "ulOverlayHandle" ,"paramtype": "vr::VROverlayHandle_t"}
 	 ]
 }
-,{
-	"classname": "vr::IVROverlay",
-	"methodname": "SetHighQualityOverlay",
-	"returntype": "vr::EVROverlayError",
-	"params": [ 
-{	"paramname": "ulOverlayHandle" ,"paramtype": "vr::VROverlayHandle_t"}
-	 ]
-}
-,{
-	"classname": "vr::IVROverlay",
-	"methodname": "GetHighQualityOverlay",
-	"returntype": "vr::VROverlayHandle_t"
-}
 ,{
 	"classname": "vr::IVROverlay",
 	"methodname": "GetOverlayKey",
@@ -3692,22 +3705,20 @@
 }
 ,{
 	"classname": "vr::IVROverlay",
-	"methodname": "SetOverlayAutoCurveDistanceRangeInMeters",
+	"methodname": "SetOverlayCurvature",
 	"returntype": "vr::EVROverlayError",
 	"params": [ 
 {	"paramname": "ulOverlayHandle" ,"paramtype": "vr::VROverlayHandle_t"},
-{	"paramname": "fMinDistanceInMeters" ,"paramtype": "float"},
-{	"paramname": "fMaxDistanceInMeters" ,"paramtype": "float"}
+{	"paramname": "fCurvature" ,"paramtype": "float"}
 	 ]
 }
 ,{
 	"classname": "vr::IVROverlay",
-	"methodname": "GetOverlayAutoCurveDistanceRangeInMeters",
+	"methodname": "GetOverlayCurvature",
 	"returntype": "vr::EVROverlayError",
 	"params": [ 
 {	"paramname": "ulOverlayHandle" ,"paramtype": "vr::VROverlayHandle_t"},
-{	"paramname": "pfMinDistanceInMeters" ,"paramtype": "float *"},
-{	"paramname": "pfMaxDistanceInMeters" ,"paramtype": "float *"}
+{	"paramname": "pfCurvature" ,"paramtype": "float *"}
 	 ]
 }
 ,{
@@ -3957,38 +3968,6 @@
 {	"paramname": "ulOverlayHandle" ,"paramtype": "vr::VROverlayHandle_t"}
 	 ]
 }
-,{
-	"classname": "vr::IVROverlay",
-	"methodname": "GetGamepadFocusOverlay",
-	"returntype": "vr::VROverlayHandle_t"
-}
-,{
-	"classname": "vr::IVROverlay",
-	"methodname": "SetGamepadFocusOverlay",
-	"returntype": "vr::EVROverlayError",
-	"params": [ 
-{	"paramname": "ulNewFocusOverlay" ,"paramtype": "vr::VROverlayHandle_t"}
-	 ]
-}
-,{
-	"classname": "vr::IVROverlay",
-	"methodname": "SetOverlayNeighbor",
-	"returntype": "vr::EVROverlayError",
-	"params": [ 
-{	"paramname": "eDirection" ,"paramtype": "vr::EOverlayDirection"},
-{	"paramname": "ulFrom" ,"paramtype": "vr::VROverlayHandle_t"},
-{	"paramname": "ulTo" ,"paramtype": "vr::VROverlayHandle_t"}
-	 ]
-}
-,{
-	"classname": "vr::IVROverlay",
-	"methodname": "MoveGamepadFocusToNeighbor",
-	"returntype": "vr::EVROverlayError",
-	"params": [ 
-{	"paramname": "eDirection" ,"paramtype": "vr::EOverlayDirection"},
-{	"paramname": "ulFrom" ,"paramtype": "vr::VROverlayHandle_t"}
-	 ]
-}
 ,{
 	"classname": "vr::IVROverlay",
 	"methodname": "SetOverlayDualAnalogTransform",
@@ -4964,6 +4943,17 @@
 	"methodname": "IsUsingLegacyInput",
 	"returntype": "bool"
 }
+,{
+	"classname": "vr::IVRInput",
+	"methodname": "OpenBindingUI",
+	"returntype": "vr::EVRInputError",
+	"params": [ 
+{	"paramname": "pchAppKey" ,"paramtype": "const char *"},
+{	"paramname": "ulActionSetHandle" ,"paramtype": "vr::VRActionSetHandle_t"},
+{	"paramname": "ulDeviceHandle" ,"paramtype": "vr::VRInputValueHandle_t"},
+{	"paramname": "bShowOnDesktop" ,"paramtype": "bool"}
+	 ]
+}
 ,{
 	"classname": "vr::IVRIOBuffer",
 	"methodname": "Open",
@@ -103,13 +103,13 @@ static const unsigned int k_unControllerStateAxisCount = 5;
 static const unsigned long k_ulOverlayHandleInvalid = 0;
 static const unsigned int k_unMaxDistortionFunctionParameters = 8;
 static const unsigned int k_unScreenshotHandleInvalid = 0;
-static const char * IVRSystem_Version = "IVRSystem_020";
+static const char * IVRSystem_Version = "IVRSystem_021";
 static const char * IVRExtendedDisplay_Version = "IVRExtendedDisplay_001";
-static const char * IVRTrackedCamera_Version = "IVRTrackedCamera_005";
+static const char * IVRTrackedCamera_Version = "IVRTrackedCamera_006";
 static const unsigned int k_unMaxApplicationKeyLength = 128;
 static const char * k_pch_MimeType_HomeApp = "vr/home";
 static const char * k_pch_MimeType_GameTheater = "vr/game_theater";
-static const char * IVRApplications_Version = "IVRApplications_006";
+static const char * IVRApplications_Version = "IVRApplications_007";
 static const char * IVRChaperone_Version = "IVRChaperone_003";
 static const char * IVRChaperoneSetup_Version = "IVRChaperoneSetup_006";
 static const char * IVRCompositor_Version = "IVRCompositor_022";
@@ -117,7 +117,7 @@ static const unsigned int k_unVROverlayMaxKeyLength = 128;
 static const unsigned int k_unVROverlayMaxNameLength = 128;
 static const unsigned int k_unMaxOverlayCount = 64;
 static const unsigned int k_unMaxOverlayIntersectionMaskPrimitivesCount = 32;
-static const char * IVROverlay_Version = "IVROverlay_019";
+static const char * IVROverlay_Version = "IVROverlay_021";
 static const char * k_pch_Controller_Component_GDC2015 = "gdc2015";
 static const char * k_pch_Controller_Component_Base = "base";
 static const char * k_pch_Controller_Component_Tip = "tip";
@@ -145,19 +145,25 @@ static const char * k_pch_SteamVR_BackgroundCameraHeight_Float = "backgroundCame
 static const char * k_pch_SteamVR_BackgroundDomeRadius_Float = "backgroundDomeRadius";
 static const char * k_pch_SteamVR_GridColor_String = "gridColor";
 static const char * k_pch_SteamVR_PlayAreaColor_String = "playAreaColor";
+static const char * k_pch_SteamVR_TrackingLossColor_String = "trackingLossColor";
 static const char * k_pch_SteamVR_ShowStage_Bool = "showStage";
 static const char * k_pch_SteamVR_ActivateMultipleDrivers_Bool = "activateMultipleDrivers";
 static const char * k_pch_SteamVR_UsingSpeakers_Bool = "usingSpeakers";
 static const char * k_pch_SteamVR_SpeakersForwardYawOffsetDegrees_Float = "speakersForwardYawOffsetDegrees";
 static const char * k_pch_SteamVR_BaseStationPowerManagement_Int32 = "basestationPowerManagement";
+static const char * k_pch_SteamVR_ShowBaseStationPowerManagementTip_Int32 = "ShowBaseStationPowerManagementTip";
 static const char * k_pch_SteamVR_NeverKillProcesses_Bool = "neverKillProcesses";
 static const char * k_pch_SteamVR_SupersampleScale_Float = "supersampleScale";
 static const char * k_pch_SteamVR_MaxRecommendedResolution_Int32 = "maxRecommendedResolution";
 static const char * k_pch_SteamVR_MotionSmoothing_Bool = "motionSmoothing";
 static const char * k_pch_SteamVR_MotionSmoothingOverride_Int32 = "motionSmoothingOverride";
+static const char * k_pch_SteamVR_DisableAsyncReprojection_Bool = "disableAsync";
 static const char * k_pch_SteamVR_ForceFadeOnBadTracking_Bool = "forceFadeOnBadTracking";
 static const char * k_pch_SteamVR_DefaultMirrorView_Int32 = "mirrorView";
-static const char * k_pch_SteamVR_ShowMirrorView_Bool = "showMirrorView";
+static const char * k_pch_SteamVR_ShowLegacyMirrorView_Bool = "showLegacyMirrorView";
+static const char * k_pch_SteamVR_MirrorViewVisibility_Bool = "showMirrorView";
+static const char * k_pch_SteamVR_MirrorViewDisplayMode_Int32 = "mirrorViewDisplayMode";
+static const char * k_pch_SteamVR_MirrorViewEye_Int32 = "mirrorViewEye";
 static const char * k_pch_SteamVR_MirrorViewGeometry_String = "mirrorViewGeometry";
 static const char * k_pch_SteamVR_MirrorViewGeometryMaximized_String = "mirrorViewGeometryMaximized";
 static const char * k_pch_SteamVR_StartMonitorFromAppLaunch = "startMonitorFromAppLaunch";
@@ -186,6 +192,9 @@ static const char * k_pch_SteamVR_LastVersionNoticeDate = "lastVersionNoticeDate
 static const char * k_pch_SteamVR_HmdDisplayColorGainR_Float = "hmdDisplayColorGainR";
 static const char * k_pch_SteamVR_HmdDisplayColorGainG_Float = "hmdDisplayColorGainG";
 static const char * k_pch_SteamVR_HmdDisplayColorGainB_Float = "hmdDisplayColorGainB";
+static const char * k_pch_SteamVR_CustomIconStyle_String = "customIconStyle";
+static const char * k_pch_SteamVR_CustomOffIconStyle_String = "customOffIconStyle";
+static const char * k_pch_SteamVR_CustomIconForceUpdate_String = "customIconForceUpdate";
 static const char * k_pch_DirectMode_Section = "direct_mode";
 static const char * k_pch_DirectMode_Enable_Bool = "enable";
 static const char * k_pch_DirectMode_Count_Int32 = "count";
@@ -203,7 +212,6 @@ static const char * k_pch_Lighthouse_PowerManagedBaseStations_String = "PowerMan
 static const char * k_pch_Lighthouse_PowerManagedBaseStations2_String = "PowerManagedBaseStations2";
 static const char * k_pch_Lighthouse_InactivityTimeoutForBaseStations_Int32 = "InactivityTimeoutForBaseStations";
 static const char * k_pch_Lighthouse_EnableImuFallback_Bool = "enableImuFallback";
-static const char * k_pch_Lighthouse_NewPairing_Bool = "newPairing";
 static const char * k_pch_Null_Section = "driver_null";
 static const char * k_pch_Null_SerialNumber_String = "serialNumber";
 static const char * k_pch_Null_ModelNumber_String = "modelNumber";
@@ -247,6 +255,7 @@ static const char * k_pch_CollisionBounds_ColorGammaR_Int32 = "CollisionBoundsCo
 static const char * k_pch_CollisionBounds_ColorGammaG_Int32 = "CollisionBoundsColorGammaG";
 static const char * k_pch_CollisionBounds_ColorGammaB_Int32 = "CollisionBoundsColorGammaB";
 static const char * k_pch_CollisionBounds_ColorGammaA_Int32 = "CollisionBoundsColorGammaA";
+static const char * k_pch_CollisionBounds_EnableDriverImport = "enableDriverBoundsImport";
 static const char * k_pch_Camera_Section = "camera";
 static const char * k_pch_Camera_EnableCamera_Bool = "enableCamera";
 static const char * k_pch_Camera_EnableCameraInDashboard_Bool = "enableCameraInDashboard";
@@ -259,11 +268,19 @@ static const char * k_pch_Camera_BoundsColorGammaA_Int32 = "cameraBoundsColorGam
 static const char * k_pch_Camera_BoundsStrength_Int32 = "cameraBoundsStrength";
 static const char * k_pch_Camera_RoomViewMode_Int32 = "cameraRoomViewMode";
 static const char * k_pch_audio_Section = "audio";
-static const char * k_pch_audio_OnPlaybackDevice_String = "onPlaybackDevice";
-static const char * k_pch_audio_OnRecordDevice_String = "onRecordDevice";
-static const char * k_pch_audio_OnPlaybackMirrorDevice_String = "onPlaybackMirrorDevice";
-static const char * k_pch_audio_OffPlaybackDevice_String = "offPlaybackDevice";
-static const char * k_pch_audio_OffRecordDevice_String = "offRecordDevice";
+static const char * k_pch_audio_SetOsDefaultPlaybackDevice_Bool = "setOsDefaultPlaybackDevice";
+static const char * k_pch_audio_EnablePlaybackDeviceOverride_Bool = "enablePlaybackDeviceOverride";
+static const char * k_pch_audio_PlaybackDeviceOverride_String = "playbackDeviceOverride";
+static const char * k_pch_audio_PlaybackDeviceOverrideName_String = "playbackDeviceOverrideName";
+static const char * k_pch_audio_SetOsDefaultRecordingDevice_Bool = "setOsDefaultRecordingDevice";
+static const char * k_pch_audio_EnableRecordingDeviceOverride_Bool = "enableRecordingDeviceOverride";
+static const char * k_pch_audio_RecordingDeviceOverride_String = "recordingDeviceOverride";
+static const char * k_pch_audio_RecordingDeviceOverrideName_String = "recordingDeviceOverrideName";
+static const char * k_pch_audio_EnablePlaybackMirror_Bool = "enablePlaybackMirror";
+static const char * k_pch_audio_PlaybackMirrorDevice_String = "playbackMirrorDevice";
+static const char * k_pch_audio_PlaybackMirrorDeviceName_String = "playbackMirrorDeviceName";
+static const char * k_pch_audio_OldPlaybackMirrorDevice_String = "onPlaybackMirrorDevice";
+static const char * k_pch_audio_LastHmdPlaybackDeviceId_String = "lastHmdPlaybackDeviceId";
 static const char * k_pch_audio_VIVEHDMIGain = "viveHDMIGain";
 static const char * k_pch_Power_Section = "power";
 static const char * k_pch_Power_PowerOffOnExit_Bool = "powerOffOnExit";
@@ -275,16 +292,12 @@ static const char * k_pch_Power_PauseCompositorOnStandby_Bool = "pauseCompositor
 static const char * k_pch_Dashboard_Section = "dashboard";
 static const char * k_pch_Dashboard_EnableDashboard_Bool = "enableDashboard";
 static const char * k_pch_Dashboard_ArcadeMode_Bool = "arcadeMode";
-static const char * k_pch_Dashboard_UseWebDashboard = "useWebDashboard";
+static const char * k_pch_Dashboard_UseWebKeyboard = "useWebKeyboard";
 static const char * k_pch_Dashboard_UseWebSettings = "useWebSettings";
-static const char * k_pch_Dashboard_UseWebIPD = "useWebIPD";
-static const char * k_pch_Dashboard_UseWebPowerMenu = "useWebPowerMenu";
 static const char * k_pch_modelskin_Section = "modelskins";
 static const char * k_pch_Driver_Enable_Bool = "enable";
 static const char * k_pch_Driver_LoadPriority_Int32 = "loadPriority";
 static const char * k_pch_WebInterface_Section = "WebInterface";
-static const char * k_pch_WebInterface_WebEnable_Bool = "WebEnable";
-static const char * k_pch_WebInterface_WebPort_String = "WebPort";
 static const char * k_pch_VRWebHelper_Section = "VRWebHelper";
 static const char * k_pch_VRWebHelper_DebuggerEnabled_Bool = "DebuggerEnabled";
 static const char * k_pch_VRWebHelper_DebuggerPort_Int32 = "DebuggerPort";
@@ -514,11 +527,15 @@ typedef enum ETrackedDeviceProperty
 	ETrackedDeviceProperty_Prop_ExpectedControllerType_String = 2074,
 	ETrackedDeviceProperty_Prop_HmdTrackingStyle_Int32 = 2075,
 	ETrackedDeviceProperty_Prop_DriverProvidedChaperoneVisibility_Bool = 2076,
+	ETrackedDeviceProperty_Prop_HmdProvidesDisplaySettings_Bool = 2077,
 	ETrackedDeviceProperty_Prop_DisplayAvailableFrameRates_Float_Array = 2080,
 	ETrackedDeviceProperty_Prop_DisplaySupportsMultipleFramerates_Bool = 2081,
 	ETrackedDeviceProperty_Prop_DisplayColorMultLeft_Vector3 = 2082,
 	ETrackedDeviceProperty_Prop_DisplayColorMultRight_Vector3 = 2083,
 	ETrackedDeviceProperty_Prop_DashboardLayoutPathName_String = 2090,
+	ETrackedDeviceProperty_Prop_DashboardScale_Float = 2091,
+	ETrackedDeviceProperty_Prop_IpdUIRangeMinMeters_Float = 2100,
+	ETrackedDeviceProperty_Prop_IpdUIRangeMaxMeters_Float = 2101,
 	ETrackedDeviceProperty_Prop_DriverRequestedMuraCorrectionMode_Int32 = 2200,
 	ETrackedDeviceProperty_Prop_DriverRequestedMuraFeather_InnerLeft_Int32 = 2201,
 	ETrackedDeviceProperty_Prop_DriverRequestedMuraFeather_InnerRight_Int32 = 2202,
@@ -528,6 +545,9 @@ typedef enum ETrackedDeviceProperty
 	ETrackedDeviceProperty_Prop_DriverRequestedMuraFeather_OuterRight_Int32 = 2206,
 	ETrackedDeviceProperty_Prop_DriverRequestedMuraFeather_OuterTop_Int32 = 2207,
 	ETrackedDeviceProperty_Prop_DriverRequestedMuraFeather_OuterBottom_Int32 = 2208,
+	ETrackedDeviceProperty_Prop_Audio_DefaultPlaybackDeviceId_String = 2300,
+	ETrackedDeviceProperty_Prop_Audio_DefaultRecordingDeviceId_String = 2301,
+	ETrackedDeviceProperty_Prop_Audio_DefaultPlaybackDeviceVolume_Float = 2302,
 	ETrackedDeviceProperty_Prop_AttachedDeviceId_String = 3000,
 	ETrackedDeviceProperty_Prop_SupportedButtons_Uint64 = 3001,
 	ETrackedDeviceProperty_Prop_Axis0Type_Int32 = 3002,
@@ -554,9 +574,11 @@ typedef enum ETrackedDeviceProperty
 	ETrackedDeviceProperty_Prop_NamedIconPathDeviceNotReady_String = 5006,
 	ETrackedDeviceProperty_Prop_NamedIconPathDeviceStandby_String = 5007,
 	ETrackedDeviceProperty_Prop_NamedIconPathDeviceAlertLow_String = 5008,
+	ETrackedDeviceProperty_Prop_NamedIconPathDeviceStandbyAlert_String = 5009,
 	ETrackedDeviceProperty_Prop_DisplayHiddenArea_Binary_Start = 5100,
 	ETrackedDeviceProperty_Prop_DisplayHiddenArea_Binary_End = 5150,
 	ETrackedDeviceProperty_Prop_ParentContainer = 5151,
+	ETrackedDeviceProperty_Prop_OverrideContainer_Uint64 = 5152,
 	ETrackedDeviceProperty_Prop_UserConfigPath_String = 6000,
 	ETrackedDeviceProperty_Prop_InstallPath_String = 6001,
 	ETrackedDeviceProperty_Prop_HasDisplayComponent_Bool = 6002,
@@ -662,16 +684,14 @@ typedef enum EVREventType
 	EVREventType_VREvent_ScrollSmooth = 309,
 	EVREventType_VREvent_InputFocusCaptured = 400,
 	EVREventType_VREvent_InputFocusReleased = 401,
-	EVREventType_VREvent_SceneFocusLost = 402,
-	EVREventType_VREvent_SceneFocusGained = 403,
 	EVREventType_VREvent_SceneApplicationChanged = 404,
 	EVREventType_VREvent_SceneFocusChanged = 405,
 	EVREventType_VREvent_InputFocusChanged = 406,
-	EVREventType_VREvent_SceneApplicationSecondaryRenderingStarted = 407,
 	EVREventType_VREvent_SceneApplicationUsingWrongGraphicsAdapter = 408,
 	EVREventType_VREvent_ActionBindingReloaded = 409,
 	EVREventType_VREvent_HideRenderModels = 410,
 	EVREventType_VREvent_ShowRenderModels = 411,
+	EVREventType_VREvent_SceneApplicationStateChanged = 412,
 	EVREventType_VREvent_ConsoleOpened = 420,
 	EVREventType_VREvent_ConsoleClosed = 421,
 	EVREventType_VREvent_OverlayShown = 500,
@@ -707,7 +727,6 @@ typedef enum EVREventType
 	EVREventType_VREvent_Notification_Destroyed = 603,
 	EVREventType_VREvent_Quit = 700,
 	EVREventType_VREvent_ProcessQuit = 701,
-	EVREventType_VREvent_QuitAborted_UserPrompt = 702,
 	EVREventType_VREvent_QuitAcknowledged = 703,
 	EVREventType_VREvent_DriverRequestedQuit = 704,
 	EVREventType_VREvent_RestartRequested = 705,
@@ -747,16 +766,10 @@ typedef enum EVREventType
 	EVREventType_VREvent_KeyboardClosed = 1200,
 	EVREventType_VREvent_KeyboardCharInput = 1201,
 	EVREventType_VREvent_KeyboardDone = 1202,
-	EVREventType_VREvent_ApplicationTransitionStarted = 1300,
-	EVREventType_VREvent_ApplicationTransitionAborted = 1301,
-	EVREventType_VREvent_ApplicationTransitionNewAppStarted = 1302,
 	EVREventType_VREvent_ApplicationListUpdated = 1303,
 	EVREventType_VREvent_ApplicationMimeTypeLoad = 1304,
-	EVREventType_VREvent_ApplicationTransitionNewAppLaunchComplete = 1305,
 	EVREventType_VREvent_ProcessConnected = 1306,
 	EVREventType_VREvent_ProcessDisconnected = 1307,
-	EVREventType_VREvent_Compositor_MirrorWindowShown = 1400,
-	EVREventType_VREvent_Compositor_MirrorWindowHidden = 1401,
 	EVREventType_VREvent_Compositor_ChaperoneBoundsShown = 1410,
 	EVREventType_VREvent_Compositor_ChaperoneBoundsHidden = 1411,
 	EVREventType_VREvent_Compositor_DisplayDisconnected = 1412,
@@ -765,6 +778,7 @@ typedef enum EVREventType
 	EVREventType_VREvent_Compositor_ApplicationNotResponding = 1415,
 	EVREventType_VREvent_Compositor_ApplicationResumed = 1416,
 	EVREventType_VREvent_Compositor_OutOfVideoMemory = 1417,
+	EVREventType_VREvent_Compositor_DisplayModeNotSupported = 1418,
 	EVREventType_VREvent_TrackedCamera_StartVideoStream = 1500,
 	EVREventType_VREvent_TrackedCamera_StopVideoStream = 1501,
 	EVREventType_VREvent_TrackedCamera_PauseVideoStream = 1502,
@@ -788,6 +802,8 @@ typedef enum EVREventType
 	EVREventType_VREvent_SpatialAnchors_RequestPoseUpdate = 1802,
 	EVREventType_VREvent_SpatialAnchors_RequestDescriptorUpdate = 1803,
 	EVREventType_VREvent_SystemReport_Started = 1900,
+	EVREventType_VREvent_Monitor_ShowHeadsetView = 2000,
+	EVREventType_VREvent_Monitor_HideHeadsetView = 2001,
 	EVREventType_VREvent_VendorSpecific_Reserved_Start = 10000,
 	EVREventType_VREvent_VendorSpecific_Reserved_End = 19999,
 } EVREventType;
@@ -799,6 +815,7 @@ typedef enum EDeviceActivityLevel
 	EDeviceActivityLevel_k_EDeviceActivityLevel_UserInteraction = 1,
 	EDeviceActivityLevel_k_EDeviceActivityLevel_UserInteraction_Timeout = 2,
 	EDeviceActivityLevel_k_EDeviceActivityLevel_Standby = 3,
+	EDeviceActivityLevel_k_EDeviceActivityLevel_Idle_Timeout = 4,
 } EDeviceActivityLevel;

 typedef enum EVRButtonId
@@ -1052,6 +1069,7 @@ typedef enum EVRInitError
 	EVRInitError_VRInitError_Init_AlreadyRunning = 143,
 	EVRInitError_VRInitError_Init_FailedForVrMonitor = 144,
 	EVRInitError_VRInitError_Init_PropertyManagerInitFailed = 145,
+	EVRInitError_VRInitError_Init_WebServerFailed = 146,
 	EVRInitError_VRInitError_Driver_Failed = 200,
 	EVRInitError_VRInitError_Driver_Unknown = 201,
 	EVRInitError_VRInitError_Driver_HmdUnknown = 202,
@@ -1163,6 +1181,7 @@ typedef enum EVRInitError
 	EVRInitError_VRInitError_Compositor_CreateLastFrameRenderTexture = 484,
 	EVRInitError_VRInitError_Compositor_CreateMirrorOverlay = 485,
 	EVRInitError_VRInitError_Compositor_FailedToCreateVirtualDisplayBackbuffer = 486,
+	EVRInitError_VRInitError_Compositor_DisplayModeNotSupported = 487,
 	EVRInitError_VRInitError_VendorSpecific_UnableToConnectToOculusRuntime = 1000,
 	EVRInitError_VRInitError_VendorSpecific_WindowsNotInDevMode = 1001,
 	EVRInitError_VRInitError_VendorSpecific_HmdFound_CantOpenDevice = 1101,
@@ -1310,16 +1329,18 @@ typedef enum EVRApplicationProperty
 	EVRApplicationProperty_VRApplicationProperty_IsInstanced_Bool = 62,
 	EVRApplicationProperty_VRApplicationProperty_IsInternal_Bool = 63,
 	EVRApplicationProperty_VRApplicationProperty_WantsCompositorPauseInStandby_Bool = 64,
+	EVRApplicationProperty_VRApplicationProperty_IsHidden_Bool = 65,
 	EVRApplicationProperty_VRApplicationProperty_LastLaunchTime_Uint64 = 70,
 } EVRApplicationProperty;

-typedef enum EVRApplicationTransitionState
+typedef enum EVRSceneApplicationState
 {
-	EVRApplicationTransitionState_VRApplicationTransition_None = 0,
-	EVRApplicationTransitionState_VRApplicationTransition_OldAppQuitSent = 10,
-	EVRApplicationTransitionState_VRApplicationTransition_WaitingForExternalLaunch = 11,
-	EVRApplicationTransitionState_VRApplicationTransition_NewAppLaunched = 20,
-} EVRApplicationTransitionState;
+	EVRSceneApplicationState_None = 0,
+	EVRSceneApplicationState_Starting = 1,
+	EVRSceneApplicationState_Quitting = 2,
+	EVRSceneApplicationState_Running = 3,
+	EVRSceneApplicationState_Waiting = 4,
+} EVRSceneApplicationState;

 typedef enum ChaperoneCalibrationState
 {
@@ -1386,25 +1407,21 @@ typedef enum VROverlayTransformType

 typedef enum VROverlayFlags
 {
-	VROverlayFlags_None = 0,
-	VROverlayFlags_Curved = 1,
-	VROverlayFlags_RGSS4X = 2,
-	VROverlayFlags_NoDashboardTab = 3,
-	VROverlayFlags_AcceptsGamepadEvents = 4,
-	VROverlayFlags_ShowGamepadFocus = 5,
-	VROverlayFlags_SendVRDiscreteScrollEvents = 6,
-	VROverlayFlags_SendVRTouchpadEvents = 7,
-	VROverlayFlags_ShowTouchPadScrollWheel = 8,
-	VROverlayFlags_TransferOwnershipToInternalProcess = 9,
-	VROverlayFlags_SideBySide_Parallel = 10,
-	VROverlayFlags_SideBySide_Crossed = 11,
-	VROverlayFlags_Panorama = 12,
-	VROverlayFlags_StereoPanorama = 13,
-	VROverlayFlags_SortWithNonSceneOverlays = 14,
-	VROverlayFlags_VisibleInDashboard = 15,
-	VROverlayFlags_MakeOverlaysInteractiveIfVisible = 16,
-	VROverlayFlags_SendVRSmoothScrollEvents = 17,
-	VROverlayFlags_ProtectedContent = 18,
+	VROverlayFlags_NoDashboardTab = 8,
+	VROverlayFlags_SendVRDiscreteScrollEvents = 64,
+	VROverlayFlags_SendVRTouchpadEvents = 128,
+	VROverlayFlags_ShowTouchPadScrollWheel = 256,
+	VROverlayFlags_TransferOwnershipToInternalProcess = 512,
+	VROverlayFlags_SideBySide_Parallel = 1024,
+	VROverlayFlags_SideBySide_Crossed = 2048,
+	VROverlayFlags_Panorama = 4096,
+	VROverlayFlags_StereoPanorama = 8192,
+	VROverlayFlags_SortWithNonSceneOverlays = 16384,
+	VROverlayFlags_VisibleInDashboard = 32768,
+	VROverlayFlags_MakeOverlaysInteractiveIfVisible = 65536,
+	VROverlayFlags_SendVRSmoothScrollEvents = 131072,
+	VROverlayFlags_ProtectedContent = 262144,
+	VROverlayFlags_HideLaserIntersection = 524288,
 } VROverlayFlags;

 typedef enum VRMessageOverlayResponse
@@ -1431,15 +1448,6 @@ typedef enum EGamepadTextInputLineMode
 	EGamepadTextInputLineMode_k_EGamepadTextInputLineModeMultipleLines = 1,
 } EGamepadTextInputLineMode;

-typedef enum EOverlayDirection
-{
-	EOverlayDirection_OverlayDirection_Up = 0,
-	EOverlayDirection_OverlayDirection_Down = 1,
-	EOverlayDirection_OverlayDirection_Left = 2,
-	EOverlayDirection_OverlayDirection_Right = 3,
-	EOverlayDirection_OverlayDirection_Count = 4,
-} EOverlayDirection;
-
 typedef enum EVROverlayIntersectionMaskPrimitiveType
 {
 	EVROverlayIntersectionMaskPrimitiveType_OverlayIntersectionPrimitiveType_Rectangle = 0,
@@ -2024,7 +2032,7 @@ typedef struct CameraVideoStreamFrameHeader_t
 	uint32_t nHeight;
 	uint32_t nBytesPerPixel;
 	uint32_t nFrameSequence;
-	struct TrackedDevicePose_t standingTrackedDevicePose;
+	struct TrackedDevicePose_t trackedDevicePose;
 	uint64_t ulFrameExposureTime;
 } CameraVideoStreamFrameHeader_t;

@@ -2396,7 +2404,6 @@ struct VR_IVRSystem_FnTable
 	bool (OPENVR_FNTABLE_CALLTYPE *ShouldApplicationReduceRenderingWork)();
 	EVRFirmwareError (OPENVR_FNTABLE_CALLTYPE *PerformFirmwareUpdate)(TrackedDeviceIndex_t unDeviceIndex);
 	void (OPENVR_FNTABLE_CALLTYPE *AcknowledgeQuit_Exiting)();
-	void (OPENVR_FNTABLE_CALLTYPE *AcknowledgeQuit_UserPrompt)();
 	uint32_t (OPENVR_FNTABLE_CALLTYPE *GetAppContainerFilePaths)(char * pchBuffer, uint32_t unBufferSize);
 	char * (OPENVR_FNTABLE_CALLTYPE *GetRuntimeVersion)();
 };
@@ -2422,6 +2429,8 @@ struct VR_IVRTrackedCamera_FnTable
 	EVRTrackedCameraError (OPENVR_FNTABLE_CALLTYPE *GetVideoStreamTextureD3D11)(TrackedCameraHandle_t hTrackedCamera, EVRTrackedCameraFrameType eFrameType, void * pD3D11DeviceOrResource, void ** ppD3D11ShaderResourceView, CameraVideoStreamFrameHeader_t * pFrameHeader, uint32_t nFrameHeaderSize);
 	EVRTrackedCameraError (OPENVR_FNTABLE_CALLTYPE *GetVideoStreamTextureGL)(TrackedCameraHandle_t hTrackedCamera, EVRTrackedCameraFrameType eFrameType, glUInt_t * pglTextureId, CameraVideoStreamFrameHeader_t * pFrameHeader, uint32_t nFrameHeaderSize);
 	EVRTrackedCameraError (OPENVR_FNTABLE_CALLTYPE *ReleaseVideoStreamTextureGL)(TrackedCameraHandle_t hTrackedCamera, glUInt_t glTextureId);
+	void (OPENVR_FNTABLE_CALLTYPE *SetCameraTrackingSpace)(ETrackingUniverseOrigin eUniverse);
+	ETrackingUniverseOrigin (OPENVR_FNTABLE_CALLTYPE *GetCameraTrackingSpace)();
 };

 struct VR_IVRApplications_FnTable
@@ -2451,10 +2460,9 @@ struct VR_IVRApplications_FnTable
 	uint32_t (OPENVR_FNTABLE_CALLTYPE *GetApplicationsThatSupportMimeType)(char * pchMimeType, char * pchAppKeysThatSupportBuffer, uint32_t unAppKeysThatSupportBuffer);
 	uint32_t (OPENVR_FNTABLE_CALLTYPE *GetApplicationLaunchArguments)(uint32_t unHandle, char * pchArgs, uint32_t unArgs);
 	EVRApplicationError (OPENVR_FNTABLE_CALLTYPE *GetStartingApplication)(char * pchAppKeyBuffer, uint32_t unAppKeyBufferLen);
-	EVRApplicationTransitionState (OPENVR_FNTABLE_CALLTYPE *GetTransitionState)();
+	EVRSceneApplicationState (OPENVR_FNTABLE_CALLTYPE *GetSceneApplicationState)();
 	EVRApplicationError (OPENVR_FNTABLE_CALLTYPE *PerformApplicationPrelaunchCheck)(char * pchAppKey);
-	char * (OPENVR_FNTABLE_CALLTYPE *GetApplicationsTransitionStateNameFromEnum)(EVRApplicationTransitionState state);
-	bool (OPENVR_FNTABLE_CALLTYPE *IsQuitUserPromptRequested)();
+	char * (OPENVR_FNTABLE_CALLTYPE *GetSceneApplicationStateNameFromEnum)(EVRSceneApplicationState state);
 	EVRApplicationError (OPENVR_FNTABLE_CALLTYPE *LaunchInternalProcess)(char * pchBinaryPath, char * pchArguments, char * pchWorkingDirectory);
 	uint32_t (OPENVR_FNTABLE_CALLTYPE *GetCurrentSceneProcessId)();
 };
@@ -2550,8 +2558,6 @@ struct VR_IVROverlay_FnTable
 	EVROverlayError (OPENVR_FNTABLE_CALLTYPE *FindOverlay)(char * pchOverlayKey, VROverlayHandle_t * pOverlayHandle);
 	EVROverlayError (OPENVR_FNTABLE_CALLTYPE *CreateOverlay)(char * pchOverlayKey, char * pchOverlayName, VROverlayHandle_t * pOverlayHandle);
 	EVROverlayError (OPENVR_FNTABLE_CALLTYPE *DestroyOverlay)(VROverlayHandle_t ulOverlayHandle);
-	EVROverlayError (OPENVR_FNTABLE_CALLTYPE *SetHighQualityOverlay)(VROverlayHandle_t ulOverlayHandle);
-	VROverlayHandle_t (OPENVR_FNTABLE_CALLTYPE *GetHighQualityOverlay)();
 	uint32_t (OPENVR_FNTABLE_CALLTYPE *GetOverlayKey)(VROverlayHandle_t ulOverlayHandle, char * pchValue, uint32_t unBufferSize, EVROverlayError * pError);
 	uint32_t (OPENVR_FNTABLE_CALLTYPE *GetOverlayName)(VROverlayHandle_t ulOverlayHandle, char * pchValue, uint32_t unBufferSize, EVROverlayError * pError);
 	EVROverlayError (OPENVR_FNTABLE_CALLTYPE *SetOverlayName)(VROverlayHandle_t ulOverlayHandle, char * pchName);
@@ -2571,8 +2577,8 @@ struct VR_IVROverlay_FnTable
 	EVROverlayError (OPENVR_FNTABLE_CALLTYPE *GetOverlaySortOrder)(VROverlayHandle_t ulOverlayHandle, uint32_t * punSortOrder);
 	EVROverlayError (OPENVR_FNTABLE_CALLTYPE *SetOverlayWidthInMeters)(VROverlayHandle_t ulOverlayHandle, float fWidthInMeters);
 	EVROverlayError (OPENVR_FNTABLE_CALLTYPE *GetOverlayWidthInMeters)(VROverlayHandle_t ulOverlayHandle, float * pfWidthInMeters);
-	EVROverlayError (OPENVR_FNTABLE_CALLTYPE *SetOverlayAutoCurveDistanceRangeInMeters)(VROverlayHandle_t ulOverlayHandle, float fMinDistanceInMeters, float fMaxDistanceInMeters);
-	EVROverlayError (OPENVR_FNTABLE_CALLTYPE *GetOverlayAutoCurveDistanceRangeInMeters)(VROverlayHandle_t ulOverlayHandle, float * pfMinDistanceInMeters, float * pfMaxDistanceInMeters);
+	EVROverlayError (OPENVR_FNTABLE_CALLTYPE *SetOverlayCurvature)(VROverlayHandle_t ulOverlayHandle, float fCurvature);
+	EVROverlayError (OPENVR_FNTABLE_CALLTYPE *GetOverlayCurvature)(VROverlayHandle_t ulOverlayHandle, float * pfCurvature);
 	EVROverlayError (OPENVR_FNTABLE_CALLTYPE *SetOverlayTextureColorSpace)(VROverlayHandle_t ulOverlayHandle, EColorSpace eTextureColorSpace);
 	EVROverlayError (OPENVR_FNTABLE_CALLTYPE *GetOverlayTextureColorSpace)(VROverlayHandle_t ulOverlayHandle, EColorSpace * peTextureColorSpace);
 	EVROverlayError (OPENVR_FNTABLE_CALLTYPE *SetOverlayTextureBounds)(VROverlayHandle_t ulOverlayHandle, struct VRTextureBounds_t * pOverlayTextureBounds);
@@ -2599,10 +2605,6 @@ struct VR_IVROverlay_FnTable
 	EVROverlayError (OPENVR_FNTABLE_CALLTYPE *SetOverlayMouseScale)(VROverlayHandle_t ulOverlayHandle, struct HmdVector2_t * pvecMouseScale);
 	bool (OPENVR_FNTABLE_CALLTYPE *ComputeOverlayIntersection)(VROverlayHandle_t ulOverlayHandle, struct VROverlayIntersectionParams_t * pParams, struct VROverlayIntersectionResults_t * pResults);
 	bool (OPENVR_FNTABLE_CALLTYPE *IsHoverTargetOverlay)(VROverlayHandle_t ulOverlayHandle);
-	VROverlayHandle_t (OPENVR_FNTABLE_CALLTYPE *GetGamepadFocusOverlay)();
-	EVROverlayError (OPENVR_FNTABLE_CALLTYPE *SetGamepadFocusOverlay)(VROverlayHandle_t ulNewFocusOverlay);
-	EVROverlayError (OPENVR_FNTABLE_CALLTYPE *SetOverlayNeighbor)(EOverlayDirection eDirection, VROverlayHandle_t ulFrom, VROverlayHandle_t ulTo);
-	EVROverlayError (OPENVR_FNTABLE_CALLTYPE *MoveGamepadFocusToNeighbor)(EOverlayDirection eDirection, VROverlayHandle_t ulFrom);
 	EVROverlayError (OPENVR_FNTABLE_CALLTYPE *SetOverlayDualAnalogTransform)(VROverlayHandle_t ulOverlay, EDualAnalogWhich eWhich, struct HmdVector2_t * pvCenter, float fRadius);
 	EVROverlayError (OPENVR_FNTABLE_CALLTYPE *GetOverlayDualAnalogTransform)(VROverlayHandle_t ulOverlay, EDualAnalogWhich eWhich, struct HmdVector2_t * pvCenter, float * pfRadius);
 	EVROverlayError (OPENVR_FNTABLE_CALLTYPE *SetOverlayTexture)(VROverlayHandle_t ulOverlayHandle, struct Texture_t * pTexture);
@@ -2730,6 +2732,7 @@ struct VR_IVRInput_FnTable
 	EVRInputError (OPENVR_FNTABLE_CALLTYPE *ShowActionOrigins)(VRActionSetHandle_t actionSetHandle, VRActionHandle_t ulActionHandle);
 	EVRInputError (OPENVR_FNTABLE_CALLTYPE *ShowBindingsForActionSet)(struct VRActiveActionSet_t * pSets, uint32_t unSizeOfVRSelectedActionSet_t, uint32_t unSetCount, VRInputValueHandle_t originToHighlight);
 	bool (OPENVR_FNTABLE_CALLTYPE *IsUsingLegacyInput)();
+	EVRInputError (OPENVR_FNTABLE_CALLTYPE *OpenBindingUI)(char * pchAppKey, VRActionSetHandle_t ulActionSetHandle, VRInputValueHandle_t ulDeviceHandle, bool bShowOnDesktop);
 };

 struct VR_IVRIOBuffer_FnTable
@@ -15,8 +15,8 @@
 namespace vr
 {
 	static const uint32_t k_nSteamVRVersionMajor = 1;
-	static const uint32_t k_nSteamVRVersionMinor = 6;
-	static const uint32_t k_nSteamVRVersionBuild = 10;
+	static const uint32_t k_nSteamVRVersionMinor = 8;
+	static const uint32_t k_nSteamVRVersionBuild = 19;
 } // namespace vr

 // vrtypes.h
@@ -432,6 +432,7 @@ enum ETrackedDeviceProperty
 	Prop_ExpectedControllerType_String			= 2074,
 	Prop_HmdTrackingStyle_Int32					= 2075, // one of EHmdTrackingStyle
 	Prop_DriverProvidedChaperoneVisibility_Bool = 2076,
+	Prop_HmdProvidesDisplaySettings_Bool		= 2077,


 	Prop_DisplayAvailableFrameRates_Float_Array = 2080, // populated by compositor from actual EDID list when available from GPU driver
@@ -439,7 +440,10 @@ enum ETrackedDeviceProperty
 	Prop_DisplayColorMultLeft_Vector3			= 2082,
 	Prop_DisplayColorMultRight_Vector3			= 2083,

-	Prop_DashboardLayoutPathName_String			= 2090,
+	Prop_DashboardLayoutPathName_String 		= 2090,
+	Prop_DashboardScale_Float 					= 2091,
+	Prop_IpdUIRangeMinMeters_Float 				= 2100,
+	Prop_IpdUIRangeMaxMeters_Float 				= 2101,

 	// Driver requested mura correction properties
 	Prop_DriverRequestedMuraCorrectionMode_Int32		= 2200,
@@ -452,6 +456,10 @@ enum ETrackedDeviceProperty
 	Prop_DriverRequestedMuraFeather_OuterTop_Int32		= 2207,
 	Prop_DriverRequestedMuraFeather_OuterBottom_Int32	= 2208,

+	Prop_Audio_DefaultPlaybackDeviceId_String		= 2300,
+	Prop_Audio_DefaultRecordingDeviceId_String		= 2301,
+	Prop_Audio_DefaultPlaybackDeviceVolume_Float	= 2302,
+
 	// Properties that are unique to TrackedDeviceClass_Controller
 	Prop_AttachedDeviceId_String				= 3000,
 	Prop_SupportedButtons_Uint64				= 3001,
@@ -483,11 +491,13 @@ enum ETrackedDeviceProperty
 	Prop_NamedIconPathDeviceNotReady_String			= 5006, // {driver}/icons/icon_filename - PNG for static icon, or GIF for animation, 50x32 for headsets and 32x32 for others
 	Prop_NamedIconPathDeviceStandby_String			= 5007, // {driver}/icons/icon_filename - PNG for static icon, or GIF for animation, 50x32 for headsets and 32x32 for others
 	Prop_NamedIconPathDeviceAlertLow_String			= 5008, // {driver}/icons/icon_filename - PNG for static icon, or GIF for animation, 50x32 for headsets and 32x32 for others
+	Prop_NamedIconPathDeviceStandbyAlert_String		= 5009, // {driver}/icons/icon_filename - PNG for static icon, or GIF for animation, 50x32 for headsets and 32x32 for others

 	// Properties that are used by helpers, but are opaque to applications
 	Prop_DisplayHiddenArea_Binary_Start				= 5100,
 	Prop_DisplayHiddenArea_Binary_End				= 5150,
 	Prop_ParentContainer							= 5151,
+	Prop_OverrideContainer_Uint64					= 5152,

 	// Properties that are unique to drivers
 	Prop_UserConfigPath_String					= 6000,
@@ -693,18 +703,20 @@ enum EVREventType

 	VREvent_InputFocusCaptured			= 400, // data is process DEPRECATED
 	VREvent_InputFocusReleased			= 401, // data is process DEPRECATED
-	VREvent_SceneFocusLost				= 402, // data is process
-	VREvent_SceneFocusGained			= 403, // data is process
+	// VREvent_SceneFocusLost			= 402, // data is process
+	// VREvent_SceneFocusGained			= 403, // data is process
 	VREvent_SceneApplicationChanged		= 404, // data is process - The App actually drawing the scene changed (usually to or from the compositor)
 	VREvent_SceneFocusChanged			= 405, // data is process - New app got access to draw the scene
 	VREvent_InputFocusChanged			= 406, // data is process
-	VREvent_SceneApplicationSecondaryRenderingStarted = 407, // data is process
+	// VREvent_SceneApplicationSecondaryRenderingStarted = 407,
 	VREvent_SceneApplicationUsingWrongGraphicsAdapter = 408, // data is process
 	VREvent_ActionBindingReloaded		 = 409, // data is process - The App that action binds reloaded for

 	VREvent_HideRenderModels			= 410, // Sent to the scene application to request hiding render models temporarily
 	VREvent_ShowRenderModels			= 411, // Sent to the scene application to request restoring render model visibility

+	VREvent_SceneApplicationStateChanged = 412, // No data; but query VRApplications()->GetSceneApplicationState();
+
 	VREvent_ConsoleOpened               = 420,
 	VREvent_ConsoleClosed               = 421,

@@ -749,7 +761,7 @@ enum EVREventType

 	VREvent_Quit							= 700, // data is process
 	VREvent_ProcessQuit						= 701, // data is process
-	VREvent_QuitAborted_UserPrompt			= 702, // data is process
+	//VREvent_QuitAborted_UserPrompt			= 702, // data is process
 	VREvent_QuitAcknowledged				= 703, // data is process
 	VREvent_DriverRequestedQuit				= 704, // The driver has requested that SteamVR shut down
 	VREvent_RestartRequested				= 705, // A driver or other component wants the user to restart SteamVR
@@ -798,17 +810,17 @@ enum EVREventType
 	VREvent_KeyboardCharInput				= 1201,
 	VREvent_KeyboardDone					= 1202, // Sent when DONE button clicked on keyboard

-	VREvent_ApplicationTransitionStarted		= 1300,
-	VREvent_ApplicationTransitionAborted		= 1301,
-	VREvent_ApplicationTransitionNewAppStarted	= 1302,
+	//VREvent_ApplicationTransitionStarted		= 1300,
+	//VREvent_ApplicationTransitionAborted		= 1301,
+	//VREvent_ApplicationTransitionNewAppStarted	= 1302,
 	VREvent_ApplicationListUpdated				= 1303,
 	VREvent_ApplicationMimeTypeLoad				= 1304,
-	VREvent_ApplicationTransitionNewAppLaunchComplete = 1305,
+	// VREvent_ApplicationTransitionNewAppLaunchComplete = 1305,
 	VREvent_ProcessConnected					= 1306,
 	VREvent_ProcessDisconnected					= 1307,

-	VREvent_Compositor_MirrorWindowShown		= 1400,
-	VREvent_Compositor_MirrorWindowHidden		= 1401,
+	//VREvent_Compositor_MirrorWindowShown		= 1400, // DEPRECATED
+	//VREvent_Compositor_MirrorWindowHidden		= 1401, // DEPRECATED
 	VREvent_Compositor_ChaperoneBoundsShown		= 1410,
 	VREvent_Compositor_ChaperoneBoundsHidden	= 1411,
 	VREvent_Compositor_DisplayDisconnected		= 1412,
@@ -817,6 +829,7 @@ enum EVREventType
 	VREvent_Compositor_ApplicationNotResponding	= 1415,
 	VREvent_Compositor_ApplicationResumed		= 1416,
 	VREvent_Compositor_OutOfVideoMemory			= 1417,
+	VREvent_Compositor_DisplayModeNotSupported	= 1418, // k_pch_SteamVR_PreferredRefreshRate

 	VREvent_TrackedCamera_StartVideoStream  = 1500,
 	VREvent_TrackedCamera_StopVideoStream   = 1501,
@@ -847,6 +860,9 @@ enum EVREventType

 	VREvent_SystemReport_Started			= 1900, // user or system initiated generation of a system report. broadcast

+	VREvent_Monitor_ShowHeadsetView			= 2000, // data is process
+	VREvent_Monitor_HideHeadsetView			= 2001, // data is process
+
 	// Vendors are free to expose private events in this reserved region
 	VREvent_VendorSpecific_Reserved_Start	= 10000,
 	VREvent_VendorSpecific_Reserved_End		= 19999,
@@ -865,6 +881,7 @@ enum EDeviceActivityLevel
 	k_EDeviceActivityLevel_UserInteraction = 1,				// Activity (movement or prox sensor) is happening now	
 	k_EDeviceActivityLevel_UserInteraction_Timeout = 2,		// No activity for the last 0.5 seconds
 	k_EDeviceActivityLevel_Standby = 3,						// Idle for at least 5 seconds (configurable in Settings -> Power Management)
+	k_EDeviceActivityLevel_Idle_Timeout = 4,
 };


@@ -1531,6 +1548,7 @@ enum EVRInitError
 	VRInitError_Init_AlreadyRunning					= 143,
 	VRInitError_Init_FailedForVrMonitor				= 144,
 	VRInitError_Init_PropertyManagerInitFailed		= 145,
+	VRInitError_Init_WebServerFailed				= 146,

 	VRInitError_Driver_Failed						= 200,
 	VRInitError_Driver_Unknown						= 201,
@@ -1546,6 +1564,7 @@ enum EVRInitError
 	VRInitError_Driver_HmdDriverIdOutOfBounds		= 211,
 	VRInitError_Driver_HmdDisplayMirrored			= 212,
 	VRInitError_Driver_HmdDisplayNotFoundLaptop		= 213,
+	// Never make error 259 because we return it from main and it would conflict with STILL_ACTIVE

 	VRInitError_IPC_ServerInitFailed				= 300,
 	VRInitError_IPC_ConnectFailed					= 301,
@@ -1646,6 +1665,7 @@ enum EVRInitError
 	VRInitError_Compositor_CreateLastFrameRenderTexture							= 484,
 	VRInitError_Compositor_CreateMirrorOverlay									= 485,
 	VRInitError_Compositor_FailedToCreateVirtualDisplayBackbuffer				= 486,
+	VRInitError_Compositor_DisplayModeNotSupported								= 487,

 	VRInitError_VendorSpecific_UnableToConnectToOculusRuntime		= 1000,
 	VRInitError_VendorSpecific_WindowsNotInDevMode					= 1001,
@@ -1747,7 +1767,7 @@ struct CameraVideoStreamFrameHeader_t

 	uint32_t nFrameSequence;

-	TrackedDevicePose_t standingTrackedDevicePose;
+	TrackedDevicePose_t trackedDevicePose;
 	
 	uint64_t ulFrameExposureTime;						// mid-point of the exposure of the image in host system ticks
 };
@@ -1963,6 +1983,7 @@ enum ECameraCompatibilityMode
 	CAMERA_COMPAT_MODE_ISO_40FPS,
 	CAMERA_COMPAT_MODE_ISO_35FPS,
 	CAMERA_COMPAT_MODE_ISO_30FPS,
+	CAMERA_COMPAT_MODE_ISO_15FPS,
 	MAX_CAMERA_COMPAT_MODES
 };

@@ -2020,7 +2041,7 @@ VR_CAMERA_DECL_ALIGN( 8 ) struct CameraVideoStreamFrame_t

 	double m_flSyncMarkerError;

-	TrackedDevicePose_t m_StandingTrackedDevicePose;	// Supplied by HMD layer when used as a tracked camera
+	TrackedDevicePose_t m_RawTrackedDevicePose;	// Raw-and-uncalibrated pose, supplied by HMD layer when used as a tracked camera

 	uint64_t m_pImageData;
 };
@@ -2176,19 +2197,25 @@ namespace vr
 	static const char * const k_pch_SteamVR_BackgroundDomeRadius_Float = "backgroundDomeRadius";
 	static const char * const k_pch_SteamVR_GridColor_String = "gridColor";
 	static const char * const k_pch_SteamVR_PlayAreaColor_String = "playAreaColor";
+	static const char * const k_pch_SteamVR_TrackingLossColor_String = "trackingLossColor";
 	static const char * const k_pch_SteamVR_ShowStage_Bool = "showStage";
 	static const char * const k_pch_SteamVR_ActivateMultipleDrivers_Bool = "activateMultipleDrivers";
 	static const char * const k_pch_SteamVR_UsingSpeakers_Bool = "usingSpeakers";
 	static const char * const k_pch_SteamVR_SpeakersForwardYawOffsetDegrees_Float = "speakersForwardYawOffsetDegrees";
 	static const char * const k_pch_SteamVR_BaseStationPowerManagement_Int32 = "basestationPowerManagement";
+	static const char * const k_pch_SteamVR_ShowBaseStationPowerManagementTip_Int32 = "ShowBaseStationPowerManagementTip";
 	static const char * const k_pch_SteamVR_NeverKillProcesses_Bool = "neverKillProcesses";
 	static const char * const k_pch_SteamVR_SupersampleScale_Float = "supersampleScale";
 	static const char * const k_pch_SteamVR_MaxRecommendedResolution_Int32 = "maxRecommendedResolution";
 	static const char * const k_pch_SteamVR_MotionSmoothing_Bool = "motionSmoothing";
 	static const char * const k_pch_SteamVR_MotionSmoothingOverride_Int32 = "motionSmoothingOverride";
+	static const char * const k_pch_SteamVR_DisableAsyncReprojection_Bool = "disableAsync";
 	static const char * const k_pch_SteamVR_ForceFadeOnBadTracking_Bool = "forceFadeOnBadTracking";
 	static const char * const k_pch_SteamVR_DefaultMirrorView_Int32 = "mirrorView";
-	static const char * const k_pch_SteamVR_ShowMirrorView_Bool = "showMirrorView";
+	static const char * const k_pch_SteamVR_ShowLegacyMirrorView_Bool = "showLegacyMirrorView";
+	static const char * const k_pch_SteamVR_MirrorViewVisibility_Bool = "showMirrorView";
+	static const char * const k_pch_SteamVR_MirrorViewDisplayMode_Int32 = "mirrorViewDisplayMode";
+	static const char * const k_pch_SteamVR_MirrorViewEye_Int32 = "mirrorViewEye";
 	static const char * const k_pch_SteamVR_MirrorViewGeometry_String = "mirrorViewGeometry";
 	static const char * const k_pch_SteamVR_MirrorViewGeometryMaximized_String = "mirrorViewGeometryMaximized";
 	static const char * const k_pch_SteamVR_StartMonitorFromAppLaunch = "startMonitorFromAppLaunch";
@@ -2217,6 +2244,9 @@ namespace vr
 	static const char * const k_pch_SteamVR_HmdDisplayColorGainR_Float = "hmdDisplayColorGainR";
 	static const char * const k_pch_SteamVR_HmdDisplayColorGainG_Float = "hmdDisplayColorGainG";
 	static const char * const k_pch_SteamVR_HmdDisplayColorGainB_Float = "hmdDisplayColorGainB";
+	static const char * const k_pch_SteamVR_CustomIconStyle_String = "customIconStyle";
+	static const char * const k_pch_SteamVR_CustomOffIconStyle_String = "customOffIconStyle";
+	static const char * const k_pch_SteamVR_CustomIconForceUpdate_String = "customIconForceUpdate";

 	//-----------------------------------------------------------------------------
 	// direct mode keys
@@ -2240,7 +2270,6 @@ namespace vr
 	static const char * const k_pch_Lighthouse_PowerManagedBaseStations2_String = "PowerManagedBaseStations2";
 	static const char * const k_pch_Lighthouse_InactivityTimeoutForBaseStations_Int32 = "InactivityTimeoutForBaseStations";
 	static const char * const k_pch_Lighthouse_EnableImuFallback_Bool = "enableImuFallback";
-	static const char * const k_pch_Lighthouse_NewPairing_Bool = "newPairing";

 	//-----------------------------------------------------------------------------
 	// null keys
@@ -2302,6 +2331,7 @@ namespace vr
 	static const char * const k_pch_CollisionBounds_ColorGammaG_Int32 = "CollisionBoundsColorGammaG";
 	static const char * const k_pch_CollisionBounds_ColorGammaB_Int32 = "CollisionBoundsColorGammaB";
 	static const char * const k_pch_CollisionBounds_ColorGammaA_Int32 = "CollisionBoundsColorGammaA";
+	static const char * const k_pch_CollisionBounds_EnableDriverImport = "enableDriverBoundsImport";

 	//-----------------------------------------------------------------------------
 	// camera keys
@@ -2320,11 +2350,19 @@ namespace vr
 	//-----------------------------------------------------------------------------
 	// audio keys
 	static const char * const k_pch_audio_Section = "audio";
-	static const char * const k_pch_audio_OnPlaybackDevice_String = "onPlaybackDevice";
-	static const char * const k_pch_audio_OnRecordDevice_String = "onRecordDevice";
-	static const char * const k_pch_audio_OnPlaybackMirrorDevice_String = "onPlaybackMirrorDevice";
-	static const char * const k_pch_audio_OffPlaybackDevice_String = "offPlaybackDevice";
-	static const char * const k_pch_audio_OffRecordDevice_String = "offRecordDevice";
+	static const char * const k_pch_audio_SetOsDefaultPlaybackDevice_Bool = "setOsDefaultPlaybackDevice";
+	static const char * const k_pch_audio_EnablePlaybackDeviceOverride_Bool = "enablePlaybackDeviceOverride";
+	static const char * const k_pch_audio_PlaybackDeviceOverride_String = "playbackDeviceOverride";
+	static const char * const k_pch_audio_PlaybackDeviceOverrideName_String = "playbackDeviceOverrideName";
+	static const char * const k_pch_audio_SetOsDefaultRecordingDevice_Bool = "setOsDefaultRecordingDevice";
+	static const char * const k_pch_audio_EnableRecordingDeviceOverride_Bool = "enableRecordingDeviceOverride";
+	static const char * const k_pch_audio_RecordingDeviceOverride_String = "recordingDeviceOverride";
+	static const char * const k_pch_audio_RecordingDeviceOverrideName_String = "recordingDeviceOverrideName";
+	static const char * const k_pch_audio_EnablePlaybackMirror_Bool = "enablePlaybackMirror";
+	static const char * const k_pch_audio_PlaybackMirrorDevice_String = "playbackMirrorDevice";
+	static const char * const k_pch_audio_PlaybackMirrorDeviceName_String = "playbackMirrorDeviceName";
+	static const char * const k_pch_audio_OldPlaybackMirrorDevice_String = "onPlaybackMirrorDevice";
+	static const char * const k_pch_audio_LastHmdPlaybackDeviceId_String = "lastHmdPlaybackDeviceId";
 	static const char * const k_pch_audio_VIVEHDMIGain = "viveHDMIGain";

 	//-----------------------------------------------------------------------------
@@ -2342,10 +2380,8 @@ namespace vr
 	static const char * const k_pch_Dashboard_Section = "dashboard";
 	static const char * const k_pch_Dashboard_EnableDashboard_Bool = "enableDashboard";
 	static const char * const k_pch_Dashboard_ArcadeMode_Bool = "arcadeMode";
-	static const char * const k_pch_Dashboard_UseWebDashboard = "useWebDashboard";
+	static const char * const k_pch_Dashboard_UseWebKeyboard = "useWebKeyboard";
 	static const char * const k_pch_Dashboard_UseWebSettings = "useWebSettings";
-	static const char * const k_pch_Dashboard_UseWebIPD = "useWebIPD";
-	static const char * const k_pch_Dashboard_UseWebPowerMenu = "useWebPowerMenu";

 	//-----------------------------------------------------------------------------
 	// model skin keys
@@ -2359,8 +2395,6 @@ namespace vr
 	//-----------------------------------------------------------------------------
 	// web interface keys
 	static const char* const k_pch_WebInterface_Section = "WebInterface";
-	static const char* const k_pch_WebInterface_WebEnable_Bool = "WebEnable";
-	static const char* const k_pch_WebInterface_WebPort_String = "WebPort";

 	//-----------------------------------------------------------------------------
 	// vrwebhelper keys
@@ -2799,6 +2833,11 @@ static const char *IVRCompositorPluginProvider_Version = "IVRCompositorPluginPro
 namespace vr
 {

+	/** This container is automatically created before a display redirect device is activated.
+	* Any properties in this container will be returned when that property is read from the HMD's
+	* property container. */
+	static const PropertyContainerHandle_t k_ulDisplayRedirectContainer = 0x600000003;
+
 	enum EPropertyWriteType
 	{
 		PropertyWrite_Set = 0,