Commit graph

8 commits

Author SHA1 Message Date
Brad Davis
19fb4e92a6 Enabling programmatic access to the IPD scale
Conflicts:
	interface/src/Application.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/scripting/HMDScriptingInterface.cpp
	interface/src/scripting/HMDScriptingInterface.h
2015-10-06 19:08:17 -07:00
Brad Davis
8090bc8e8d Revert "Enabling programmatic access to the IPD scale" 2015-10-06 10:16:42 -07:00
Brad Hefta-Gaub
d95fe3ddb7 Merge pull request #5989 from jherico/homer
Enabling programmatic access to the IPD scale
2015-10-05 17:22:19 -07:00
Clément Brisset
5eda3095bb Merge pull request #5998 from birarda/qt-5.5
suppress warnings for overriden methods in Xcode 7
2015-10-05 17:00:43 -07:00
Stephen Birarda
25a1f2dd11 add override to suppress warning for PluginContainerProxy 2015-10-05 15:53:37 -07:00
Howard Stearns
844270e306 Reset (as though by apostrophe key) whenever we calibrate the hydra. 2015-10-05 12:44:22 -07:00
Brad Davis
725ed26ac2 Enabling programmatic access to the IPD scale 2015-10-04 16:55:49 -07:00
Brad Davis
d3135dcfa6 Stereo rendering work 2015-08-22 16:15:10 -07:00