64 Commits

Author	SHA1	Message	Date
James Chen	24e3ec7499	fixed #1336: Updated comment information for deprecated apis.	2012-06-20 14:31:36 +08:00
James Chen	b818c0afa6	fixed #1336: Used CC_DEPRECATED_ATTRIBUTE macro to mark deprecated interfaces.	2012-06-20 11:48:31 +08:00
minggo	2666df9472	issue #1269:mrege latest code and fix conflict	2012-06-19 13:57:33 +08:00
minggo	9ec29d715a	issue #1269:make tests HelloWorld HelloLua and testjs refer subproject cocos2dx	2012-06-19 13:50:11 +08:00
James Chen	b66be55156	issue #1333: Use CC_PROPERTY instead of CC_PROPERTY_PASS_BY_REF for m_tContenSize	2012-06-18 18:31:29 +08:00
James Chen	595a402c83	fixed #1292:make some function names more readable.	2012-06-15 16:47:30 +08:00
minggo	d0f905992a	issue #1292:make some function names more readable	2012-06-15 15:10:40 +08:00
James Chen	7fe3f7357e	issue #1324: Reverted old interfaces.	2012-06-14 17:18:05 +08:00
James Chen	3f7b44fc23	issue #1324: Added create() for static member functions that new an autorelease object	2012-06-14 15:13:16 +08:00
James Chen	35e9e44e39	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20	2012-06-08 15:31:23 +08:00
James Chen	6cf608effd	issue #1310: deleted some functions which can't be implemented in C++. Moved arrayMakeObjectsPerformSelector to CCArray.h.	2012-06-08 15:17:15 +08:00
minggo	9a600c6221	issue #1310: syncronize base_nodes	2012-06-08 14:17:39 +08:00
minggo	cc16320445	issue #1310: syncronize actions	2012-06-08 13:55:28 +08:00
James Chen	0f36a89c7e	issue #1188: Refactor directory. Compile successfully on android and win32(vs2008 debug).	2012-04-25 16:18:04 +08:00