8 commits

Author	SHA1	Message	Date
Azaezel	ebbd8a2e02	Instancing clones the results of a previously used material to it's next instance. As such, it and Dynamic Cube Mapping are mutually exclusive features.	2014-06-20 14:45:12 -05:00
Daniel Buckmaster	87d9e245b7	Merge remote-tracking branch 'smally/platform_type_consistency' into platform-type-consistency ... Conflicts: Engine/source/platform/platformCPUCount.cpp	2014-04-04 13:43:25 +11:00
DavidWyand-GG	17113d3ba5	Blinn-Phong Specular Changes ... Based on the work done here: http://www.garagegames.com/community/blogs/view/21032	2013-10-29 15:10:23 -04:00
SilentMike	77bd934167	Merge pull request #424 from tdev/lock-checking ... Added checks for valid pointers after locking	2013-08-11 22:14:16 -07:00
cpusci	7a8f46b19f	Update for float, double and unsigned char, unsigned short, short, etc. char was left alone: read why here http://msdn.microsoft.com/en-us/library/cc953fe1.aspx	2013-08-04 16:58:59 -05:00
Thomas Fischer	53abbe066d	added checks for valid pointers after locking	2013-06-30 17:51:38 +02:00
Thomas Fischer	688e54cb43	fixed pointer problems and guard in material files	2013-06-30 17:47:43 +02:00
DavidWyand-GG	7dbfe6994d	Engine directory for ticket #1	2012-09-19 11:15:01 -04:00