Atlante45 844e5d7e47 Merge branch 'master' of https://github.com/highfidelity/hifi into add_start_stop_animation_for_scripted_avatar ... Conflicts: assignment-client/src/Agent.cpp examples/editModels.js		2014-07-28 10:11:39 -07:00
..
animation	Revert "Added FacialAnimationData class"	2014-07-23 15:54:47 -07:00
audio	another parseData change	2014-07-23 12:06:31 -07:00
avatars	Merge pull request #3204 from Barnold1953/jsBlendShapes	2014-07-25 09:40:48 -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	Fixed invokeMethod bug + removed debug	2014-07-23 14:38:37 -07:00
networking	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-07-17 14:06:11 -07:00
octree	Removed magic number to use DEFAULT_NEAR/FAR_CLIP	2014-07-25 10:56:44 -07:00
particles	fixed some warnings	2014-07-15 10:41:29 -07:00
script-engine	Merge branch 'master' of https://github.com/highfidelity/hifi into add_start_stop_animation_for_scripted_avatar	2014-07-28 10:11:39 -07:00
shared	implement VerletPoint::integrateForward()	2014-07-25 15:23:12 -07:00
voxels	Added getVoxelEnclosingPointBlocking and improved sand script	2014-07-15 11:44:59 -07:00