History

merge upstream/master into andrew/inertia

Andrew Meadows committed 11 years ago

Commit 47f2cbd2 parents 51da678 2c6a76e36 files · +621 −92Browse files

Showing the changes to interface/src/Application.cpp (1 of 36 files). Show all

Unified · Split

interface/src/Application.cpp+8−0
@@ -2689,6 +2689,14 @@ void Application::queryOctree(NodeType_t serverType, PacketType packetType, Node · 2688 unmodified lines
2689 }2689 }
2690}2690}
2691 2691
2692bool Application::isHMDMode() const {
2693 if (OculusManager::isConnected()) {
2694 return true;
2695 } else {
2696 return false;
2697 }
2698}
2699
2692/////////////////////////////////////////////////////////////////////////////////////2700/////////////////////////////////////////////////////////////////////////////////////
2693// loadViewFrustum()2701// loadViewFrustum()
2694//2702//

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t