Brad Hefta-Gaub e59c4a9aa2 Merge pull request #2783 from AndrewMeadows/inertia ... improved avatar walking on voxels		2014-05-05 15:49:44 -07:00
..
audio	Merge branch 'master' of https://github.com/highfidelity/hifi into removed_gettimeofday	2014-04-21 12:19:19 -07:00
avatars	Merge upstream/master into andrew/inertia	2014-05-05 13:54:25 -07:00
embedded-webserver	allow DS to handle incoming HTTPS requests	2014-04-24 14:58:08 -07:00
fbx	Whoops!	2014-05-02 19:14:40 -07:00
metavoxels	make sure gnutls define for ssize_t comes before gnutls include	2014-04-10 10:27:08 -07:00
models	removed debugging	2014-05-02 09:38:14 -07:00
networking	fix broken audio-mixer stats	2014-05-05 14:03:14 -07:00
octree	add LOD support for model and particle rendering	2014-05-05 14:26:51 -07:00
particles	removed debugging	2014-05-02 09:36:11 -07:00
script-engine	coding standard	2014-05-02 15:34:07 -07:00
shared	Merge upstream/master into andrew/inertia	2014-05-05 13:54:25 -07:00
voxels	debugging model editing	2014-05-02 09:10:30 -07:00