Ryan Huffman dca555a8d4 Merge branch 'master' of git://github.com/highfidelity/hifi into 19614		2014-05-14 09:58:59 -07:00
..
audio	Merge pull request #2818 from birarda/stop-sound	2014-05-08 11:12:47 -07:00
avatars	Remember attachment parameters per joint (as well as the last joint used) so	2014-05-12 12:16:30 -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	place models in proper containing voxel	2014-05-07 17:32:51 -07:00
networking	Changed start domain to sandbox. Changed start location to xyz: 6270, 211, 6000.	2014-05-14 07:10:31 +02: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 branch 'master' of git://github.com/highfidelity/hifi into 19614	2014-05-14 09:58:59 -07:00
shared	After uploading, refresh the uploaded files so that they are immediately	2014-05-09 17:50:08 -07:00
voxels	place models in proper containing voxel	2014-05-07 17:32:51 -07:00