20 Commits

Author	SHA1	Message	Date
andyque	dae29e5678	update UI module code comments	2014-07-15 15:56:07 +08:00
andyque	6df8079fd7	closed #5591, fix UIButton setTitleColor & getTitleColor not match	2014-06-25 13:47:29 +08:00
andyque	aa5df68b96	Merge branch 'v3' into cleanupBinaryLoader ... Conflicts: cocos/3d/CCAnimationCurve.h cocos/3d/CCAnimationCurve.inl	2014-06-18 15:13:34 +08:00
andyque	2cef0cb437	update ccs-res	2014-06-18 11:26:26 +08:00
kyokomi	3f7cecaf8b	fix move this enum class to private part and change `Type` to `FontType`.	2014-06-17 16:34:54 +09:00
andyque	1d01fe8bbc	refactor	2014-06-15 16:12:24 +08:00
kyokomi	7d710f6aed	Fix UIButton.cpp added TTFFont.	2014-06-15 16:58:05 +09:00
andyque	46ad4edab3	refactor UIButton setColor & setOpacity	2014-06-06 16:00:28 +08:00
andyque	38e274de73	refact ui header file include	2014-06-04 14:56:33 +08:00
andyque	f87e4243ee	add constness to UIButton	2014-05-27 11:30:36 +08:00
andyque	6a7277c38f	issue #5057, refactor TextureResType to strong typed enum	2014-05-09 14:56:05 +08:00
CaiWenzhi	19f6526ef8	Widget supports contentsize	2014-04-17 14:08:25 +08:00
andyque	9bcfea2279	issue #4636. fix some typo	2014-04-03 17:13:24 +08:00
andyque	10134ccc65	issue #4636. finish button	2014-04-03 10:31:10 +08:00
andyque	18c072beff	issue #4636, replace const char* to const std::string& in UIButton	2014-04-03 10:07:46 +08:00
andyque	1b0583214b	issue #4636, add parameter create method to UIButton	2014-04-03 10:07:46 +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
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
Dhilan007	e512235299	Remove the old implementation of LabelTTF	2014-03-14 21:06:40 +08:00
andyque	cbcc1bbbcf	let ios project compile correct	2014-03-11 18:48:26 +08:00