27 Commits

Author	SHA1	Message	Date
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
James Chen	8aa3f7f9ae	issue #1056: TestCases works ok except Box2dTest and ChipmunkTest.	2012-03-14 18:11:25 +08:00
James Chen	aefdb852a2	issue #1056: synchronise cocos2d-iphone gles2.0 branch, HelloWorld on win32 works ok.	2012-03-14 14:55:17 +08:00
minggo	f0d22ae504	issue #879: replase assert with CCAssert	2011-11-28 17:28:43 +08:00
minggo	ba2f2fbc8b	Merge https://github.com/reflog/cocos2d-x into reflog	2011-10-08 11:28:16 +08:00
Eli Yukelzon	d23b044782	fill for polygon drawing	2011-10-05 10:50:00 +02:00
moadib	a8d87a9976	Non-trivial arguments passed by reference now. ... Removed unnecessary cocos2d:: prefix inside namespace.	2011-08-17 17:26:26 +04:00
minggo	7adb140439	fixed #568	2011-07-05 14:51:17 +08:00
walzer	81fa070125	fixed #418, add copyright of original authors, merge Bin's commit	2011-03-19 14:45:51 +08:00
walzer	abd2725ed4	issue #148, add copyright	2011-03-19 10:34:26 +08:00
yangws	61e2f56439	Add Retina display resource for tests. ... Modify CCDrawingPrimitives.cpp for retina display support.	2011-03-15 15:12:50 +08:00
minggo	b5a99f90df	issue #375: rename file names and object names	2011-03-07 17:11:57 +08:00
minggo	4379a1c96f	Move ccxApplication to cocos2dx/platform on ios.	2011-03-02 17:05:22 +08:00
minggo	355570ea8f	issue #292	2010-12-28 15:05:55 +08:00
Walzer	820c2f0714	issue #211 cocos2d-x back to cocos2dx	2010-11-18 15:01:42 +00:00
Walzer	b4328354af	issue #211 cocos2dx -> cocos2d-x	2010-11-18 14:07:17 +00:00
Ming	416a319344	fixed #203	2010-11-13 03:34:49 +00:00
Ming	6062cf1558	issue #202	2010-11-12 09:26:01 +00:00
yangws	cf0a2c5665	add cocos2dx-win32 framework, can't work yet.	2010-10-08 09:53:04 +00:00
Walzer	fee1ce8f09	fixed #124, chipmunk done!	2010-09-04 10:18:14 +00:00
Walzer	14427a24d7		2010-08-04 07:46:12 +00:00
Ming	b6dd87fb64	issue #6: fix some compile error	2010-07-27 07:49:39 +00:00
Ming	89dcd544fb	fixed #9	2010-07-08 03:58:33 +00:00
Walzer	97d6aaf296	issue #2, add link to website at each file header	2010-07-06 12:55:05 +00:00
Ming	c04225ab4b	issue #6: update CCConfiguration.cpp, CCDrawingPrimitives.cpp	2010-07-06 09:54:36 +00:00
Ming	dafe99ca70	issue #2: move to folder cocos2dx	2010-07-06 08:28:41 +00:00