Ryan Huffman b6ecd539df Merge branch 'master' of https://github.com/highfidelity/hifi into entity-query-keyhole		2015-12-10 14:36:03 -08:00
..
assets
audio
avatar	Merge pull request #6611 from Atlante45/attachments	2015-12-10 11:46:19 -08:00
devices	Remove RealSense & MIDI	2015-12-03 11:00:01 -08:00
octree	Remove verbose piggyback logging	2015-12-07 09:42:04 -08:00
scripting	Moving sixense to external plugin	2015-12-10 10:44:23 -08:00
ui	Moving sixense to external plugin	2015-12-10 10:44:23 -08:00
AbstractLoggerInterface.h
Application.cpp	Merge branch 'master' of https://github.com/highfidelity/hifi into entity-query-keyhole	2015-12-10 14:36:03 -08:00
Application.h	Merge pull request #6541 from howard-stearns/correct-target-frame-rate	2015-12-10 11:17:23 -08:00
Bookmarks.cpp
Bookmarks.h
Camera.cpp	- rename CameraEntityItem to AnchorEntityItem	2015-11-06 01:58:08 +01:00
Camera.h	- rename CameraEntityItem to AnchorEntityItem	2015-11-06 01:58:08 +01:00
CrashHandler.cpp
CrashHandler.h
DiscoverabilityManager.cpp
DiscoverabilityManager.h
FileLogger.cpp
FileLogger.h
FileUtils.cpp
FileUtils.h
GLCanvas.cpp	Prototyping threaded present	2015-12-04 10:28:16 -08:00
GLCanvas.h	Prototyping threaded present	2015-12-04 10:28:16 -08:00
InterfaceActionFactory.cpp	Use make_shared	2015-11-09 11:30:53 -08:00
InterfaceActionFactory.h
InterfaceLogging.cpp
InterfaceLogging.h
InterfaceParentFinder.cpp	fix deadlock when setting parentID to null	2015-11-26 05:30:01 -08:00
InterfaceParentFinder.h	hook up entities and avatars to SpatialParentFinder	2015-10-22 11:05:48 -07:00
LODManager.cpp	remove some dead code	2015-10-19 15:23:45 -07:00
LODManager.h
main.cpp
MainWindow.cpp
MainWindow.h
Menu.cpp	Merge pull request #6555 from howard-stearns/remove-unimplemented-collision-shapes-menu-item	2015-12-04 11:25:08 -08:00
Menu.h	Merge pull request #6555 from howard-stearns/remove-unimplemented-collision-shapes-menu-item	2015-12-04 11:25:08 -08:00
ModelPackager.cpp
ModelPackager.h
ModelPropertiesDialog.cpp
ModelPropertiesDialog.h
ModelSelector.cpp
ModelSelector.h
Physics.cpp
Physics.h
PluginContainerProxy.cpp	Fixing preview / vsync functionality	2015-12-04 12:46:19 -08:00
PluginContainerProxy.h	Fixing preview / vsync functionality	2015-12-04 12:46:19 -08:00
ScriptHighlighting.cpp
ScriptHighlighting.h
ScriptsModel.cpp
ScriptsModel.h
ScriptsModelFilter.cpp
ScriptsModelFilter.h
SpeechRecognizer.cpp
SpeechRecognizer.h
SpeechRecognizer.mm
Stars.cpp	gpu::Shader::create* return shared_ptr	2015-12-03 14:56:07 -08:00
Stars.h
UIUtil.cpp
UIUtil.h
Util.cpp
Util.h
world.h