8 Commits

Author	SHA1	Message	Date
James Chen	26763c200b	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1177_platform ... Conflicts: tests/proj.ios/test.xcodeproj/project.pbxproj	2012-04-24 15:44:53 +08:00
minggo	1e20f2b6db	fixed #1185: reload image data and recreate buffer of object when backing to foreground	2012-04-24 15:02:18 +08:00
James Chen	521155e9e2	issue #1177: Added some common methods for CCPoint,CCSize,CCRect. Added MutiTouchTest demo.	2012-04-23 14:30:38 +08:00
James Chen	0c6d21c0f9	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1177_platform	2012-04-20 17:34:47 +08:00
James Chen	909a759ff6	issue #1177: Updated android project configuration.	2012-04-20 17:33:28 +08:00
minggo	cbfca9d763	add execution permission	2012-04-20 10:54:58 +08:00
James Chen	230b8a386b	issue #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' ... with four spaces. Also, 1. Used macro NS_CC_BEGIN instead of namespace cocos2d {, NS_CC_END instead of }. 2. Removed some unused files. 3. Renamed the name of some folders, for example, "test.android"-->"proj.android" .	2012-04-19 14:35:52 +08:00
James Chen	4068be84e9	Refactored project folders.	2012-04-19 11:46:08 +08:00