ZappoMan 41490991ff Merge branch 'master' of https://github.com/worklist/hifi into controller_scripting_interface ... Conflicts: interface/src/Application.h		2013-12-18 15:50:03 -08:00
..
audio	correct sample delay pulls with negative index	2013-12-17 11:47:50 -08:00
avatars	make getNumPalms() const	2013-12-17 15:28:29 -08:00
metavoxels	Fixed Xcode warnings.	2013-12-17 17:13:41 -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 controller_scripting_interface	2013-12-17 15:25:12 -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