171 Commits

Author	SHA1	Message	Date
CaiWenzhi	243b7e5822	Modify layout and add Boxes	2014-03-25 17:15:54 +08:00
James Chen	b40127ea99	Never include '.cpp' files.	2014-03-25 15:32:14 +08:00
James Chen	91347aca0c	closed #4541: Removes wrong coments in CCProtectedNode.h.	2014-03-25 15:07:46 +08:00
CaiWenzhi	9a8cf6d813	Modify Windows Project	2014-03-25 14:28:58 +08:00
CaiWenzhi	c0b67e6d1b	Modify mk files	2014-03-25 14:28:58 +08:00
CaiWenzhi	2dffcb9808	Add ProtectedNode and remove "addNode"	2014-03-25 14:28:58 +08:00
James Chen	8d28884c9f	Merge pull request #5806 from Dhilan007/develop_reImplementationWithLabel ... issue #3821: Uses new label instead of LabelTTF in engine.	2014-03-25 13:46:17 +08:00
andyque	f5795c25b6	remove warnings under win32	2014-03-24 10:12:40 +08:00
Dale Stammen	44e6efea64	#pragma mark for ios and mac only	2014-03-22 06:08:05 -07:00
James Chen	f51c39c034	closed #3897 : Constructors should be protected, but should be a way to disable them, added CC_CONSTRUCTOR_ACCESS. ... Thank @pandamicro.	2014-03-21 13:44:29 +08:00
andyque	7ab639ec0f	fix lots compile warnings	2014-03-20 16:24:55 +08:00
andyque	8c1bf48357	fixed label font size: from int to float	2014-03-20 15:03:48 +08:00
andyque	ca6851f114	fix warnings of font and RichText	2014-03-20 11:58:36 +08:00
andyque	7ae77c9335	fix cocos2dx engine internal warnings	2014-03-20 10:58:04 +08:00
Dhilan007	e512235299	Remove the old implementation of LabelTTF	2014-03-14 21:06:40 +08:00
James Chen	177bf4df9d	Some warning fixes.	2014-03-14 15:38:43 +08:00
CaiWenzhi	b8ce59962a	Fixed bug of ScrollView	2014-03-13 10:11:41 +08:00
CaiWenzhi	4d99736e4a	Merge branch 'develop' into develop_nutty_modify_framework_for315CrashFixed	2014-03-12 17:06:48 +08:00
andyque	448b101578	fix linux compile error	2014-03-11 20:46:11 +08:00
andyque	48772fb952	modify android makefile	2014-03-11 18:48:28 +08:00
andyque	cbcc1bbbcf	let ios project compile correct	2014-03-11 18:48:26 +08:00