Seth Alves a3631ea1d1 Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting		2015-12-15 10:12:49 -08:00
..
assets
audio
avatar	Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting	2015-12-15 10:12:49 -08:00
devices	More warning fixes	2015-12-11 16:31:27 -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	Fix warnings on windows 64bit	2015-12-11 16:31:27 -08:00
AbstractLoggerInterface.h
Application.cpp	cleaning up the code	2015-12-14 17:04:26 -08:00
Application.h	merge from upstream	2015-12-10 11:21:36 -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	add a way to remember which entities couldn't be properly placed in octree due to missing parents	2015-12-14 14:19:19 -08:00
InterfaceParentFinder.h	location getters also return a success boolean so that callers can know if the value they are receiving is bad due to lack of information about an object's parent	2015-12-14 09:13:36 -08: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	remove blue sphere while speaking	2015-12-13 12:02:39 -08:00
Menu.h	remove blue sphere while speaking	2015-12-13 12:02:39 -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