Andrew Meadows 67c3a25475 Merge branch 'master' of ssh://github.com/highfidelity/hifi into inertia ... Conflicts: interface/src/Application.cpp libraries/entities/src/EntityItem.h		2014-12-15 14:46:46 -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	moving Shape* back into shared lib	2014-12-01 16:03:14 -08:00
embedded-webserver	Replacing glutSolidSphere by a cached Geometry	2014-10-03 16:55:58 -07:00
entities	Merge branch 'master' of ssh://github.com/highfidelity/hifi into inertia	2014-12-15 14:46:46 -08:00
fbx	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-12-10 15:23:27 -08:00
gpu	trying to fix the linux compilation	2014-12-05 13:43:04 -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 domain failed reconnect after disconnect	2014-12-12 09:47:15 -08:00
octree	Merge branch 'master' of ssh://github.com/highfidelity/hifi into inertia	2014-12-15 14:46:46 -08:00
physics	updated TODO notes	2014-12-15 14:41:04 -08:00
script-engine	fix URL/filename discrepancy for local scripts	2014-12-03 09:55:55 -08:00
shared	Merge branch 'master' of ssh://github.com/highfidelity/hifi into inertia	2014-12-15 14:46:46 -08:00
voxels	OctreeServer::createTree() is now protected	2014-12-02 11:13:37 -08:00