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 |
|
Timothy Qiu
|
3d8d0e40ee
|
Fixed broken links and wrong encoding in the doc.
Fixed Obj-C names when referening functions.
Changed some GB2312 encoded characters to UTF-8.
|
2013-08-09 02:31:51 +08:00 |
|
James Chen
|
cb67ed0227
|
issue #2129: Removing CC prefix for extension module.
|
2013-06-20 14:15:53 +08:00 |
|
James Chen
|
c0d44cb2e4
|
fixed #2129: Rename m_iVar to _var, remove CC prefixes.
|
2013-06-15 14:03:30 +08:00 |
|
minggo
|
a75f8b7e7a
|
fixed #1593:remove all deprecated methods expect CCBAnimationManager
|
2012-12-06 18:51:33 +08:00 |
|
James Chen
|
d91d7c8317
|
issue #1483: Added LICENSE_CCControlExtension.txt, and added license information for headers of CCControlExtension.
|
2012-09-25 17:26:09 +08:00 |
|
James Chen
|
f7229f74d8
|
issue #1483: Synchronizing CCControlExtension to latest version.
|
2012-09-25 16:57:51 +08:00 |
|
Walzer
|
b8fa32dbc0
|
use extensions/GUI instead of extensions/UI
|
2012-07-30 22:57:59 +08:00 |