14 Commits

Author	SHA1	Message	Date
boyu0	afde1e57b2	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345 and fix the per premultipied tag	2013-07-30 11:10:05 +08:00
James Chen	343c98af13	Fixing warnings of the order of member variables and fixing errors for tizen projects.	2013-07-29 14:07:57 +08:00
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
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
Lee, Jae-Hong	ae78bb9b47	Modify space character check.	2013-05-29 23:14:52 +09:00
Lee, Jae-Hong	e1cf030372	Change the default font path.	2013-05-16 20:16:57 +09:00
Lee, Jae-Hong	659e884009	Use CCImage.cpp from Linux implementation.	2013-05-16 20:07:31 +09:00
Lee, Jae-Hong	58b181736d	Adding platform code for Tizen.	2013-05-16 19:53:37 +09:00