From f57347a89cc3036576ef8caf48ee34a0d09b31ca Mon Sep 17 00:00:00 2001
From: ykeara <ykeara1@gmail.com>
Date: Tue, 26 Mar 2019 11:30:15 -0500
Subject: [PATCH] Release 3.0.0 Pr Multiple reviews please. (#129)

* changed version to 3-0-0

* Updated docs with default bindings

* format fix

* changed ordering and fixed minor issue
---
 Readme.md                   | 47 ++++++++++++++++++++++++++++++-------
 build_scripts/win/common.py |  2 +-
 installer/installer.nsi     |  2 +-
 src/overlaycontroller.h     |  2 +-
 4 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/Readme.md b/Readme.md
index 2f5a462..d4ec599 100644
--- a/Readme.md
+++ b/Readme.md
@@ -9,6 +9,8 @@
  >   * [Installer](#installer)
  >   * [Standalone](#standalone)
  >   * [Bindings](#bindings)
+ >   * [Default Bindings](#default_bindings)
+ >   * [SteamVR Input Guide](#steamvr_input_guide)
  >   * [Command Line Arguments](#command_line_arguments)
  >   * [Preview Builds](#preview_builds)
  > * [Documentation](#documentation)
@@ -23,7 +25,6 @@
  >   * [Utilities Page](#utilities_page)
  >   * [Statistics Page](#statistics_page)
  >   * [Settings Page](#settings_page)
- > * [SteamVR Input Guide](#steamvr_input_guide)
  > * [How To Compile](#how_to_compile)
  >   * [Building on Windows](#building_on_windows)
  >   * [Building on Linux](#building_on_linux)
@@ -89,7 +90,6 @@ To upgrade an existing installation first stop SteamVR and delete the old applic
 
 After SteamVR beta 1.3.1 the bindings for Advanced Settings will show up in the bindings menu.
 
-By default no buttons are bound. TODO
 
 The following actions currently exist:
 ### Music
@@ -148,6 +148,42 @@ Actions to be handled by the system.
 | Haptics Left | Vibration | Handle for haptic events on the Left Controller. |
 | Haptics Right | Vibration | Handle for haptic events on the Right Controller. |
 
+
+<a name="default_bindings"></a>
+## Default Bindings
+
+### Vive Wands
+
+- Menu Button (both hands)
+  - **Single Click**: Space Turn (respective hand)
+  - **Double Click**: Space Drag (override) (respective hand)
+  - **Single Click**: Swap Active Space Drag (override) (respective hand)
+- TrackPad (right hand)
+  - **D-pad Down click**: Push-to-Talk
+- Haptics bound
+
+### Knuckles
+
+- B Button (both hands)
+  - **Single Click**: Space Turn (respective hand)
+  - **Double Click**: Space Drag (override) (respective hand)
+  - **Single Click**: Swap Active Space Drag (override) (respective hand)
+- Trigger (left hand)
+  - **Click**: Push-to-Talk
+- Haptics bound
+
+### Other Controllers
+
+No current default bindings you will have to make your own.
+
+
+<a name="steamvr_input_guide"></a>
+## SteamVR Input Guide
+
+A Guide to the SteamVR Input System can be found [here](docs/SteamVRInputGuide.md)
+
+**Or** a Video guide by Kung can be found [here](https://youtu.be/2ZHdjOfnqOU)
+
 <a name="command_line_arguments"></a>
 ## Command Line Arguments
 
@@ -316,13 +352,6 @@ Allows users to temporarily move and rotate the center of the playspace. This al
 - **Autostart:** Allows you to enable/disable auto start.
 - **Force Revive Page:** No Longer Supported Does Nothing.
 
-<a name="steamvr_input_guide"></a>
-# SteamVR Input Guide
-
-A Guide to the SteamVR Input System can be found [here](docs/SteamVRInputGuide.md)
-
-**Or** a Video guide by Kung can be found [here](https://youtu.be/2ZHdjOfnqOU)
-
 <a name="how_to_compile"></a>
 # How to Compile
 
diff --git a/build_scripts/win/common.py b/build_scripts/win/common.py
index 7166200..661fe7c 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 = "3-0-0-rc1"
+VERSION_STRING = "3-0-0"
 
 EXIT_CODE_SUCCESS = 0
 EXIT_CODE_FAILURE_BUILD_APP = 1
diff --git a/installer/installer.nsi b/installer/installer.nsi
index 39a1fdb..6a4a628 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 "3-0-0-rc1"
+        !define VERSION_STRING "3-0-0"
 
         
     ;Installer icon
diff --git a/src/overlaycontroller.h b/src/overlaycontroller.h
index bf98acf..2bb89d6 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 = "v3.0.0-RC1";
+constexpr const char* applicationVersionString = "v3.0.0";
 } // namespace application_strings
 
 // application namespace