13 Commits

Author	SHA1	Message	Date
James Chen	0f36a89c7e	issue #1188: Refactor directory. Compile successfully on android and win32(vs2008 debug).	2012-04-25 16:18:04 +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
minggo	4d2e2d7183	fixed #1139: remove unneeded codes	2012-04-17 18:03:48 +08:00
minggo	7750664f8b	fixed #1139: re add preprocess macro	2012-04-17 18:01:15 +08:00
minggo	cfdc5edf87	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1139_screen_black	2012-04-17 17:55:59 +08:00
minggo	04c0d794af	fixed #1139: fix the bug that screen becomes black when backing to foreground on Android	2012-04-17 17:55:26 +08:00
James Chen	413bc3c343	Finished CCControlSwitch.Added CCActionTween.	2012-04-17 16:00:18 +08:00
James Chen	d01f1277af	optimize data struct.	2012-04-14 19:11:57 +08:00
minggo	7ccb38556e	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into android_gles20	2012-03-20 16:10:53 +08:00
minggo	74aaf4c6ca	issue #1056:gles20 runs ok on android	2012-03-20 16:10:12 +08:00
James Chen	6ce06bd906	issue #1056: Remove CCMutableArray and CCMutableDictionary template, offer CCDictionary to improve the performance of dictionary by 60%, it means that CCDictionary can save about 2/3 time cost.	2012-03-20 15:04:53 +08:00
James Chen	275891dfb0	issue #1056: synchronise cocos2d-iphone-2.0-rc0a	2012-03-16 13:42:53 +08:00
James Chen	9e89171557	issue #1056: Rename ccGLState to ccGLStateCache, add some ccShader_***_.h, update CCGLProgram class.	2012-03-15 10:42:22 +08:00