From 2f887228cfa9ec7da9dbae36618f57b0dfd731f8 Mon Sep 17 00:00:00 2001
From: luiscuenca <luiscuenca@outboxcode.com>
Date: Fri, 22 Nov 2019 14:51:37 -0700
Subject: [PATCH 1/7] Fix camera pitch by mouse pitch

---
 .../input-plugins/src/input-plugins/KeyboardMouseDevice.cpp   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.cpp b/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.cpp
index f17caf22db..ea948a929b 100755
--- a/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.cpp
+++ b/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.cpp
@@ -146,7 +146,7 @@ bool KeyboardMouseDevice::isWheelByTouchPad(QWheelEvent* event) {
         } else {
             _wheelDeltaRepeatCount.setX(0);
         }
-        return deltaValueX != COMMON_WHEEL_DELTA_VALUE && _wheelDeltaRepeatCount.x() < MAX_WHEEL_DELTA_REPEAT;
+        return deltaValueX < COMMON_WHEEL_DELTA_VALUE && _wheelDeltaRepeatCount.x() < MAX_WHEEL_DELTA_REPEAT;
     }
     if (deltaValueY != 0) {
         if (abs(_lastWheelDelta.y()) == deltaValueY) {
@@ -154,7 +154,7 @@ bool KeyboardMouseDevice::isWheelByTouchPad(QWheelEvent* event) {
         } else {
             _wheelDeltaRepeatCount.setY(0);
         }
-        return deltaValueY != COMMON_WHEEL_DELTA_VALUE && _wheelDeltaRepeatCount.y() < MAX_WHEEL_DELTA_REPEAT;
+        return deltaValueY < COMMON_WHEEL_DELTA_VALUE && _wheelDeltaRepeatCount.y() < MAX_WHEEL_DELTA_REPEAT;
     }
     return false;
 }

From 69a063a7008811140ddd2cbda7e57d0d96c9cbfe Mon Sep 17 00:00:00 2001
From: luiscuenca <luiscuenca@outboxcode.com>
Date: Mon, 25 Nov 2019 10:19:54 -0700
Subject: [PATCH 2/7] Better mouse wheel detection and attenuated touchpad X
 axis

---
 .../src/input-plugins/KeyboardMouseDevice.cpp | 38 +++++++++++--------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.cpp b/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.cpp
index ea948a929b..b1b8875804 100755
--- a/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.cpp
+++ b/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.cpp
@@ -138,23 +138,28 @@ bool KeyboardMouseDevice::isWheelByTouchPad(QWheelEvent* event) {
     QPoint delta = event->angleDelta();
     int deltaValueX = abs(delta.x());
     int deltaValueY = abs(delta.y());
-    const int MAX_WHEEL_DELTA_REPEAT = 20;
     const int COMMON_WHEEL_DELTA_VALUE = 120;
-    if (deltaValueX != 0) {
-        if (abs(_lastWheelDelta.x()) == deltaValueX) {
-            _wheelDeltaRepeatCount.setX(_wheelDeltaRepeatCount.x() + 1);
-        } else {
-            _wheelDeltaRepeatCount.setX(0);
+    // If deltaValueX or deltaValueY are multiple of 120 they are triggered by a mouse wheel
+    bool isMouseWheel = (deltaValueX + deltaValueY) % COMMON_WHEEL_DELTA_VALUE == 0;
+    if (!isMouseWheel) {
+        // We track repetition in wheel values to detect non-standard mouse wheels
+        const int MAX_WHEEL_DELTA_REPEAT = 10;
+        if (deltaValueX != 0) {
+            if (abs(_lastWheelDelta.x()) == deltaValueX) {
+                _wheelDeltaRepeatCount.setX(_wheelDeltaRepeatCount.x() + 1);
+            } else {
+                _wheelDeltaRepeatCount.setX(0);
+            }
+            return _wheelDeltaRepeatCount.x() < MAX_WHEEL_DELTA_REPEAT;
         }
-        return deltaValueX < COMMON_WHEEL_DELTA_VALUE && _wheelDeltaRepeatCount.x() < MAX_WHEEL_DELTA_REPEAT;
-    }
-    if (deltaValueY != 0) {
-        if (abs(_lastWheelDelta.y()) == deltaValueY) {
-            _wheelDeltaRepeatCount.setY(_wheelDeltaRepeatCount.y() + 1);
-        } else {
-            _wheelDeltaRepeatCount.setY(0);
+        if (deltaValueY != 0) {
+            if (abs(_lastWheelDelta.y()) == deltaValueY) {
+                _wheelDeltaRepeatCount.setY(_wheelDeltaRepeatCount.y() + 1);
+            } else {
+                _wheelDeltaRepeatCount.setY(0);
+            }
+            return _wheelDeltaRepeatCount.y() < MAX_WHEEL_DELTA_REPEAT;
         }
-        return deltaValueY < COMMON_WHEEL_DELTA_VALUE && _wheelDeltaRepeatCount.y() < MAX_WHEEL_DELTA_REPEAT;
     }
     return false;
 }
@@ -166,8 +171,9 @@ void KeyboardMouseDevice::wheelEvent(QWheelEvent* event) {
         QPoint delta = event->angleDelta();
         float deltaX = (float)delta.x();
         float deltaY = (float)delta.y();
-        _inputDevice->_axisStateMap[_inputDevice->makeInput(TOUCH_AXIS_X_POS).getChannel()].value = (deltaX > 0 ? deltaX : 0.0f);
-        _inputDevice->_axisStateMap[_inputDevice->makeInput(TOUCH_AXIS_X_NEG).getChannel()].value = (deltaX < 0 ? -deltaX : 0.0f);
+        const float WHEEL_X_ATTENUATION = 0.3f;
+        _inputDevice->_axisStateMap[_inputDevice->makeInput(TOUCH_AXIS_X_POS).getChannel()].value = (deltaX > 0 ? WHEEL_X_ATTENUATION * deltaX : 0.0f);
+        _inputDevice->_axisStateMap[_inputDevice->makeInput(TOUCH_AXIS_X_NEG).getChannel()].value = (deltaX < 0 ? -WHEEL_X_ATTENUATION * deltaX : 0.0f);
         // Y mouse is inverted positive is pointing up the screen
         const float WHEEL_Y_ATTENUATION = 0.02f;
         _inputDevice->_axisStateMap[_inputDevice->makeInput(TOUCH_AXIS_Y_POS).getChannel()].value = (deltaY < 0 ? -WHEEL_Y_ATTENUATION * deltaY : 0.0f);

From 0240a6e3d9fb11a923cb137b00445dfae5196555 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Mon, 25 Nov 2019 11:42:09 -0800
Subject: [PATCH 3/7] Update prebuilt dependencies

---
 cmake/macros/TargetAristo.cmake      | 15 +++++++++++++++
 cmake/macros/TargetSRanipalEye.cmake | 18 ++++++++++++++++++
 cmake/ports/aristo/CONTROL           |  3 +++
 cmake/ports/aristo/portfile.cmake    | 20 ++++++++++++++++++++
 cmake/ports/hifi-client-deps/CONTROL |  2 +-
 cmake/ports/sranipal/CONTROL         |  3 +++
 cmake/ports/sranipal/portfile.cmake  | 20 ++++++++++++++++++++
 cmake/ports/zlib/CONTROL             |  3 ++-
 cmake/ports/zlib/portfile.cmake      | 17 ++++++++++-------
 hifi_vcpkg.py                        |  5 ++---
 10 files changed, 94 insertions(+), 12 deletions(-)
 create mode 100644 cmake/macros/TargetAristo.cmake
 create mode 100644 cmake/macros/TargetSRanipalEye.cmake
 create mode 100644 cmake/ports/aristo/CONTROL
 create mode 100644 cmake/ports/aristo/portfile.cmake
 create mode 100644 cmake/ports/sranipal/CONTROL
 create mode 100644 cmake/ports/sranipal/portfile.cmake

diff --git a/cmake/macros/TargetAristo.cmake b/cmake/macros/TargetAristo.cmake
new file mode 100644
index 0000000000..a28e7b5cdd
--- /dev/null
+++ b/cmake/macros/TargetAristo.cmake
@@ -0,0 +1,15 @@
+#
+#  Copyright 2019 High Fidelity, Inc.
+#
+#  Distributed under the Apache License, Version 2.0.
+#  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+#
+macro(TARGET_ARISTO)
+
+if (WIN32)
+    target_include_directories(${TARGET_NAME} SYSTEM PUBLIC "${VCPKG_INSTALL_ROOT}/include")
+    find_library(ARISTO_LIBRARY NAMES aristo_interface PATHS ${VCPKG_INSTALL_ROOT}/lib/ NO_DEFAULT_PATH)
+    target_link_libraries(${TARGET_NAME} ${ARISTO_LIBRARY})
+endif()
+
+endmacro()
diff --git a/cmake/macros/TargetSRanipalEye.cmake b/cmake/macros/TargetSRanipalEye.cmake
new file mode 100644
index 0000000000..5644d30e92
--- /dev/null
+++ b/cmake/macros/TargetSRanipalEye.cmake
@@ -0,0 +1,18 @@
+#
+#  Copyright 2019 High Fidelity, Inc.
+#
+#  Distributed under the Apache License, Version 2.0.
+#  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+#
+macro(TARGET_SRANIPAL)
+
+if (WIN32)
+    target_include_directories(${TARGET_NAME} SYSTEM PUBLIC "${VCPKG_INSTALL_ROOT}/include")
+    find_library(SRANIPAL_LIBRARY NAMES SRanipal PATHS ${VCPKG_INSTALL_ROOT}/lib/ NO_DEFAULT_PATH)
+    target_link_libraries(${TARGET_NAME} ${SRANIPAL_LIBRARY})
+
+    find_library(SRANIPAL_LIBRARY NAMES SRanipal PATHS ${VCPKG_INSTALL_ROOT}/lib/ NO_DEFAULT_PATH)
+    target_link_libraries(${TARGET_NAME} ${SRANIPAL_LIBRARY})
+endif()
+
+endmacro()
diff --git a/cmake/ports/aristo/CONTROL b/cmake/ports/aristo/CONTROL
new file mode 100644
index 0000000000..a022c6ea9f
--- /dev/null
+++ b/cmake/ports/aristo/CONTROL
@@ -0,0 +1,3 @@
+Source: aristo
+Version: 0.8.1
+Description: Aristo
diff --git a/cmake/ports/aristo/portfile.cmake b/cmake/ports/aristo/portfile.cmake
new file mode 100644
index 0000000000..5c3259a34a
--- /dev/null
+++ b/cmake/ports/aristo/portfile.cmake
@@ -0,0 +1,20 @@
+include(vcpkg_common_functions)
+set(ARISTO_VERSION 0.8.1)
+set(MASTER_COPY_SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src)
+
+if (WIN32)
+    vcpkg_download_distfile(
+        ARISTO_SOURCE_ARCHIVE
+        URLS https://hifi-public.s3.amazonaws.com/seth/aristo-0.8.1-windows.zip
+        SHA512 05179c63b72a1c9f5be8a7a2b7389025da683400dbf819e5a6199dd6473c56774d2885182dc5a11cb6324058d228a4ead832222e8b3e1bebaa4c61982e85f0a8
+        FILENAME aristo-0.8.1-windows.zip
+    )
+
+    vcpkg_extract_source_archive(${ARISTO_SOURCE_ARCHIVE})
+    file(COPY ${MASTER_COPY_SOURCE_PATH}/aristo/include DESTINATION ${CURRENT_PACKAGES_DIR})
+    file(COPY ${MASTER_COPY_SOURCE_PATH}/aristo/lib DESTINATION ${CURRENT_PACKAGES_DIR})
+    file(COPY ${MASTER_COPY_SOURCE_PATH}/aristo/debug DESTINATION ${CURRENT_PACKAGES_DIR})
+    file(COPY ${MASTER_COPY_SOURCE_PATH}/aristo/bin DESTINATION ${CURRENT_PACKAGES_DIR})
+    file(COPY ${MASTER_COPY_SOURCE_PATH}/aristo/share DESTINATION ${CURRENT_PACKAGES_DIR})
+
+endif ()
diff --git a/cmake/ports/hifi-client-deps/CONTROL b/cmake/ports/hifi-client-deps/CONTROL
index 86bb64e287..7070cb6fb9 100644
--- a/cmake/ports/hifi-client-deps/CONTROL
+++ b/cmake/ports/hifi-client-deps/CONTROL
@@ -1,4 +1,4 @@
 Source: hifi-client-deps
 Version: 0.1
 Description: Collected dependencies for High Fidelity applications
-Build-Depends: hifi-deps, glslang, nlohmann-json, openvr (windows), quazip (!android), sdl2 (!android), spirv-cross (!android), spirv-tools (!android), vulkanmemoryallocator, liblo (windows)
+Build-Depends: hifi-deps, aristo (windows), glslang, liblo (windows), nlohmann-json, openvr (windows), quazip (!android), sdl2 (!android), spirv-cross (!android), spirv-tools (!android), sranipal (windows), vulkanmemoryallocator
diff --git a/cmake/ports/sranipal/CONTROL b/cmake/ports/sranipal/CONTROL
new file mode 100644
index 0000000000..3f878b1c4d
--- /dev/null
+++ b/cmake/ports/sranipal/CONTROL
@@ -0,0 +1,3 @@
+Source: sranipal
+Version: 1.1.0.1
+Description: SRanipal
diff --git a/cmake/ports/sranipal/portfile.cmake b/cmake/ports/sranipal/portfile.cmake
new file mode 100644
index 0000000000..f71271d780
--- /dev/null
+++ b/cmake/ports/sranipal/portfile.cmake
@@ -0,0 +1,20 @@
+include(vcpkg_common_functions)
+set(SRANIPAL_VERSION 1.1.0.1)
+set(MASTER_COPY_SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src)
+
+if (WIN32)
+    vcpkg_download_distfile(
+        SRANIPAL_SOURCE_ARCHIVE
+        URLS https://hifi-public.s3.amazonaws.com/seth/sranipal-1.1.0.1-windows.zip
+        SHA512 b09ce012abe4e3c71e8e69626bdd7823ff6576601a821ab365275f2764406a3e5f7b65fcf2eb1d0962eff31eb5958a148b00901f67c229dc6ace56eb5e6c9e1b
+        FILENAME sranipal-1.1.0.1-windows.zip
+    )
+
+    vcpkg_extract_source_archive(${SRANIPAL_SOURCE_ARCHIVE})
+    file(COPY ${MASTER_COPY_SOURCE_PATH}/sranipal/include DESTINATION ${CURRENT_PACKAGES_DIR})
+    file(COPY ${MASTER_COPY_SOURCE_PATH}/sranipal/lib DESTINATION ${CURRENT_PACKAGES_DIR})
+    file(COPY ${MASTER_COPY_SOURCE_PATH}/sranipal/debug DESTINATION ${CURRENT_PACKAGES_DIR})
+    file(COPY ${MASTER_COPY_SOURCE_PATH}/sranipal/bin DESTINATION ${CURRENT_PACKAGES_DIR})
+    file(COPY ${MASTER_COPY_SOURCE_PATH}/sranipal/share DESTINATION ${CURRENT_PACKAGES_DIR})
+
+endif ()
diff --git a/cmake/ports/zlib/CONTROL b/cmake/ports/zlib/CONTROL
index c559637834..aa7c7b6e92 100644
--- a/cmake/ports/zlib/CONTROL
+++ b/cmake/ports/zlib/CONTROL
@@ -1,3 +1,4 @@
 Source: zlib
-Version: 1.2.11-3
+Version: 1.2.11-5
+Homepage: https://www.zlib.net/
 Description: A compression library
diff --git a/cmake/ports/zlib/portfile.cmake b/cmake/ports/zlib/portfile.cmake
index f2cc68b7a3..78030309b1 100644
--- a/cmake/ports/zlib/portfile.cmake
+++ b/cmake/ports/zlib/portfile.cmake
@@ -1,16 +1,19 @@
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/zlib-1.2.11)
+
+set(VERSION 1.2.11)
+
 vcpkg_download_distfile(ARCHIVE_FILE
-    URLS "http://www.zlib.net/zlib-1.2.11.tar.gz" "https://downloads.sourceforge.net/project/libpng/zlib/1.2.11/zlib-1.2.11.tar.gz"
+    URLS "http://www.zlib.net/zlib-${VERSION}.tar.gz" "https://downloads.sourceforge.net/project/libpng/zlib/${VERSION}/zlib-${VERSION}.tar.gz"
     FILENAME "zlib1211.tar.gz"
     SHA512 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae
 )
-vcpkg_extract_source_archive(${ARCHIVE_FILE})
 
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE_FILE}
+    REF ${VERSION}
     PATCHES
-    ${CMAKE_CURRENT_LIST_DIR}/cmake_dont_build_more_than_needed.patch
+        "cmake_dont_build_more_than_needed.patch"
 )
 
 # This is generated during the cmake build
@@ -44,4 +47,4 @@ vcpkg_copy_pdbs()
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
 
-#vcpkg_test_cmake(PACKAGE_NAME ZLIB MODULE)
+vcpkg_test_cmake(PACKAGE_NAME ZLIB MODULE)
diff --git a/hifi_vcpkg.py b/hifi_vcpkg.py
index 1d80223357..9578f56e0d 100644
--- a/hifi_vcpkg.py
+++ b/hifi_vcpkg.py
@@ -82,9 +82,8 @@ endif()
             self.vcpkgUrl = 'https://hifi-public.s3.amazonaws.com/dependencies/vcpkg/builds/vcpkg-win32-client.zip?versionId=tSFzbw01VkkVFeRQ6YuAY4dro2HxJR9U'
             self.vcpkgHash = 'a650db47a63ccdc9904b68ddd16af74772e7e78170b513ea8de5a3b47d032751a3b73dcc7526d88bcb500753ea3dd9880639ca842bb176e2bddb1710f9a58cd3'
             self.hostTriplet = 'x64-windows'
-# Don't use prebuilt on windows, because it is out of date with the inclusion of liblo.
-#           if ('CI_BUILD' in os.environ) and os.environ["CI_BUILD"] == "Github" and (not self.noClean):
-#               self.prebuiltArchive = "https://hifi-public.s3.amazonaws.com/dependencies/vcpkg/builds/vcpkg-win32.zip?versionId=LtGKnBydCxteY3Ub1W_UNBN5sH.Ccp5g"
+            if ('CI_BUILD' in os.environ) and os.environ["CI_BUILD"] == "Github" and (not self.noClean):
+               self.prebuiltArchive = "https://hifi-public.s3.amazonaws.com/dependencies/vcpkg/builds/vcpkg-win32.zip?versionId=3SF3mDC8dkQH1JP041m88xnYmWNzZflx"
         elif 'Darwin' == system:
             self.exe = os.path.join(self.path, 'vcpkg')
             self.bootstrapCmds = [ os.path.join(self.path, 'bootstrap-vcpkg.sh'), '--allowAppleClang' ]

From d8ba0564b528ae252391b1e5cb033c42e1769b02 Mon Sep 17 00:00:00 2001
From: Dante Ruiz <danteruiz102@gmail.com>
Date: Fri, 22 Nov 2019 15:55:57 -0800
Subject: [PATCH 4/7] Adding QT Launcher Documention

---
 launchers/qt/BUILD.md  | 11 +++++++++++
 launchers/qt/readme.md | 20 ++++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 launchers/qt/BUILD.md
 create mode 100644 launchers/qt/readme.md

diff --git a/launchers/qt/BUILD.md b/launchers/qt/BUILD.md
new file mode 100644
index 0000000000..de6b91458c
--- /dev/null
+++ b/launchers/qt/BUILD.md
@@ -0,0 +1,11 @@
+# Dependencies
+- [cmake](https://cmake.org/download/):  3.9
+
+# Windows
+cmake -G "Visual Studio 16 2019" ..
+
+# OSX
+cmake -G Xcode ..
+
+
+if you wish to not use the compiled qml files pass the `-DLAUNCHER_SOURCE_TREE_RESOURCES=On` argument to cmake.
\ No newline at end of file
diff --git a/launchers/qt/readme.md b/launchers/qt/readme.md
new file mode 100644
index 0000000000..fda076340a
--- /dev/null
+++ b/launchers/qt/readme.md
@@ -0,0 +1,20 @@
+# HQ Launcher
+Behavior of the HQ Launcher is as follows:
+* Launching the user in the current HQ domain
+* Update the Interface client to the current version.
+* Update the HQ Launcher to the current version
+
+# directory structure
+
+## src/ - contains the c++ and objective-c.
+* LauncherState - hold majority of the logic of the launcher (signin, config file, updating, running launcher)
+* LauncherInstaller_windows - logic of how to install/uninstall HQ Launcher on windows
+* Helper - helper functions
+* UserSettings - getting the users setting (home location) from metaverse
+* BuildsRequest - getting / parsing the build info from thunder api
+* LoginRequest - checks the login credentials the user typed in. 
+* Unzipper - helper class for extracting zip files
+
+## resources/
+* image/ - Holds the images and icon that are used by the launcher
+* qml/ - UI elements - `QML_FILE_FOR_UI_STATE` varible in LauchherState defines what qml files are used by the laucnher.
\ No newline at end of file

From c08a18c517c0e23c34112f4bb1e0bcded92d4c62 Mon Sep 17 00:00:00 2001
From: danteruiz <danteruiz102@gmail.com>
Date: Mon, 25 Nov 2019 14:50:58 -0800
Subject: [PATCH 5/7] making requested changes

---
 launchers/qt/BUILD.md  | 10 ++++++----
 launchers/qt/readme.md | 36 +++++++++++++++++++++++++-----------
 2 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/launchers/qt/BUILD.md b/launchers/qt/BUILD.md
index de6b91458c..d08aa6bfa0 100644
--- a/launchers/qt/BUILD.md
+++ b/launchers/qt/BUILD.md
@@ -2,10 +2,12 @@
 - [cmake](https://cmake.org/download/):  3.9
 
 # Windows
-cmake -G "Visual Studio 16 2019" ..
+* Download `Visual Studio 2019`
+`cmake -G "Visual Studio 16 2019" ..`
 
-# OSX
-cmake -G Xcode ..
+# MacOS
+* Install `Xcode`
+`cmake -G Xcode ..`
 
 
-if you wish to not use the compiled qml files pass the `-DLAUNCHER_SOURCE_TREE_RESOURCES=On` argument to cmake.
\ No newline at end of file
+If you wish to not use the compiled qml files, pass the `-DLAUNCHER_SOURCE_TREE_RESOURCES=On` argument to cmake.
\ No newline at end of file
diff --git a/launchers/qt/readme.md b/launchers/qt/readme.md
index fda076340a..beaa54eebe 100644
--- a/launchers/qt/readme.md
+++ b/launchers/qt/readme.md
@@ -1,20 +1,34 @@
 # HQ Launcher
 Behavior of the HQ Launcher is as follows:
+* Update the HQ Launcher to the latest version
+* Sign up and sign in is the user is not
+* Download the latest Interface client
 * Launching the user in the current HQ domain
-* Update the Interface client to the current version.
-* Update the HQ Launcher to the current version
 
 # directory structure
 
 ## src/ - contains the c++ and objective-c.
-* LauncherState - hold majority of the logic of the launcher (signin, config file, updating, running launcher)
-* LauncherInstaller_windows - logic of how to install/uninstall HQ Launcher on windows
-* Helper - helper functions
-* UserSettings - getting the users setting (home location) from metaverse
-* BuildsRequest - getting / parsing the build info from thunder api
-* LoginRequest - checks the login credentials the user typed in. 
-* Unzipper - helper class for extracting zip files
+* `BuildsRequest` - getting / parsing the build info from thunder api
+* `CommandlineOptions` - parses and stores commandline arguments
+* `Helper` - helper functions
+* `Helper_darwin` - objective-c implemention of helper funcions
+* `Helper_windows` - helper function that depend on windows api
+* `Launcher` - initialized the Launcher Application and resources
+* `LauncherInstaller_windows` - logic of how to install/uninstall HQ Launcher on windows
+* `LauncherState` - hold majority of the logic of the launcher (signin, config file, updating, running launcher)
+  * config files hold the following saved data
+    * logged in
+    * home location
+* `LauncherWindows` - wrapper for `QQuickWindow` that implements drag feature
+* `LoginRequest` - checks the login credentials the user typed in.
+* `NSTask+NSTaskExecveAddtions` - Extension of NSTask for replacing Launcher process with interface client process
+* `PathUtils` - Helper class for getting relative paths for HQ Launcher
+* `SignupRequest` - Determines if the users request to signup for a new account succeeded based on the entered credentials
+* `Unzipper` - helper class for extracting zip files
+* `UserSettingsRequest` - getting the users setting (home location) from metaverse
 
 ## resources/
-* image/ - Holds the images and icon that are used by the launcher
-* qml/ - UI elements - `QML_FILE_FOR_UI_STATE` varible in LauchherState defines what qml files are used by the laucnher.
\ No newline at end of file
+* `images/`-  Holds the images and icon that are used by the launcher
+* `qml/`
+  * UI elements
+  * `QML_FILE_FOR_UI_STATE` varible in LauchherState defines what qml files are used by the laucnher.
\ No newline at end of file

From e0c5edfccd6a4356f80ca0bd1450bf053169052c Mon Sep 17 00:00:00 2001
From: danteruiz <danteruiz102@gmail.com>
Date: Mon, 25 Nov 2019 14:58:40 -0800
Subject: [PATCH 6/7] fix typos

---
 launchers/qt/readme.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/launchers/qt/readme.md b/launchers/qt/readme.md
index beaa54eebe..917c647511 100644
--- a/launchers/qt/readme.md
+++ b/launchers/qt/readme.md
@@ -21,7 +21,7 @@ Behavior of the HQ Launcher is as follows:
     * home location
 * `LauncherWindows` - wrapper for `QQuickWindow` that implements drag feature
 * `LoginRequest` - checks the login credentials the user typed in.
-* `NSTask+NSTaskExecveAddtions` - Extension of NSTask for replacing Launcher process with interface client process
+* `NSTask+NSTaskExecveAdditions` - Extension of NSTask for replacing Launcher process with interface client process
 * `PathUtils` - Helper class for getting relative paths for HQ Launcher
 * `SignupRequest` - Determines if the users request to signup for a new account succeeded based on the entered credentials
 * `Unzipper` - helper class for extracting zip files
@@ -31,4 +31,4 @@ Behavior of the HQ Launcher is as follows:
 * `images/`-  Holds the images and icon that are used by the launcher
 * `qml/`
   * UI elements
-  * `QML_FILE_FOR_UI_STATE` varible in LauchherState defines what qml files are used by the laucnher.
\ No newline at end of file
+  * `QML_FILE_FOR_UI_STATE` variable in `LauchherState` defines what QML files are used by the Laucnher.
\ No newline at end of file

From 60140a3aca0fe68e5a493a50e49cbc9dde5ad341 Mon Sep 17 00:00:00 2001
From: danteruiz <danteruiz102@gmail.com>
Date: Mon, 25 Nov 2019 15:22:47 -0800
Subject: [PATCH 7/7] fix more typos

---
 launchers/qt/readme.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/launchers/qt/readme.md b/launchers/qt/readme.md
index 917c647511..ce4e846172 100644
--- a/launchers/qt/readme.md
+++ b/launchers/qt/readme.md
@@ -1,9 +1,9 @@
 # HQ Launcher
 Behavior of the HQ Launcher is as follows:
 * Update the HQ Launcher to the latest version
-* Sign up and sign in is the user is not
+* Sign up or sign in if is the user is not already signed in
 * Download the latest Interface client
-* Launching the user in the current HQ domain
+* Launch the user in the current HQ domain
 
 # directory structure
 
@@ -31,4 +31,4 @@ Behavior of the HQ Launcher is as follows:
 * `images/`-  Holds the images and icon that are used by the launcher
 * `qml/`
   * UI elements
-  * `QML_FILE_FOR_UI_STATE` variable in `LauchherState` defines what QML files are used by the Laucnher.
\ No newline at end of file
+  * `QML_FILE_FOR_UI_STATE` variable in `LauncherState` defines what QML files are used by the Launcher.
\ No newline at end of file