11 Commits

Author	SHA1	Message	Date
boyu0	304d636deb	Closed #2345 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345	2013-07-29 11:40:18 +08:00
boyu0	cecfc13bc4	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345	2013-07-27 22:06:30 +08:00
boyu0	02bdfbf169	Combine CCTextureETC to CCImage and CCTexture2D.	2013-07-26 17:34:44 +08:00
minggo	0870581623	fix warnings	2013-07-26 15:22:45 +08:00
minggo	b36a4f1df0	issue #2430:use upper letters for enum item in Image	2013-07-25 23:09:18 +08:00
James Chen	a678d12615	issue #2397: FileUtils::sharedFileUtils --> FileUtils::getInstance() for all platforms	2013-07-12 12:03:39 +08:00
Sam Clegg	b5a509e65e	[NaCl] Don't cache font size ... This avoids churn of the cached font when different sizes of the same font are requested sequentially. Review URL: https://codereview.chromium.org/14308007	2013-06-20 12:56:13 -07:00
James Chen	93b6328303	issue #2129: Removing CC prefix for cocos2dx module.	2013-06-20 14:13:12 +08:00
James Chen	c0d44cb2e4	fixed #2129: Rename m_iVar to _var, remove CC prefixes.	2013-06-15 14:03:30 +08:00
Sam Clegg	4d0aa01c4b	Fix all gcc warnings in NaCl build.	2013-03-05 17:01:40 -08:00
Sam Clegg	33c422d1d5	Add new port: Native Client	2013-03-02 12:15:24 -08:00