Andrew Meadows fff7a36b54 merge upstream/master into physics project ... Conflicts: interface/src/avatar/Hand.cpp interface/src/avatar/Hand.h interface/src/avatar/SkeletonModel.cpp interface/src/avatar/SkeletonModel.h interface/src/renderer/Model.h		2014-03-25 15:55:26 -07:00
..
AmbientOcclusionEffect.cpp	make headers coding standard compliant	2014-03-06 16:24:58 -08:00
AmbientOcclusionEffect.h	make sure InterfaceConfig is included before Qt headers	2014-03-06 16:14:18 -08:00
FBXReader.cpp	Only post the blender if we have blendable meshes to blend.	2014-03-18 17:19:42 -07:00
FBXReader.h	Only post the blender if we have blendable meshes to blend.	2014-03-18 17:19:42 -07:00
GeometryCache.cpp	Perform the mesh blending in worker threads and only when we've actually	2014-03-18 16:38:05 -07:00
GeometryCache.h	Perform the mesh blending in worker threads and only when we've actually	2014-03-18 16:38:05 -07:00
GlowEffect.cpp	cleanup resources directory references by copying beside the executable	2014-03-06 11:46:49 -08:00
GlowEffect.h	This should fix the erroneous persistence on startup.	2013-12-09 11:21:32 -08:00
Model.cpp	merge upstream/master into physics project	2014-03-25 15:55:26 -07:00
Model.h	merge upstream/master into physics project	2014-03-25 15:55:26 -07:00
PointShader.cpp	cleanup resources directory references by copying beside the executable	2014-03-06 11:46:49 -08:00
PointShader.h	fix thinning in voxels as points by using correct points to calculate width of voxel based on camera position relative to voxel	2013-11-03 11:10:00 -08:00
ProgramObject.cpp	Now that we have a Qt context, we can use their shader classes. However, we	2013-05-15 13:27:37 -07:00
ProgramObject.h	Now that we have a Qt context, we can use their shader classes. However, we	2013-05-15 13:27:37 -07:00
RenderUtil.cpp	Fixed glow/ambient occlusion with Oculus.	2013-08-21 15:44:57 -07:00
RenderUtil.h	Fixed glow/ambient occlusion with Oculus.	2013-08-21 15:44:57 -07:00
TextureCache.cpp	Let's actually use the result of our format conversion.	2014-03-20 14:27:38 -07:00
TextureCache.h	Remove file texture loading (since we can just use file URLs), don't add alpha	2014-03-19 16:11:15 -07:00
VoxelShader.cpp	cleanup resources directory references by copying beside the executable	2014-03-06 11:46:49 -08:00
VoxelShader.h	rearranged menus, some hacking on voxel shader	2013-09-26 14:51:57 -07:00