Andrew Meadows ff09a0d41b merge upstream/master into andrew/inerita		2014-09-05 11:47:49 -07:00
..
animation	remove TARGET_NAME from cmake macros where it is not required	2014-08-08 13:17:54 -07:00
audio	coding standard	2014-08-28 11:12:17 -07:00
avatars	expose _measured_ MyAvatar velocity to JS	2014-09-05 11:44:13 -07:00
embedded-webserver	remove TARGET_NAME from cmake macros where it is not required	2014-08-08 13:17:54 -07:00
entities	fix potential static memory corruption	2014-09-04 15:43:51 -07:00
fbx	use dispatchTable for shape-vs-shape collisions	2014-08-21 16:40:25 -07:00
metavoxels	Remove unused variables.	2014-09-04 17:26:01 -07:00
networking	add debug to show that domain connection is being attempted	2014-09-04 09:29:29 -07:00
octree	use QHash, not QVector, for Octree content query	2014-09-04 15:20:07 -07:00
particles	Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities	2014-08-18 15:16:35 -07:00
script-engine	Merge pull request #3335 from ZappoMan/virtualEntities	2014-09-03 15:48:58 -07:00
shared	Update ShutdownEventListener to not stop event handling	2014-09-05 11:26:22 -07:00
voxels	Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities	2014-08-18 15:16:35 -07:00