2youyou2
|
77db15bd0d
|
change variables name
|
2013-09-15 20:24:25 +08:00 |
|
2youyou2
|
db4813f161
|
1.remove CC from class name
2.fix async loading
|
2013-09-15 19:08:45 +08:00 |
|
yinkaile
|
5e1f91d396
|
Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop
Conflicts:
extensions/CocoStudio/Armature/CCArmature.h
extensions/CocoStudio/Armature/CCBone.h
extensions/CocoStudio/Armature/animation/CCArmatureAnimation.h
extensions/CocoStudio/Armature/animation/CCProcessBase.h
extensions/CocoStudio/Armature/animation/CCTween.h
extensions/CocoStudio/Armature/datas/CCDatas.h
extensions/CocoStudio/Armature/display/CCDecorativeDisplay.h
extensions/CocoStudio/Armature/display/CCDisplayManager.h
extensions/CocoStudio/Armature/external_tool/CCTexture2DMutable.h
extensions/CocoStudio/Armature/physics/CCColliderDetector.h
extensions/CocoStudio/Armature/physics/CCPhysicsWorld.h
extensions/CocoStudio/Armature/utils/CCArmatureDataManager.h
extensions/CocoStudio/Armature/utils/CCSpriteFrameCacheHelper.h
|
2013-09-14 19:54:49 +08:00 |
|
zhangcheng
|
0121943c11
|
1. Adds SceneEditorTest hd version
|
2013-09-14 16:34:26 +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 |
|
yinkaile
|
74bd8b09d6
|
update armature
|
2013-09-13 18:07:37 +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
|
6f37529236
|
[dispatcher] Adding 'Node::updateEventPriorityIndex' and making 'Node::addEventId(removeEventId)' method to be private.
|
2013-09-12 20:47:15 +08:00 |
|
James Chen
|
da1101beeb
|
[Dispatcher] New event dispatcher, first commit.
|
2013-09-11 22:09:34 +08:00 |
|
chengstory
|
669de88e73
|
1. remove any unused functions.
|
2013-09-10 11:02:50 +08:00 |
|
zhangcheng
|
1115d0d3f9
|
1. merge scenereader Armature merge to cocos2dx 3.0.
|
2013-09-09 19:51:26 +08:00 |