Stephen Birarda d9cfaec4f0 Merge branch 'master' of https://github.com/highfidelity/hifi into script-timer		2014-02-03 09:32:13 -08:00
..
audio	Missing includes.	2014-01-29 13:47:13 -08:00
avatars	fix multiple avatar parsing in AvatarManager	2014-01-31 12:02:24 -08:00
embedded-webserver	fix for ttf return in DS, closes #1769	2014-01-31 14:13:05 -08:00
metavoxels	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-01-29 13:34:19 -08:00
octree	make tryLock actually return a bool	2014-01-31 15:44:48 -08:00
octree-server	correct OctreeServer config parsing	2014-01-29 13:48:31 -08:00
particle-server	cleanup Node types, closes #1726	2014-01-28 13:38:33 -08:00
particles	use tryLock in some cases where we don't want to block and pass already locked to the findParticleByID() in scripting interface	2014-01-31 17:12:50 -08:00
script-engine	Merge branch 'master' of https://github.com/highfidelity/hifi into script-timer	2014-02-03 09:32:13 -08:00
shared	Merge pull request #1745 from ZappoMan/scripting_work	2014-01-31 10:42:44 -08:00
voxel-server	cleanup Node types, closes #1726	2014-01-28 13:38:33 -08:00
voxels	Merge branch 'master' of https://github.com/worklist/hifi into scripting_work	2014-01-29 19:49:36 -08:00