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
James Chen dd7bfd7b60 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-event-dispatcher-rebase 
Conflicts:
	cocos2dx/CCDirector.h
	cocos2dx/keyboard_dispatcher/CCKeyboardDispatcher.h
	cocos2dx/keypad_dispatcher/CCKeypadDelegate.h
	cocos2dx/keypad_dispatcher/CCKeypadDispatcher.h
	cocos2dx/layers_scenes_transitions_nodes/CCLayer.h
	cocos2dx/menu_nodes/CCMenu.h
	cocos2dx/platform/CCAccelerometerDelegate.h
	cocos2dx/platform/android/CCAccelerometer.h
	cocos2dx/platform/ios/CCAccelerometer.h
	cocos2dx/platform/mac/CCAccelerometer.h
	cocos2dx/platform/win32/CCAccelerometer.h
	cocos2dx/script_support/CCScriptSupport.h
	cocos2dx/touch_dispatcher/CCTouchDelegateProtocol.h
	cocos2dx/touch_dispatcher/CCTouchDispatcher.h
	cocos2dx/touch_dispatcher/CCTouchHandler.h
	extensions/CocoStudio/Components/CCInputDelegate.h
 		2013-09-13 19:06:09 +08:00
..
CCControl.cpp [Dispatcher] New event dispatcher, first commit. 2013-09-11 22:09:34 +08:00
CCControl.h Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-event-dispatcher-rebase 2013-09-13 19:06:09 +08:00
CCControlButton.cpp [Dispatcher] New event dispatcher, first commit. 2013-09-11 22:09:34 +08:00
CCControlButton.h Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-event-dispatcher-rebase 2013-09-13 19:06:09 +08:00
CCControlColourPicker.cpp [Dispatcher] New event dispatcher, first commit. 2013-09-11 22:09:34 +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 issue #1483: Added LICENSE_CCControlExtension.txt, and added license information for headers of CCControlExtension. 2012-09-25 17:26:09 +08:00
CCControlHuePicker.cpp [Dispatcher] New event dispatcher, first commit. 2013-09-11 22:09:34 +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 [Dispatcher] New event dispatcher, first commit. 2013-09-11 22:09:34 +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 [Dispatcher] New event dispatcher, first commit. 2013-09-11 22:09:34 +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 [Dispatcher] New event dispatcher, first commit. 2013-09-11 22:09:34 +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 [Dispatcher] New event dispatcher, first commit. 2013-09-11 22:09:34 +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 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-event-dispatcher-rebase 2013-09-13 19:06:09 +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 issue #2404:created CCDprecated.h and move all global functions and variables into it 2013-07-15 16:14:26 +08:00
CCControlUtils.h issue #2784:Add js-binding and lua-binding document 2013-09-13 11:41:20 +08:00
CCInvocation.cpp issue 2430:use enum class for Control enum values 2013-07-26 14:37:26 +08:00
CCInvocation.h issue #2784:Add js-binding and lua-binding document 2013-09-13 11:41:20 +08:00
CCScale9Sprite.cpp Little performance improvements 2013-08-26 18:08:21 -07:00
CCScale9Sprite.h issue #2784:Add class constructor js-binding document 2013-09-13 16:46:31 +08:00