16 Commits

Author	SHA1	Message	Date
James Chen	685b80796b	Merge commit 'refs/pull/4846/head' of git://github.com/cocos2d/cocos2d-x into iss3597-particle-plist	2014-01-08 10:36:51 +08:00
walzer	64af0de648	update copyrights for 2014, in cocos/2d/ folder	2014-01-07 11:25:07 +08:00
Dawid Drozd	43ce4fa546	Fixed mistake in documentation addImage doesn't support gif format	2014-01-03 21:22:05 +01:00
minggo	ded3e753f3	use std::function for call back	2014-01-02 17:23:00 +08:00
boyu0	f2e18f32a9	fix android compile error	2013-12-25 13:57:17 +08:00
boyu0	6e6ccbd5f9	change some const char* to const std::string&	2013-12-24 15:49:58 +08:00
Dhilan007	f7a448814c	issue #3341:fix Incorrect at TextureCache::addImageAsync for repeatedly execute for the same image	2013-12-16 17:12:53 +08:00
Ricardo Quesada	f4c68e4eef	More renames of description() to getDescription()	2013-12-12 14:38:12 -08:00
Huabing.Xu	3fc16256ab	issue #3025: move deprecated texture cache implementation to cpp file	2013-11-11 15:40:12 +08:00
Huabing.Xu	02da3a29cc	issue #3025: deprecate TextureCache::reloadAllTextures, call VolatileTextureMgr::reloadAllTextures instead	2013-11-11 11:38:02 +08:00
Huabing.Xu	b726c6fd2c	issue #3025: move VolatileTexture static function to VolatileTextureMgr	2013-11-08 16:47:33 +08:00
Huabing.Xu	935d472979	issue #3025: remove TextureCache::_sharedTextureCache	2013-11-08 11:36:27 +08:00
Huabing.Xu	c8fe6077aa	issue #3025: Deprecate TextureCache::getInstance() destroyInstance()	2013-11-07 19:10:14 +08:00
Huabing.Xu	99546cef46	issue #3025: add getTextureCache() in CCdirector()	2013-11-07 18:52:36 +08:00
minggo	95acb1b9e3	issue #2905: helloworld build ok on android	2013-10-14 14:01:00 +08:00
minggo	49d7bbd600	issue #2905: remove sub folders except platform	2013-10-12 15:41:45 +08:00