Andrew Meadows 9e9929da91 merge upstream/master into andrew/thermonuclear		2014-12-08 11:22:39 -08:00
..
animation	fixes the stutter in animation when observer moves	2014-11-28 17:36:55 -08:00
audio	Add ability to set injector properties during playing, and orbitingSound.js	2014-12-05 08:45:00 -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 upstream/master into andrew/thermonuclear	2014-12-08 11:22:39 -08:00
fbx	basics of triangle picking working for models	2014-12-05 11:31:27 -08:00
gpu	trying to fix the linux compilation	2014-12-05 13:43:04 -08:00
metavoxels	Allow loading "MDR" files saved by Wilbur, fix for reallocating error.	2014-12-05 01:58:45 -08:00
networking	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-12-03 14:30:31 -08:00
octree	removed dead code	2014-12-06 15:07:02 -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	use common findRayTriangleIntersection	2014-12-06 19:39:02 -08:00
voxels	OctreeServer::createTree() is now protected	2014-12-02 11:13:37 -08:00