barnold1953 d5ea2de4ea Merge branch 'master' of https://github.com/highfidelity/hifi into jsBlendShapes		2014-07-24 11:32:31 -07:00
..
animation	Revert "Added FacialAnimationData class"	2014-07-23 15:54:47 -07:00
audio	added input ring buffer stats to interface	2014-07-21 15:39:33 -07:00
avatars	FIxed error on ubuntu	2014-07-24 10:32:34 -07:00
embedded-webserver	handle serving of scripts at temp unique UUIDs	2014-05-23 12:33:39 -07:00
fbx	Proper blendshape JS api.	2014-07-23 16:25:45 -07:00
metavoxels	Provide basic conversions to/from SharedObjectPointer (still have to work out	2014-07-15 17:58:31 -07:00
models	Merge pull request #3161 from ZappoMan/fixeParticleServerCrash	2014-07-11 11:51:53 -07:00
networking	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-07-17 14:06:11 -07:00
octree	fixed octreeEditPacketSender seq numbers errors; untested	2014-07-10 14:53:29 -07:00
particles	fixed some warnings	2014-07-15 10:41:29 -07:00
script-engine	AbstractControllerScriptingInterface matches ControllerScriptingInterface	2014-07-24 00:16:00 +02:00
shared	Merge pull request #3180 from AndrewMeadows/ragdoll	2014-07-17 16:00:02 -07:00
voxels	Added getVoxelEnclosingPointBlocking and improved sand script	2014-07-15 11:44:59 -07:00