Andrzej Kapolka a5c8531aa1 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels ... Conflicts: interface/src/Application.cpp		2013-12-17 13:46:44 -08:00
..
audio	correct sample delay pulls with negative index	2013-12-17 11:47:50 -08:00
avatars	throwing from fingertips, less gravity, lighter target rendering	2013-12-17 12:48:59 -08:00
metavoxels	More progress on getting values in and out of scripts.	2013-12-17 13:44:56 -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	added edited times to particles and don't change local tree if particle has not been edited	2013-12-17 12:39:35 -08:00
scriptengine	fixed file banner	2013-12-16 12:13:36 -08:00
shared	added edited times to particles and don't change local tree if particle has not been edited	2013-12-17 12:39:35 -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