Brad Hefta-Gaub aa2011a543 Merge pull request #4160 from samcake/temp0 ... Introducing the gpu::Texture class and using it for model rendering		2015-01-27 18:30:06 -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
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
fbx	experimenting with linear space vs srgb space	2015-01-22 16:27:17 -08:00
gpu	fixes after review by Brad	2015-01-27 15:42:56 -08:00
metavoxels	Merge pull request #4131 from Atlante45/pull_out_menu_mess	2015-01-27 16:23:23 -08:00
model	First take at using the gpu::Texture in the Model rendering instead of the previous pass with raw glTexture	2015-01-20 16:02:26 -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	fixed comments	2015-01-27 11:38:14 -08:00
render-utils	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2015-01-27 15:43:27 -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	Don't call Settings::set when you don't need too.	2015-01-20 17:54:11 -08:00