axmol/extensions/GUI/CCControlExtension
Huabing.Xu 1670e07300 Merge branch 'develop' into develop_migrate_math_lib_merge
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	build/cocos2d_tests.xcodeproj/project.pbxproj
2014-04-11 11:18:13 +08:00
..
CCControl.cpp fix issue that ControlButton can't swallow touch event. 2014-04-02 17:01:11 +08:00
CCControl.h closed #3897 : Constructors should be protected, but should be a way to disable them, added CC_CONSTRUCTOR_ACCESS. 2014-03-21 13:44:29 +08:00
CCControlButton.cpp Label:Change setter of system font name. 2014-04-10 10:23:00 +08:00
CCControlButton.h Remove the old implementation of LabelBMFont. 2014-03-28 10:28:44 +08:00
CCControlColourPicker.cpp issue #4729: NULL -> nullptr in constructor or setXXX(NULL) 2014-04-10 00:36:43 +08:00
CCControlColourPicker.h closed #3897 : Constructors should be protected, but should be a way to disable them, added CC_CONSTRUCTOR_ACCESS. 2014-03-21 13:44:29 +08:00
CCControlExtensions.h fix line end in windows 2013-09-20 22:23:13 +08:00
CCControlHuePicker.cpp issue #4729: NULL -> nullptr in constructor or setXXX(NULL) 2014-04-10 00:36:43 +08:00
CCControlHuePicker.h Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-event-dispatcher-rebase 2013-09-13 19:06:09 +08:00
CCControlPotentiometer.cpp issue #4729: NULL -> nullptr in constructor or setXXX(NULL) 2014-04-10 00:36:43 +08:00
CCControlPotentiometer.h removes "include "cocos2d.h" from cocos2d files 2014-01-16 21:35:58 -08:00
CCControlSaturationBrightnessPicker.cpp issue #4729: NULL -> nullptr in constructor or setXXX(NULL) 2014-04-10 00:36:43 +08:00
CCControlSaturationBrightnessPicker.h Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-event-dispatcher-rebase 2013-09-13 19:06:09 +08:00
CCControlSlider.cpp issue #4729: NULL -> nullptr in constructor or setXXX(NULL) 2014-04-10 00:36:43 +08:00
CCControlSlider.h fix cc 2013-11-04 01:27:16 +04:00
CCControlStepper.cpp Merge pull request #6200 from dumganhar/iss4729-deprecated-folder 2014-04-10 11:17:21 +08:00
CCControlStepper.h Remove the old implementation of LabelTTF 2014-03-14 21:06:40 +08:00
CCControlSwitch.cpp issue #4729: NULL -> nullptr in constructor or setXXX(NULL) 2014-04-10 00:36:43 +08:00
CCControlSwitch.h Remove the old implementation of LabelTTF 2014-03-14 21:06:40 +08:00
CCControlUtils.cpp bug fix 2013-12-16 12:27:30 +08:00
CCControlUtils.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCInvocation.cpp issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCInvocation.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCScale9Sprite.cpp Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-11 11:18:13 +08:00
CCScale9Sprite.h visit() using Matrix instead of kmMat4 2014-04-08 21:45:54 +08:00