9 Commits

Author	SHA1	Message	Date
minggo	bbb2579114	Merge pull request #4160 from dabingnn/iss3025_TextureCache ... [ci skip]Iss3025 texture cache	2013-11-10 23:08:01 -08:00
boyu0	6c1144ee79	issue #2770: fix some warning	2013-11-11 12:49:38 +08:00
Huabing.Xu	99bcca0532	issue #3025: replace TextureCache::getInstance() by Director::getInstance()->getTextureCache() in cocos folder	2013-11-07 19:11:09 +08:00
Ricardo Quesada	ba7ed6e578	Fixes some compiler warnings ... The warnings are related to: * 64-to-32-bit conversion * shadow variables	2013-11-04 16:31:36 -08:00
boyu0	e8d06496d0	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical	2013-10-30 17:27:09 +08:00
boyu0	66d1bbd89f	issue #2771: edit physics effect with all bodies and fix some bugs	2013-10-28 16:17:19 +08:00
James Chen	1f3863e787	Event Dispatcher refactor commit. TestCpp could run.	2013-10-25 10:53:45 +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