James Chen
|
c38dfb6a17
|
issue #2087: Setting default touch priority to -1 for CCInputDelegate
|
2013-09-19 09:24:11 +08:00 |
|
James Chen
|
d7274b9475
|
issue #2087: Should not use fixed priority with 0 value, it's for scene graph based priority.
|
2013-09-19 09:19:03 +08:00 |
|
James Chen
|
db98d662af
|
issue #2087: Fixing crash of ComponentTest.
|
2013-09-19 09:15:56 +08:00 |
|
James Chen
|
997a5a36c1
|
[dispatcher] Renaming 'registerEventListenerXXX' to 'addEventListenerXXX'.
|
2013-09-14 09:02:49 +08:00 |
|
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
|
d8bd65b2e8
|
issue #2784:Add class constructor js-binding document
|
2013-09-13 16:46:31 +08:00 |
|
samuele3hu
|
a34ec99014
|
issue #2784:Add js-binding and lua-binding document
|
2013-09-13 11:41:20 +08:00 |
|
James Chen
|
da1101beeb
|
[Dispatcher] New event dispatcher, first commit.
|
2013-09-11 22:09:34 +08:00 |
|
zhangcheng
|
1115d0d3f9
|
1. merge scenereader Armature merge to cocos2dx 3.0.
|
2013-09-09 19:51:26 +08:00 |