overte-HifiExperiments/interface/src
ZappoMan db94949649 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing
Conflicts:
	interface/src/avatar/SkeletonModel.cpp
2015-01-14 17:55:03 -08:00
..
audio Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 2015-01-14 17:55:03 -08:00
avatar Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 2015-01-14 17:55:03 -08:00
devices Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 2015-01-13 20:38:52 -08:00
octree Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 2015-01-14 17:55:03 -08:00
scripting Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 2015-01-13 20:38:52 -08:00
starfield move ProgramObject to libraries 2014-12-15 14:21:22 -08:00
ui Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 2015-01-14 17:55:03 -08:00
AbstractLoggerInterface.h
Application.cpp Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 2015-01-14 17:55:03 -08:00
Application.h Setup DependencyManager before any member of Application 2015-01-13 20:35:45 -08:00
Audio.cpp Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 2015-01-13 20:38:52 -08:00
Audio.h Made dependencies inherit from Dependency 2015-01-13 20:38:01 -08:00
Camera.cpp Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 2015-01-13 11:03:14 -08:00
Camera.h restore camera lookAt and keepLookingAt features 2015-01-07 13:41:07 -08:00
DatagramProcessor.cpp Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 2015-01-13 11:03:14 -08:00
DatagramProcessor.h
Environment.cpp rough pass at adding color to geometry cache 2015-01-13 20:53:05 -08:00
Environment.h
FileLogger.cpp put newlines back in interface log 2014-11-14 10:39:45 -08:00
FileLogger.h
GLCanvas.cpp Headers cleanup 2014-12-15 10:56:42 -08:00
GLCanvas.h Made dependencies inherit from Dependency 2015-01-13 20:38:01 -08:00
main.cpp
MainWindow.cpp
MainWindow.h
Menu.cpp Moved DM::get() calls to auto 2015-01-13 20:51:02 -08:00
Menu.h Move constant back to Menu 2015-01-12 18:49:05 -08:00
MetavoxelSystem.cpp Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 2015-01-14 17:55:03 -08:00
MetavoxelSystem.h move ProgramObject to libraries 2014-12-15 14:21:22 -08:00
ModelUploader.cpp Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 2015-01-13 20:38:52 -08:00
ModelUploader.h ModelUploader only has static methods accessible 2014-12-23 14:00:23 -08:00
Physics.cpp PhysicsEngine is now an EntitySimulation 2014-12-02 15:29:41 -08:00
Physics.h PhysicsEngine is now an EntitySimulation 2014-12-02 15:29:41 -08:00
ScriptHighlighting.cpp
ScriptHighlighting.h
ScriptsModel.cpp No need for https when downloading assets 2014-10-23 13:59:08 -06:00
ScriptsModel.h
SpeechRecognizer.cpp Remove further ATL dependency in Windows speech recognizer 2014-10-28 12:42:35 -07:00
SpeechRecognizer.h Remove further ATL dependency in Windows speech recognizer 2014-10-28 12:42:35 -07:00
SpeechRecognizer.mm
Stars.cpp
Stars.h
Util.cpp Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 2015-01-14 17:55:03 -08:00
Util.h rough pass at adding color to geometry cache 2015-01-13 20:53:05 -08:00
world.h Removed unused constant, class 2014-10-12 20:14:51 -07:00
XmppClient.cpp
XmppClient.h