Merge branch 'master' into alpha-kung

2019-01-17 01:55:12 +09:00
parent 8a779b518f 5ee667a56b
commit 6fcf0b1a54
6 changed files with 65 additions and 3 deletions
@@ -54,6 +54,10 @@ private:
    float m_offsetZ = 0.0f;
    int m_rotation = 0;
    int m_tempRotation = 0;
+<<<<<<< HEAD
+=======
+    int m_rotationOld = 0;
+>>>>>>> master
    bool m_adjustChaperone = true;
    bool m_rotateHand = false;
    bool m_moveShortcutRightPressed = false;