4 Commits

Author	SHA1	Message	Date
Nick Barrios	d9cbc5625c	CCImage.cpp: If dds header reports 0 mipmaps, force _numberOfMipmaps to 1 to enable software decoding. Set _renderFormat just once for both hardware and software decoding (moved out of "load mipmaps" loop).	2014-02-20 00:48:09 -05:00
Nick Barrios	45d751caa7	CCImage.cpp: initWithS3TCData() - When there is s3tc hardware support, set PixelFormat before loading mipmaps, to allow for textures with no mipmaps.	2014-02-19 22:13:12 -05:00
zhangbin	e02f488224	Merge branch 'develop' into issue3964	2014-02-16 11:01:07 +08:00
Dhilan007	0d5c702708	move labelttf's platform-dependent code from CCImage to CCDevice	2014-02-13 21:08:43 +08:00