15 Commits

Author	SHA1	Message	Date
chengstory	8ae7ecff33	Merge branch 'develop' into #3457 ... Conflicts: build/cocos2d_samples.xcodeproj/project.pbxproj cocos/editor-support/cocostudio/CCSGUIReader.cpp cocos/editor-support/cocostudio/CCSGUIReader.h	2013-12-26 12:55:52 +08:00
yinkaile	5eb961b165	fixed warning	2013-12-25 19:46:09 +08:00
chengstory	64f0987fea	issue #3456 ios test rapidjson.	2013-12-24 21:23:24 +08:00
zhangcheng	2c6f95ecea	issue #3456 replace jsoncpp to rapidjson.	2013-12-24 20:33:55 +08:00
CaiWenzhi	0dac69523c	Remove "_renderer" from widget	2013-12-24 20:22:14 +08:00
CaiWenzhi	9aa85d2bd6	Remove NodeRGBA inherit	2013-12-23 15:02:52 +08:00
Ricardo Quesada	99ae4d86d3	fixes compiler warnings ... * converts some `int` to `ssize_t` * adds `const` to `title()` and `subtitle()`	2013-12-19 12:23:42 -08:00
minggo	b67d567a79	replace long with int or ssize_t	2013-12-05 17:22:22 +08:00
James Chen	499a0404d4	issue #2790: Renames some functions in Vector<T>. Makes it more like stl vector.	2013-12-05 10:35:10 +08:00
James Chen	c152652c5b	issue #2790: Vector<FiniteTimeAction*> for Sequence::create(arr) and Spawn::create(arr).	2013-12-04 15:56:08 +08:00
Liam	2aaa21255f	fixed cocostudio action can not looping	2013-11-08 14:34:24 +08:00
CaiWenzhi	7a207431cd	Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch ... Conflicts: cocos/gui/UIHelper.h	2013-11-06 16:13:10 +08:00
CaiWenzhi	e0aa82da13	Merge master branch to develop branch	2013-11-06 16:04:06 +08:00
Ricardo Quesada	ba7ed6e578	Fixes some compiler warnings ... The warnings are related to: * 64-to-32-bit conversion * shadow variables	2013-11-04 16:31:36 -08:00
minggo	8f7a489a4d	issue #2905:make cocostudio and gui flat	2013-10-16 16:48:39 +08:00