Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/extensions/CocoStudio/Armature
History
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
..
animation Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop 2013-09-14 19:54:49 +08:00
datas Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop 2013-09-14 19:54:49 +08:00
display Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop 2013-09-14 19:54:49 +08:00
external_tool update armature 2013-09-13 18:07:37 +08:00
physics update armature 2013-09-13 18:07:37 +08:00
utils Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop 2013-09-14 19:54:49 +08:00
CCArmature.cpp Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop 2013-09-14 19:54:49 +08:00
CCArmature.h Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop 2013-09-14 19:54:49 +08:00
CCBone.cpp Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop 2013-09-14 19:54:49 +08:00
CCBone.h Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop 2013-09-14 19:54:49 +08:00