Andrzej Kapolka 8a0ff4acf5 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels ... Conflicts: interface/src/ui/MetavoxelEditor.cpp		2014-11-13 12:17:37 -08:00
..
animation	cleanup	2014-11-12 16:57:42 -08:00
audio	fix for AudioInjector QScriptValue conversion typos	2014-11-11 20:48:34 -08:00
avatars	resolve conflicts on merge with upstream master	2014-11-11 20:53:24 -08:00
embedded-webserver	Replacing glutSolidSphere by a cached Geometry	2014-10-03 16:55:58 -07:00
entities	fix unix build	2014-11-13 09:48:15 -08:00
fbx	Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickSubMeshes	2014-10-29 11:56:27 -07:00
metavoxels	Basic encoding/decoding up and running again.	2014-11-12 19:27:25 -08:00
networking	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-11-13 12:17:37 -08:00
octree	suppress some potentially repeated log messages	2014-11-13 07:52:00 -08:00
physics	move stuff out of shared and into physics library	2014-10-28 13:51:45 -07:00
script-engine	resolve conflicts on merge with upstream master	2014-11-11 20:53:24 -08:00
shared	add debug streamer for xColor	2014-11-13 08:14:01 -08:00
voxels	fix a bug produced by not setting deleted var to NULL	2014-11-10 11:03:15 -08:00