overte/interface/src
Andrew Meadows 9b7e50858a merge upstream/master into andrew/inertia
Conflicts:
	libraries/avatars/CMakeLists.txt
	libraries/entities/CMakeLists.txt
2014-12-29 09:15:49 -08:00
..
avatar remove includes for glu for APPLE 2014-12-19 13:59:43 -08:00
devices oops double 2014-12-19 12:35:47 -08:00
scripting Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet 2014-12-16 14:27:50 -08:00
starfield move ProgramObject to libraries 2014-12-15 14:21:22 -08:00
ui Merge pull request #4004 from Atlante45/modeluploader_scripting_interface 2014-12-23 16:58:52 -08:00
voxels move all glut-ness to geometry cache 2014-12-18 11:20:17 -08:00
AbstractLoggerInterface.h
Application.cpp merge upstream/master into andrew/inertia 2014-12-29 09:15:49 -08:00
Application.h merge upstream/master into andrew/inertia 2014-12-29 09:15:49 -08:00
Audio.cpp Fixes for missing audio device. 2014-12-15 22:41:35 -08:00
Audio.h more spatial audio removal 2014-12-10 15:46:10 -08:00
Camera.cpp typedefs 2014-12-16 14:02:22 -08:00
Camera.h make a version of computePick that works off of view frustum even when in HMD mode, updates to lobby 2014-11-22 21:25:43 -08:00
DatagramProcessor.cpp Give noisy mutes their own packet type 2014-11-17 10:26:47 -08:00
DatagramProcessor.h
Environment.cpp replaced Application::resourcesPath() with PathUtils::resourcesPath() 2014-12-15 15:20:18 -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 Switched to chared pointers and macros 2014-12-16 13:54:52 -08:00
Hair.cpp remove glut.h from CmakeLists.txt and fix a compiler issue with Hair.cpp 2014-12-19 13:53:44 -08:00
Hair.h add destructors for arrays in Hair 2014-11-07 17:21:53 -08:00
main.cpp
MainWindow.cpp
MainWindow.h
Menu.cpp Add entity model upload 2014-12-23 12:30:00 -08:00
Menu.h Add entity model upload 2014-12-23 12:30:00 -08:00
MetavoxelSystem.cpp Merge branch 'master' of https://github.com/highfidelity/hifi into cuckoo 2014-12-17 16:47:15 -08:00
MetavoxelSystem.h move ProgramObject to libraries 2014-12-15 14:21:22 -08:00
ModelUploader.cpp Set texture limit back to 1024 2014-12-23 15:06:22 -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 Replacing glutSolidSphere by a cached Geometry 2014-10-03 16:55:58 -07:00
Stars.h Replacing glutSolidSphere by a cached Geometry 2014-10-03 16:55:58 -07:00
Util.cpp remove all glut 2014-12-18 16:12:30 -08:00
Util.h remove unused utility functions 2014-10-12 20:42:15 -07:00
world.h Removed unused constant, class 2014-10-12 20:14:51 -07:00
XmppClient.cpp
XmppClient.h