ZappoMan cd92185c5b Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickWork ... Conflicts: examples/newEditEntities.js interface/src/avatar/MyAvatar.cpp interface/src/avatar/MyAvatar.h libraries/entities/src/EntityTree.h		2014-12-03 15:07:47 -08:00
..
animation	fixes the stutter in animation when observer moves	2014-11-28 17:36:55 -08:00
audio	Merge pull request #3835 from birarda/lobby	2014-11-19 16:59:54 -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	Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickWork	2014-12-03 15:07:47 -08:00
fbx	Adding a Hack for the apaartment model to boost the lightmaps	2014-12-01 11:45:07 -08:00
metavoxels	Removed a debug statemen.	2014-11-20 17:34:37 -08:00
networking	Prevent erroneous resource download percentages; Qt reports the total bytes as	2014-12-03 12:55:58 -08:00
octree	OctreeServer::createTree() is now protected	2014-12-02 11:13:37 -08:00
physics	No more .f	2014-11-19 16:53:39 -08:00
script-engine	fix URL/filename discrepancy for local scripts	2014-12-03 09:55:55 -08:00
shared	Merge branch 'master' of https://github.com/highfidelity/hifi into HMDMode	2014-11-25 12:46:18 -08:00
voxels	OctreeServer::createTree() is now protected	2014-12-02 11:13:37 -08:00