Ryan Huffman d777e4be53 Merge branch 'master' of git://github.com/highfidelity/hifi into 19783 ... Conflicts: interface/src/scripting/WindowScriptingInterface.cpp interface/src/scripting/WindowScriptingInterface.h		2014-07-25 15:53:36 -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	Merge branch 'master' of git://github.com/highfidelity/hifi into 19783	2014-07-25 15:53:36 -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	Merge pull request #3191 from Atlante45/make_scriptEngine_a_qScriptEngine	2014-07-24 21:38:13 -07:00
shared	check for nan's coming out of rotationBetween()	2014-07-23 16:51:53 -07:00
voxels	Added getVoxelEnclosingPointBlocking and improved sand script	2014-07-15 11:44:59 -07:00