Andrew Meadows aad9d0441e merge upstream/master to andrew/bispinor ... Conflicts: interface/src/avatar/Hand.cpp interface/src/avatar/SkeletonModel.cpp libraries/avatars/src/HandData.cpp libraries/avatars/src/HandData.h		2014-05-14 09:38:31 -07:00
..
AmbientOcclusionEffect.cpp	run regex header replacement on all cpp files	2014-04-09 09:35:42 -07:00
AmbientOcclusionEffect.h	fix header include guards via regex	2014-04-09 12:03:17 -07:00
GeometryCache.cpp	After uploading, refresh the uploaded files so that they are immediately	2014-05-09 17:50:08 -07:00
GeometryCache.h	After uploading, refresh the uploaded files so that they are immediately	2014-05-09 17:50:08 -07:00
GlowEffect.cpp	run regex header replacement on all cpp files	2014-04-09 09:35:42 -07:00
GlowEffect.h	fix header include guards via regex	2014-04-09 12:03:17 -07:00
Model.cpp	merge upstream/master to andrew/bispinor	2014-05-14 09:38:31 -07:00
Model.h	Specular map support.	2014-05-06 17:32:10 -07:00
PointShader.cpp	run regex header replacement on all cpp files	2014-04-09 09:35:42 -07:00
PointShader.h	fix header include guards via regex	2014-04-09 12:03:17 -07:00
ProgramObject.cpp	run regex header replacement on all cpp files	2014-04-09 09:35:42 -07:00
ProgramObject.h	fix header include guards via regex	2014-04-09 12:03:17 -07:00
RenderUtil.cpp	run regex header replacement on all cpp files	2014-04-09 09:35:42 -07:00
RenderUtil.h	fix header include guards via regex	2014-04-09 12:03:17 -07:00
TextureCache.cpp	Fix for: #19626 - Fix the Windows 7 crash	2014-05-11 16:18:46 +02:00
TextureCache.h	Added ability to read FBX textures embedded in FBX files.	2014-04-17 15:42:23 -07:00
VoxelShader.cpp	run regex header replacement on all cpp files	2014-04-09 09:35:42 -07:00
VoxelShader.h	fix header include guards via regex	2014-04-09 12:03:17 -07:00