diff --git a/build_scripts/win/common.py b/build_scripts/win/common.py index 90e58b6..7166200 100644 --- a/build_scripts/win/common.py +++ b/build_scripts/win/common.py @@ -11,7 +11,7 @@ import distutils.dir_util #Const globals #Version string must be bumped every release. #TODO: See developer documentation. -VERSION_STRING = "2-8-0-dev" +VERSION_STRING = "3-0-0-rc1" EXIT_CODE_SUCCESS = 0 EXIT_CODE_FAILURE_BUILD_APP = 1 diff --git a/installer/installer.nsi b/installer/installer.nsi index 15123af..39a1fdb 100644 --- a/installer/installer.nsi +++ b/installer/installer.nsi @@ -11,7 +11,7 @@ !define THIRDDIR "..\third-party" !define PACKAGEDIR "..\src\package_files" !define PROJECTDIR "..\" - !define VERSION_STRING "2-8-0-dev" + !define VERSION_STRING "3-0-0-rc1" ;Installer icon diff --git a/src/openvr/ivrinput.h b/src/openvr/ivrinput.h index f0642f8..1399166 100644 --- a/src/openvr/ivrinput.h +++ b/src/openvr/ivrinput.h @@ -51,7 +51,6 @@ namespace action_keys constexpr auto hapticsLeft = "/actions/haptic/out/HapticsLeft"; constexpr auto hapticsRight = "/actions/haptic/out/HapticsRight"; - constexpr auto proxSensor = "/actions/haptic/in/ProxSensor"; } // namespace action_keys @@ -135,7 +134,6 @@ public: bool pushToTalk(); - bool proxIsActive(); vr::VRActionHandle_t leftHapticActionHandle(); vr::VRActionHandle_t rightHapticActionHandle(); diff --git a/src/overlaycontroller.h b/src/overlaycontroller.h index 23bd74d..bf98acf 100644 --- a/src/overlaycontroller.h +++ b/src/overlaycontroller.h @@ -46,7 +46,7 @@ constexpr auto applicationOrganizationName = "AdvancedSettings-Team"; constexpr auto applicationName = "OpenVRAdvancedSettings"; constexpr const char* applicationKey = "OVRAS-Team.AdvancedSettings"; constexpr const char* applicationDisplayName = "Advanced Settings"; -constexpr const char* applicationVersionString = "v2.8.0-dev"; +constexpr const char* applicationVersionString = "v3.0.0-RC1"; } // namespace application_strings // application namespace diff --git a/src/package_files/action_manifest.json b/src/package_files/action_manifest.json index 1983b91..83959df 100644 --- a/src/package_files/action_manifest.json +++ b/src/package_files/action_manifest.json @@ -3,14 +3,6 @@ { "controller_type": "vive_controller", "binding_url": "default_action_manifests/vive_defaults.json" - }, - { - "controller_type" : "generic", - "binding_url" : "default_action_manifests/generic_hmd_defaults.json" - }, - { - "controller_type" : "vive", - "binding_url" : "default_action_manifests/vive_hmd_defaults.json" } ], "actions": [ @@ -34,12 +26,6 @@ "requirement": "optional", "type": "boolean" }, - - { - "name": "/actions/haptic/in/ProxSensor", - "requirement": "optional", - "type": "boolean" - }, { "name": "/actions/haptic/out/HapticsLeft", "type": "vibration" @@ -176,7 +162,6 @@ "/actions/haptic" : "Haptics", "/actions/music" : "Music", "/actions/misc" : "Misc", - "/actions/accessibility" : "Accessibility", "/actions/motion" : "Motion", "/actions/music/in/NextTrack" : "Play Next Track", diff --git a/src/package_files/default_action_manifests/generic_hmd_defaults.json b/src/package_files/default_action_manifests/generic_hmd_defaults.json deleted file mode 100644 index 50f4155..0000000 --- a/src/package_files/default_action_manifests/generic_hmd_defaults.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "alias_info" : {}, - "bindings" : { - "/actions/default" : { - "sources" : [ - { - "inputs" : { - "click" : { - "output" : "/actions/main/in/ProxSensor" - } - }, - "mode" : "button", - "path" : "/user/head/proximity" - } - ] - } - }, - "controller_type" : "generic", - "description" : "Default config for HMD for Prox sensor.", - "name" : "Default configuration for HMD's", - "options" : {}, - "simulated_actions" : [] -} \ No newline at end of file diff --git a/src/package_files/default_action_manifests/vive_hmd_defaults.json b/src/package_files/default_action_manifests/vive_hmd_defaults.json deleted file mode 100644 index 9158fb3..0000000 --- a/src/package_files/default_action_manifests/vive_hmd_defaults.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "alias_info" : {}, - "bindings" : { - "/actions/default" : { - "sources" : [ - { - "inputs" : { - "click" : { - "output" : "/actions/main/in/ProxSensor" - } - }, - "mode" : "button", - "path" : "/user/head/proximity" - } - ] - } - }, - "controller_type" : "vive", - "description" : "Default config for vive HMD for Prox sensor.", - "name" : "Default configuration for vive HMD's", - "options" : {}, - "simulated_actions" : [] -} \ No newline at end of file