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 |
|
samuele3hu
|
3a334b7478
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into doxygen
|
2013-09-13 11:42:04 +08:00 |
|
samuele3hu
|
a34ec99014
|
issue #2784:Add js-binding and lua-binding document
|
2013-09-13 11:41:20 +08:00 |
|
James Chen
|
3605fce2e3
|
[dispatcher] Comments self->setTouchPriority. Need to be fixed.
|
2013-09-12 21:12:20 +08:00 |
|
samuele3hu
|
4f9a9bfe85
|
issue #2433:Modify ScriptHandlerMgr's enum to enum class and modify some related functions
|
2013-09-04 22:17:26 +08:00 |
|
samuele3hu
|
f56c6f7087
|
issue #2433:Modify platform config and some test samples
|
2013-08-30 11:56:35 +08:00 |
|
samuele3hu
|
c7b0b6791f
|
issue #2433:Update typed function and add some manual binding
|
2013-08-26 18:09:15 +08:00 |
|
samuele3hu
|
e557b6b7c2
|
issue #2433:Add lua deprecated fiel and modify some test samples
|
2013-08-23 16:12:59 +08:00 |
|
samuele3hu
|
bea62800b4
|
issue #2433:Modify TestLua samples and add some manual binding code
|
2013-08-22 10:16:57 +08:00 |