Andrzej Kapolka 92ab3cd09a Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels		2014-02-25 11:21:35 -08:00
..
audio	Merge pull request #2054 from gaitat/19499	2014-02-24 19:10:31 -08:00
avatars	Merge pull request #2057 from ey6es/master	2014-02-23 17:22:07 -08:00
embedded-webserver	fix for ttf return in DS, closes #1769	2014-01-31 14:13:05 -08:00
metavoxels	Compute the mesh extents for geometry and use them to set the spanner bounds.	2014-02-24 17:28:11 -08:00
octree	Merge and resolve conflicts of remote-tracking branch 'upstream/master'	2014-02-18 22:45:25 -05:00
particles	Cleaning up collision check API's and re-enabling collisions with particles.	2014-02-14 16:33:19 -08:00
script-engine	Merge branch 'master' of https://github.com/worklist/hifi	2014-02-23 17:26:23 -08:00
shared	fix default node auth URL	2014-02-25 09:38:22 -08:00
voxels	add work around for voxel add of larger voxel on top of smaller voxels	2014-02-23 19:02:10 -08:00