James Chen
|
b128018f76
|
Merge branch 'suppressed-C4996' of https://github.com/savdalion/cocos2d-x into savdalion-suppressed-C4996
Conflicts:
extensions/CocoStudio/Armature/external_tool/GLES-Render.cpp
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
|
2013-09-16 20:58:26 +08:00 |
|
signmotion
|
5dffb1b44e
|
Deprecated methods are replaced (warning MSVC C4996 is suppressed).
|
2013-09-16 15:38:03 +03:00 |
|
James Chen
|
83d61dff44
|
[Armature] Fixing compilation errors.
|
2013-09-16 19:27:34 +08:00 |
|
2youyou2
|
a08ce3df73
|
change singleton class get method to getInstance
|
2013-09-16 15:16:05 +08:00 |
|
2youyou2
|
16c70363dd
|
standardizate code
|
2013-09-16 14:56:59 +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 |
|
zhangcheng
|
98fce2fa84
|
1. update Samples on develop branch.
|
2013-09-10 09:53:15 +08:00 |