22 Commits

Author	SHA1	Message	Date
YuLei Liao	4bf68e79fd	* merge upstream/master to master	2011-11-29 19:56:20 +08:00
minggo	f0d22ae504	issue #879: replase assert with CCAssert	2011-11-28 17:28:43 +08:00
YuLei Liao	09d12be875	* format cocos2d-x source files	2011-11-18 21:23:54 +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
minggo	d48c3fdfb1	upgrade to 1.0.0-final 07-11	2011-07-12 11:20:41 +08:00
yangws	be966dbddb	fixed #430 Solved bug by replacing glColor4ub with glColor4f.	2011-03-25 13:50:57 +08:00
walzer	81fa070125	fixed #418, add copyright of original authors, merge Bin's commit	2011-03-19 14:45:51 +08:00
minggo	b5a99f90df	issue #375: rename file names and object names	2011-03-07 17:11:57 +08:00
yangws	c142070c2c	misc_node upto-0.99.5. ... Signed-off-by: yangws <yangws@cocos2d-x.org>	2010-12-25 15:09:42 +08:00
Leon	96f4f5c9fd	fix some compiling warning for iOS	2010-12-17 23:44:19 +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
Walzer	a279e5dc9b	issue 169, we should retain the new variable first, and then release the old one. assignment at last.	2010-09-27 10:19:10 +00:00
Walzer	907fb3f692	issue #126, add retain when member variable is changed	2010-09-06 02:27:38 +00:00
Walzer	4226dcede9	issue #61, add retain for member variable	2010-09-04 10:06:26 +00:00
Ming	ae3f178c7b	issue #61:	2010-09-04 07:10:41 +00:00
Walzer	5fd1bf85b6	issue #121, return bool in function init****	2010-09-04 04:02:52 +00:00
Ming	ed3909c9e4	issue #116: remove the using of sprintf_s, because it is VC specific	2010-09-03 03:15:46 +00:00
Walzer	3d91d1e58d	update to uphone-sdk-2010.08.26, which adds opengl headers	2010-08-31 08:53:25 +00:00
Ming	710e29b086	issue #80	2010-08-25 02:19:20 +00:00
Walzer	9703e75e57	issue #18, debug	2010-08-19 06:09:40 +00:00
Walzer	59324a4a65	fixed #58, complete CCRibbon, CCRibbonSegment	2010-08-18 09:56:59 +00:00