13 Commits

Author	SHA1	Message	Date
CaiWenzhi	ab47cafb31	Merge branch 'develop' into develop_nutty_modify_framework_for315 ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj cocos/gui/UIButton.cpp cocos/gui/UIButton.h cocos/gui/UIWidget.h	2014-03-05 16:52:31 +08:00
pandamicro	364317b532	Feature #4236: Refactor is/setFlipX/Y to is/setFlippedX/Y in gui classes	2014-03-04 23:42:58 +08:00
CaiWenzhi	4a2dc4a607	Add custom widget and reader	2014-03-04 16:51:35 +08:00
CaiWenzhi	c615811124	Modify methods of Changing color and opacity.	2014-03-03 23:24:57 +08:00
cai wenzhi	683d3c9f14	Merge branch 'develop' into develop_nutty_modify_framework_for315	2014-03-02 19:28:44 +08:00
cai wenzhi	4f90676e92	Add method for editor	2014-03-01 22:34:25 +08:00
andyque	bf81591b48	fixed #3829. change namespace gui to ui	2014-02-25 10:18:44 +08:00
walzer	d4c1aa92d5	add copyrights for 2014, in folders other then 2d.	2014-01-07 11:47:11 +08:00
CaiWenzhi	9aa85d2bd6	Remove NodeRGBA inherit	2013-12-23 15:02:52 +08:00
samuele3	8a408f9951	Add doxygen comments for the CocoStudio	2013-11-20 12:04:47 +08:00
CaiWenzhi	2432e6e40d	add "override"	2013-11-14 13:42:10 +08:00
CaiWenzhi	e0aa82da13	Merge master branch to develop branch	2013-11-06 16:04:06 +08:00
minggo	8f7a489a4d	issue #2905:make cocostudio and gui flat	2013-10-16 16:48:39 +08:00