Brad Davis d64e7c464a Merge branch 'develop' into text-renderer		2015-02-03 18:44: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	Merge branch 'master' into 20277	2015-01-30 13:49:45 -08:00
embedded-webserver	rename cmake macro to represent actual purpose	2014-12-18 16:51:20 -08:00
entities	move shape polymorphism to ModelEntityItem	2015-01-30 16:25:35 -08:00
entities-renderer	Merge pull request #4205 from AndrewMeadows/isentropic	2015-01-30 18:30:55 -08:00
environment	more voxel-ectomy cleaning up some remaining references to voxels	2015-01-06 09:27:48 -08:00
fbx	FIx the lightmap not displaying when using the texcoord0	2015-02-03 16:10:31 -08:00
gpu	FIx the lightmap not displaying when using the texcoord0	2015-02-03 16:10:31 -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	coding standard, remove unneeded asserts	2015-02-03 10:51:35 -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 branch 'develop' into text-renderer	2015-02-03 18:44:06 -08:00
script-engine	A further custom User-Agent string	2015-01-30 15:56:01 -08:00
shared	Merge branch 'master' into 20277	2015-01-30 13:49:45 -08:00