From 923c39cdc018d7de981fcb162e6d886f22a7ec5c Mon Sep 17 00:00:00 2001 From: Jeffrey Ventrella Date: Tue, 28 May 2013 17:57:11 -0700 Subject: [PATCH 1/2] fixed third person shift bug --- interface/src/Application.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 9671e66f54..8a0ccdc8c3 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -915,7 +915,7 @@ void Application::idle() { _myAvatar.simulate(deltaTime, NULL); } - if (_myCamera.getMode() != CAMERA_MODE_MIRROR) { + if (_myCamera.getMode() != CAMERA_MODE_MIRROR && !OculusManager::isConnected()) { if (_manualFirstPerson) { if (_myCamera.getMode() != CAMERA_MODE_FIRST_PERSON ) { _myCamera.setMode(CAMERA_MODE_FIRST_PERSON); From 82683dbabcc2f317a1ebfc23989eae2f78ff7a20 Mon Sep 17 00:00:00 2001 From: Jeffrey Ventrella Date: Tue, 28 May 2013 17:58:02 -0700 Subject: [PATCH 2/2] merge --- libraries/voxels/src/AABox.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 libraries/voxels/src/AABox.h diff --git a/libraries/voxels/src/AABox.h b/libraries/voxels/src/AABox.h old mode 100755 new mode 100644