Atlante45 11a2ecab56 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet ... Conflicts: interface/src/Application.cpp interface/src/Application.h interface/src/Menu.cpp interface/src/entities/EntityTreeRenderer.h interface/src/ui/ApplicationOverlay.cpp libraries/render-utils/src/GlowEffect.cpp libraries/render-utils/src/Model.cpp		2014-12-16 15:02:37 -08:00
..
animation	convert AnimationCache to DependencyManager	2014-12-15 19:48:15 -08:00
audio	Fixes for missing audio device.	2014-12-15 22:41:35 -08:00
avatars	No more .f	2014-11-19 16:53:39 -08:00
embedded-webserver	Replacing glutSolidSphere by a cached Geometry	2014-10-03 16:55:58 -07:00
entities	convert AnimationCache to DependencyManager	2014-12-15 19:48:15 -08:00
fbx	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-12-10 15:23:27 -08:00
gpu	add windowshacks.h to GPUConfig.h and move it to shared	2014-12-15 11:49:01 -08:00
metavoxels	Rather than reducing rate on first drop, wait until three consecutive packets	2014-12-09 12:14:21 -08:00
networking	Fix for crash on exit due to cache references' not being cleared.	2014-12-15 16:36:26 -08:00
octree	fix ray picking output distance to be meters	2014-12-10 11:04:32 -08:00
physics	No more .f	2014-11-19 16:53:39 -08:00
render-utils	Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet	2014-12-16 15:02:37 -08:00
script-engine	convert AnimationCache to DependencyManager	2014-12-15 19:48:15 -08:00
shared	Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet	2014-12-16 15:02:37 -08:00
voxels	OctreeServer::createTree() is now protected	2014-12-02 11:13:37 -08:00