Stephen Birarda f1c6d26ed1 don't explicitly require LibOVR for android build		2015-01-28 11:20:25 -08:00
..
animation	Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11	2015-01-13 20:38:52 -08:00
audio	intial removal of Audio to audio-client	2015-01-21 11:49:06 -08:00
audio-client	don't explicitly require LibOVR for android build	2015-01-28 11:20:25 -08:00
avatars	resolve conflicts on merge with upstream master	2015-01-27 14:24:48 -08:00
embedded-webserver	rename cmake macro to represent actual purpose	2014-12-18 16:51:20 -08:00
entities	Merge pull request #4174 from huffman/delete-entity	2015-01-27 13:05:05 -08:00
entities-renderer	remove lock at EntityTreeRenderer::loadEntityScript	2015-01-11 10:44:36 -08:00
environment	more voxel-ectomy cleaning up some remaining references to voxels	2015-01-06 09:27:48 -08:00
fbx	Merge pull request #4093 from samcake/temp0	2015-01-13 17:11:17 -08:00
gpu	No more Magic numbers and fixing the code path for linux	2015-01-16 10:26:51 -08:00
metavoxels	Partial subdivision implementation.	2015-01-23 18:19:45 -08:00
model	FIx typos	2014-12-22 15:44:46 -08:00
networking	apply orientation change to listening position for audio	2015-01-27 14:50:02 -08:00
octree	Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11	2015-01-13 20:38:52 -08:00
physics	fixed comments	2015-01-27 11:38:14 -08:00
render-utils	Fix failing QMetaObject::invokeMethod call	2015-01-27 13:59:46 -08:00
script-engine	Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11	2015-01-13 20:38:52 -08:00
shared	Merge branch 'master' of https://github.com/highfidelity/hifi into android	2015-01-20 11:15:54 -08:00