samcake 331104d1c6 Merge pull request #4194 from thoys/texture-max-area-2M ... changing texture size limit from 1024*1024 to 2M i.e. (1024 * 2048).		2015-01-29 17:33:35 -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 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	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	Fixing the non loading of some texture because the QImage bit size is not exactly what's expected	2015-01-29 15:17:55 -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	bulletRotationStep --> computeBulletRotationStep	2015-01-27 17:37:12 -08:00
render-utils	Merge pull request #4194 from thoys/texture-max-area-2M	2015-01-29 17:33:35 -08:00
script-engine	Add comment to ScriptEngine::include()	2015-01-29 09:08:55 -08:00
shared	bulletRotationStep --> computeBulletRotationStep	2015-01-27 17:37:12 -08:00