Sam Gateau 38129c2988 Merging with latest build		2015-01-30 12:58:50 -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	More setting handles	2015-01-20 15:35:22 -08:00
avatars	Account for avatar scale in Hand(Data) get/set	2015-01-26 16:48:33 -08:00
embedded-webserver	rename cmake macro to represent actual purpose	2014-12-18 16:51:20 -08:00
entities	bulletRotationStep --> computeBulletRotationStep	2015-01-27 17:37:12 -08:00
entities-renderer	remove glColor calls related to text rendering	2015-01-28 13:54:48 -08:00
environment	more voxel-ectomy cleaning up some remaining references to voxels	2015-01-06 09:27:48 -08:00
fbx	Initiailize the jont indices to -1 in FBXGemoetry to avoid problems until the skeleton data is actually loaded	2015-01-28 10:22:37 -08:00
gpu	Merge pull request #4191 from ZappoMan/moreImmediateModeRemoval	2015-01-30 10:21:18 -08:00
metavoxels	Merge pull request #4131 from Atlante45/pull_out_menu_mess	2015-01-27 16:23:23 -08:00
model	improving on the poin light attenuatiion formula	2015-01-28 00:09:15 -08:00
networking	Revert "Use QDickCache for every QNAM"	2015-01-27 18:09:22 -08:00
octree	Don't call Settings::set when you don't need too.	2015-01-20 17:54:11 -08:00
physics	bulletRotationStep --> computeBulletRotationStep	2015-01-27 17:37:12 -08:00
render-utils	Merging with latest build	2015-01-30 12:58:50 -08:00
script-engine	Add comment to ScriptEngine::include()	2015-01-29 09:08:55 -08:00
shared	Merging with latest build	2015-01-30 12:58:50 -08:00