18 Commits

Author	SHA1	Message	Date
James Chen	a71e5be0d8	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20_optimize_data ... Conflicts: cocos2dx/shaders/CCGLProgram.cpp	2012-04-16 12:45:47 +08:00
James Chen	d01f1277af	optimize data struct.	2012-04-14 19:11:57 +08:00
Phenix Yu	ab8af9e04c	retina for win32	2012-04-11 16:41:12 +08:00
James Chen	275891dfb0	issue #1056: synchronise cocos2d-iphone-2.0-rc0a	2012-03-16 13:42:53 +08:00
minggo	f0d22ae504	issue #879: replase assert with CCAssert	2011-11-28 17:28:43 +08:00
moadib	a8d87a9976	Non-trivial arguments passed by reference now. ... Removed unnecessary cocos2d:: prefix inside namespace.	2011-08-17 17:26:26 +04:00
liswei	1591c7edc8	fixed #512 fix warnings in /Wall flag	2011-06-10 17:51:37 +08:00
yangws	d11bd85d00	CCTextFieldTTF works on win32.	2011-04-19 09:32:33 +08:00
minggo	7d52161804	fixed #441: Initialize pointer in contruction & detect pointer value in destruction	2011-04-01 16:06:53 +08:00
walzer	81fa070125	fixed #418, add copyright of original authors, merge Bin's commit	2011-03-19 14:45:51 +08:00
minggo	47173778cc	fixed #409: rename NSArray UIAlignment	2011-03-18 14:31:29 +08:00
natural-law	06ad40f101	[android]fixed #356,modify the parameter type form ccxScopedPtr<std::string> to std::string *.	2011-03-15 11:59:45 +08:00
natural-law	0c75af0f97	[android]fixed #356,CCLabelTTF::initWithString not crashed anymore.	2011-03-14 18:29:15 +08:00
minggo	b5a99f90df	issue #375: rename file names and object names	2011-03-07 17:11:57 +08:00
natural-law	949c1000a8	update tests to 0.99.5.	2011-02-23 16:47:25 +08:00
minggo	355570ea8f	issue #292	2010-12-28 15:05:55 +08:00
natural-law	4a64f899fe	update label_nodes to 0.99.5.	2010-12-24 17:07:31 +08:00
natural-law	0f0a8ed956	rename the files related to label_nodes.	2010-12-24 14:00:49 +08:00