Seth Alves 91254245e4 Merge branch 'master' of github.com:highfidelity/hifi into polyvox		2015-08-24 20:21:24 -07:00
..
audio	remove glLineWidth completely because it s not available anymore for wide lines in core	2015-08-04 11:57:20 -07:00
avatar	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-08-24 20:21:24 -07:00
devices	Fixing build problem with 3d connexion	2015-08-23 09:32:58 -07:00
octree	add a missed char[] in OctreePacketProcessor	2015-07-31 14:48:54 -07:00
scripting	cleanup controller interface, add getActionNames() and getDeviceNames()	2015-08-24 15:35:55 -07:00
ui	Merge pull request #5636 from howard-stearns/marketplace-avatars	2015-08-24 17:49:20 -07:00
AbstractLoggerInterface.h
Application.cpp	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-08-24 20:21:24 -07:00
Application.h	Stereo rendering work	2015-08-22 16:15:10 -07:00
Bookmarks.cpp
Bookmarks.h
Camera.cpp
Camera.h	Revert Camera.h changes.	2015-07-29 09:55:19 -07:00
DiscoverabilityManager.cpp
DiscoverabilityManager.h
FileLogger.cpp
FileLogger.h
FileUtils.cpp
FileUtils.h
GLCanvas.cpp	fix throttled rendering for the 2D display plugin	2015-08-19 21:11:48 -07:00
GLCanvas.h	fix throttled rendering for the 2D display plugin	2015-08-19 21:11:48 -07:00
InterfaceActionFactory.cpp
InterfaceActionFactory.h
InterfaceLogging.cpp
InterfaceLogging.h
LODManager.cpp
LODManager.h
main.cpp
MainWindow.cpp
MainWindow.h
Menu.cpp	Merge branch 'master' of https://github.com/worklist/hifi into 20660	2015-08-23 19:53:50 +02:00
Menu.h	"View -> World Axes" menu option	2015-08-23 17:59:58 +02:00
ModelPackager.cpp	ResourceCache, NetworkGeometry and Model refactoring and optimizations.	2015-08-20 18:59:51 -07:00
ModelPackager.h	ResourceCache, NetworkGeometry and Model refactoring and optimizations.	2015-08-20 18:59:51 -07:00
ModelPropertiesDialog.cpp
ModelPropertiesDialog.h
ModelSelector.cpp
ModelSelector.h
Physics.cpp
Physics.h
PluginContainerProxy.cpp	Stereo rendering work	2015-08-22 16:15:10 -07:00
PluginContainerProxy.h	Stereo rendering work	2015-08-22 16:15:10 -07:00
ScriptHighlighting.cpp
ScriptHighlighting.h
ScriptsModel.cpp
ScriptsModel.h
ScriptsModelFilter.cpp
ScriptsModelFilter.h
SpeechRecognizer.cpp
SpeechRecognizer.h
SpeechRecognizer.mm
Stars.cpp	New stereo rendering implementation	2015-08-21 00:29:24 -07:00
Stars.h
UIUtil.cpp
UIUtil.h
Util.cpp	style fixes	2015-08-23 20:01:58 +02:00
Util.h
world.h