Andrzej Kapolka d19f32fefa Merge branch 'master' of https://github.com/worklist/hifi into metavoxels ... Conflicts: assignment-client/CMakeLists.txt		2013-12-19 13:52:10 -08:00
..
audio	correct sample delay pulls with negative index	2013-12-17 11:47:50 -08:00
avatars	Merge pull request #1404 from PhilipRosedale/master	2013-12-18 16:43:43 -08:00
metavoxels	Merge branch 'master' of https://github.com/worklist/hifi into metavoxels	2013-12-19 13:52:10 -08:00
octree	fix spelling error	2013-12-17 08:39:23 -08:00
octree-server	particle tree pruning on update	2013-12-12 15:09:30 -08:00
particle-server	removed some debugging	2013-12-12 11:07:13 -08:00
particles	reduced damping for thrown balls, turned off screen flash	2013-12-17 20:11:53 -08:00
script-engine	add support for palm and tip spatial data to JS interface	2013-12-18 09:53:47 -08:00
shared	Merge branch 'master' of https://github.com/worklist/hifi into metavoxels	2013-12-19 13:52:10 -08:00
voxel-server	attempt to fix build buster	2013-12-04 21:29:25 -08:00
voxels	added versioning to SVO files and Particle inHand support	2013-12-16 19:49:22 -08:00