Andrzej Kapolka 0075bb89c4 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels		2014-06-30 18:02:56 -07:00
..
animation	put back ssize_t definition	2014-05-20 11:56:06 -07:00
audio	Compiler warning fixes.	2014-06-27 22:18:38 +02:00
avatars	cleanup of avatar collisions, prep for more ragdoll collisions	2014-06-06 10:51:22 -07:00
embedded-webserver	handle serving of scripts at temp unique UUIDs	2014-05-23 12:33:39 -07:00
fbx	Merge branch 'master' of https://github.com/highfidelity/hifi into sit_on_a_model	2014-06-25 10:49:51 -07:00
metavoxels	Include an additional bit with the objects that says whether what follows is	2014-06-30 12:35:34 -07:00
models	Fix crash occuring when geometry not yet available	2014-06-27 09:56:03 -07:00
networking	Merge pull request #3037 from wangyix/edit_nack_pull	2014-06-18 11:43:25 -07:00
octree	Merge pull request #3057 from AndrewMeadows/ragdoll	2014-06-24 15:47:18 -07:00
particles	cleanup of avatar collisions, prep for more ragdoll collisions	2014-06-06 10:51:22 -07:00
script-engine	Rework old fix for Script Editor Script.stop() crash	2014-06-29 19:57:26 -07:00
shared	Fix bad static const inside class.	2014-06-23 14:07:09 -07:00
voxels	Allow the project to compile using Visual Studio 2013	2014-06-18 10:27:57 +03:00