Atlante45 4f93858849 Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_handling_in_editModels		2014-05-14 10:41:29 -07:00
..
audio	Merge pull request #2818 from birarda/stop-sound	2014-05-08 11:12:47 -07:00
avatars	merge upstream/master to andrew/bispinor	2014-05-14 09:38:31 -07:00
embedded-webserver	allow DS to handle incoming HTTPS requests	2014-04-24 14:58:08 -07:00
fbx	Fix for certain models with textures not parented to materials.	2014-05-07 14:48:25 -07:00
metavoxels	make sure gnutls define for ssize_t comes before gnutls include	2014-04-10 10:27:08 -07:00
models	Full mouse handling	2014-05-14 10:40:50 -07:00
networking	Merge pull request #2849 from stojce/19597	2014-05-14 10:00:37 -07:00
octree	place models in proper containing voxel	2014-05-07 17:32:51 -07:00
particles	Merge pull request #2815 from ZappoMan/modelserver	2014-05-07 20:59:04 -07:00
script-engine	Merge pull request #2852 from huffman/19614	2014-05-14 10:40:14 -07:00
shared	merge upstream/master to andrew/bispinor	2014-05-14 09:38:31 -07:00
voxels	place models in proper containing voxel	2014-05-07 17:32:51 -07:00