Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/extensions/GUI/CCControlExtension
History
boyu0 ef54ed3c15 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into HEAD 
Conflicts:
	cocos/2d/CCLabel.cpp
	cocos/2d/CCLabel.h
	cocos/2d/CCLabelBMFont.cpp
	cocos/2d/CCLabelBMFont.h
	cocos/2d/CCLayer.cpp
	cocos/2d/CCLayer.h
	cocos/2d/CCNode.cpp
	extensions/GUI/CCControlExtension/CCControl.cpp
	extensions/GUI/CCControlExtension/CCControlButton.cpp
	extensions/GUI/CCControlExtension/CCScale9Sprite.cpp
	tools/tojs/cocos2dx.ini
 		2013-12-19 17:05:59 +08:00
..
CCControl.cpp Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into HEAD 2013-12-19 17:05:59 +08:00
CCControl.h Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect 2013-12-10 18:03:41 +08:00
CCControlButton.cpp Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into HEAD 2013-12-19 17:05:59 +08:00
CCControlButton.h Some warning fixes in SocketIO, ContriolButton, js_manual_conversion.h/.cpp. 2013-12-18 15:40:31 +08:00
CCControlColourPicker.cpp Adding onEnterHook, onXXXHook for Node. 2013-10-25 10:53:45 +08:00
CCControlColourPicker.h Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-event-dispatcher-rebase 2013-09-13 19:06:09 +08:00
CCControlExtensions.h fix line end in windows 2013-09-20 22:23:13 +08:00
CCControlHuePicker.cpp Adding onEnterHook, onXXXHook for Node. 2013-10-25 10:53:45 +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 Adding onEnterHook, onXXXHook for Node. 2013-10-25 10:53:45 +08:00
CCControlPotentiometer.h Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-event-dispatcher-rebase 2013-09-13 19:06:09 +08:00
CCControlSaturationBrightnessPicker.cpp Adding onEnterHook, onXXXHook for Node. 2013-10-25 10:53:45 +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 Adding onEnterHook, onXXXHook for Node. 2013-10-25 10:53:45 +08:00
CCControlSlider.h Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-event-dispatcher-rebase 2013-09-13 19:06:09 +08:00
CCControlStepper.cpp Adding onEnterHook, onXXXHook for Node. 2013-10-25 10:53:45 +08:00
CCControlStepper.h Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-event-dispatcher-rebase 2013-09-13 19:06:09 +08:00
CCControlSwitch.cpp issue #3258: Renames ControlSwitchSprite::createWithMaskSprite to ControlSwitchSprite::create. 2013-11-26 16:19:12 +08:00
CCControlSwitch.h Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-event-dispatcher-rebase 2013-09-13 19:06:09 +08:00
CCControlUtils.cpp bug fix 2013-12-16 12:27:30 +08:00
CCControlUtils.h issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +08:00
CCInvocation.cpp issue 2430:use enum class for Control enum values 2013-07-26 14:37:26 +08:00
CCInvocation.h issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +08:00
CCScale9Sprite.cpp Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into HEAD 2013-12-19 17:05:59 +08:00
CCScale9Sprite.h issue #3162: add updateColor function to Label and delete duplicate functions. 2013-12-11 16:38:47 +08:00