Brad Hefta-Gaub ec8a95037d Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMixerLoopImprovements		2017-02-20 17:01:29 -08:00
..
assets
audio
avatar	fix warnings	2017-02-17 21:58:48 -08:00
devices
java/io/highfidelity/interface
networking
octree	stop passing bare pointers to EntityTreeRenderer all around	2016-10-27 10:10:22 -07:00
scripting	Add entity clicks capture capabilities	2017-02-13 11:34:30 -08:00
ui	Merge branch 'master' into feature/toolbar-tablet-switcheroo	2017-02-16 16:28:43 -08:00
Application.cpp	Merge pull request #9703 from kunalgosar/logDisplayMode	2017-02-17 17:07:02 -08:00
Application.h	Settings for Tablet Becomes Toolbar	2017-02-16 15:57:36 -08:00
Bookmarks.cpp
Bookmarks.h
Camera.cpp
Camera.h	Cleanup camera docs	2016-11-14 13:51:51 -08:00
ConnectionMonitor.cpp	Simplify ConnectionMonitor to only rely on domainConnectionRefused instead of authRequired	2016-10-24 14:45:41 -07:00
ConnectionMonitor.h	Fix ConnectionHandler not handling connected-but-need-auth condition	2016-10-24 10:44:33 -07:00
CrashHandler.cpp	Merge branch 'master' of https://github.com/highfidelity/hifi into fix/settings	2016-11-21 13:05:08 -08:00
CrashHandler.h
CrashReporter.cpp
CrashReporter.h
DiscoverabilityManager.cpp	Make Steamworks a plugin	2016-12-14 15:37:49 -08:00
DiscoverabilityManager.h
FrameTimingsScriptingInterface.cpp
FrameTimingsScriptingInterface.h
GLCanvas.cpp
GLCanvas.h
InterfaceActionFactory.cpp
InterfaceActionFactory.h
InterfaceLogging.cpp
InterfaceLogging.h
InterfaceParentFinder.cpp	stop passing bare pointers to EntityTreeRenderer all around	2016-10-27 10:10:22 -07:00
InterfaceParentFinder.h
LODManager.cpp
LODManager.h
main.cpp	Allow multiple instances to run if environment variable is set	2017-02-03 10:53:26 -08:00
Menu.cpp	Windows specific changes	2017-02-09 13:04:43 -08:00
Menu.h	Add log window to the ESS log	2017-02-09 13:04:43 -08:00
ModelPackager.cpp
ModelPackager.h
ModelPropertiesDialog.cpp
ModelPropertiesDialog.h
ModelSelector.cpp
ModelSelector.h
Physics.cpp
Physics.h
ScriptHighlighting.cpp
ScriptHighlighting.h
SpeechRecognizer.cpp
SpeechRecognizer.h
SpeechRecognizer.mm
UIUtil.cpp
UIUtil.h
Util.cpp
Util.h
world.h