12 Commits

Author	SHA1	Message	Date
James Gregory	e5cd965ed3	Move GL server-side buffer code into a separate class and use multiple inheritance to deploy only to classes that need it.	2013-04-12 14:51:29 -07:00
James Gregory	f42254125f	Get CCGrid to work.	2013-04-08 17:51:30 -07:00
James Chen	54b4c690d1	fixed #1494: Missing removing auto-release object from AutoReleasePool if invoking 'autorelease' method more times.	2012-10-08 13:41:48 +08:00
Donald Alan Morrison	4cbd993091	Minor English Spelling Corrections. A few grammar corrections.	2012-09-17 00:02:24 -07:00
Luis Vallejo	c9408b7b75	Fixed Spelling Error CCObject::isSingleRefrence to CCObject::isSingleReference	2012-07-14 09:56:07 +08:00
Walzer	9eab0c19f8	add groups to all classes for doxygen	2012-06-20 18:09:11 +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	be362bef9b	issue #1310: Some typo fixes. Updated CCTexture2D.h/.cpp.	2012-06-11 21:58:04 +08:00
James Chen	26cf81e42e	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 ... Conflicts: cocos2dx/CCScheduler.h cocos2dx/include/ccTypes.h	2012-06-08 14:14:13 +08:00
James Chen	c5cf23c859	issue #1310: First commit since sync to rc2.	2012-06-08 14:11:48 +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