13 Commits

Author	SHA1	Message	Date
Liam	3f954857a8	update for lay out	2014-10-17 19:13:37 +08:00
pipu	9503253a17	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_pipu	2014-10-12 17:44:28 +08:00
pipu	752eb839c7	Add protocolbuf.a	2014-10-09 18:28:09 +08:00
Dhilan007	83150aa4d1	fix warns and memory leak	2014-10-09 17:19:43 +08:00
Ricardo Quesada	6f3ca63f00	Moved base/CCPlatform* -> platform/CCPlatform*	2014-09-09 17:17:07 -07:00
andyque	f2b0528cc9	refactor	2014-07-30 10:45:35 +08:00
andyque	e7da7b3e42	change unsigned long to size_type	2014-07-30 10:34:37 +08:00
andyque	955da5d3cc	move utf8_substr to ui::helper class.	2014-07-30 10:34:37 +08:00
zhangcheng	6cfc5b72dc	1. CocosStudio adapt to cocos2d-x v3.2.	2014-07-21 17:45:56 +08:00
andyque	d1df19794a	fixed ui header file include problem	2014-05-22 10:49:28 +08:00
andyque	da3e794631	issue #5057, convert const char* to std::string&	2014-05-12 14:59:00 +08:00
CaiWenzhi	243b7e5822	Modify layout and add Boxes	2014-03-25 17:15:54 +08:00
andyque	cbcc1bbbcf	let ios project compile correct	2014-03-11 18:48:26 +08:00