James Chen
|
208f705845
|
Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into 2youyouo2-develop
Conflicts:
cocos2d_libs.xcodeproj/project.pbxproj
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h
|
2013-09-16 18:18:23 +08:00 |
|
2youyou2
|
a08ce3df73
|
change singleton class get method to getInstance
|
2013-09-16 15:16:05 +08:00 |
|
2youyou2
|
d8b64b8645
|
standardize code
|
2013-09-16 12:21:18 +08:00 |
|
2youyou2
|
b7b079c1c6
|
standardize code
|
2013-09-16 12:02:57 +08:00 |
|
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 |
|
yinkaile
|
74bd8b09d6
|
update armature
|
2013-09-13 18:07:37 +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 |
|
zhangcheng
|
1115d0d3f9
|
1. merge scenereader Armature merge to cocos2dx 3.0.
|
2013-09-09 19:51:26 +08:00 |