Ryan Huffman 099777ef8c Merge branch 'master' of git://github.com/highfidelity/hifi into 19648 ... Conflicts: interface/src/Application.cpp interface/src/Application.h		2014-05-26 10:01:44 -07:00
..
animation	put back ssize_t definition	2014-05-20 11:56:06 -07:00
audio	put back ssize_t definition	2014-05-20 11:56:06 -07:00
avatars	Enable local gravity when there is a floor nearby.	2014-05-23 15:59:27 -07:00
embedded-webserver	handle serving of scripts at temp unique UUIDs	2014-05-23 12:33:39 -07:00
fbx	add meshExtents to sub meshes	2014-05-23 09:56:09 -07:00
metavoxels	put back ssize_t definition	2014-05-20 11:56:06 -07:00
models	Merge pull request #2920 from ZappoMan/aacube	2014-05-24 17:03:59 -07:00
networking	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-05-23 17:38:28 -07:00
octree	add ray picking to the model scripting interface	2014-05-23 17:09:37 -07:00
particles	Merge branch 'master' of https://github.com/worklist/hifi into aacube	2014-05-23 11:17:59 -07:00
script-engine	Merge branch 'master' of git://github.com/highfidelity/hifi into 19648	2014-05-26 10:01:44 -07:00
shared	Fixed script editor crash when script calls Script.stop(). Also made the	2014-05-22 12:45:36 -07:00
voxels	add ray picking to the model scripting interface	2014-05-23 17:09:37 -07:00