Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/extensions/spine
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.cpp issue #2284: merge master and fixed some conflicts 2013-06-13 17:54:05 +08:00
Animation.h issue #2075: Adding spine editor support. Adding a new test 'SpineTest' in TestCpp, adding the parse code in "extensions/spine". It works only on iOS now. 2013-04-24 13:57:34 +08:00
AnimationState.cpp fixed #2252: Fixing a bug that stdio.h is in c++ namespace. 2013-06-04 15:09:20 +08:00
AnimationState.h Update for spine runtime 2013-06-04 14:46:31 +08:00
AnimationStateData.cpp issue #2284: merge master and fixed some conflicts 2013-06-13 17:54:05 +08:00
AnimationStateData.h issue #2075: Adding spine editor support. Adding a new test 'SpineTest' in TestCpp, adding the parse code in "extensions/spine". It works only on iOS now. 2013-04-24 13:57:34 +08:00
Atlas.cpp issue #2284: merge master and fixed some conflicts 2013-06-13 17:54:05 +08:00
Atlas.h Update for spine runtime 2013-06-04 14:46:31 +08:00
AtlasAttachmentLoader.cpp Update for spine runtime 2013-06-04 14:46:31 +08:00
AtlasAttachmentLoader.h issue #2075: Adding spine editor support. Adding a new test 'SpineTest' in TestCpp, adding the parse code in "extensions/spine". It works only on iOS now. 2013-04-24 13:57:34 +08:00
Attachment.cpp issue #2284: merge master and fixed some conflicts 2013-06-13 17:54:05 +08:00
Attachment.h issue #2075: Adding spine editor support. Adding a new test 'SpineTest' in TestCpp, adding the parse code in "extensions/spine". It works only on iOS now. 2013-04-24 13:57:34 +08:00
AttachmentLoader.cpp issue #2284: merge master and fixed some conflicts 2013-06-13 17:54:05 +08:00
AttachmentLoader.h Update for spine runtime 2013-06-04 14:46:31 +08:00
Bone.cpp Update for spine runtime 2013-06-04 14:46:31 +08:00
Bone.h Update for spine runtime 2013-06-04 14:46:31 +08:00
BoneData.cpp Update for spine runtime 2013-06-04 14:46:31 +08:00
BoneData.h issue #2075: Adding spine editor support. Adding a new test 'SpineTest' in TestCpp, adding the parse code in "extensions/spine". It works only on iOS now. 2013-04-24 13:57:34 +08:00
CCSkeleton.cpp Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop 2013-09-14 19:54:49 +08:00
CCSkeleton.h issue #2784:Add class constructor js-binding document 2013-09-13 16:46:31 +08:00
CCSkeletonAnimation.cpp CCAssert -> CCASSERT 2013-07-19 22:01:27 -07:00
CCSkeletonAnimation.h issue #2784:Add class constructor js-binding document 2013-09-13 16:46:31 +08:00
Json.cpp Update for spine runtime 2013-06-04 14:46:31 +08:00
Json.h issue #2075: Adding spine editor support. Adding a new test 'SpineTest' in TestCpp, adding the parse code in "extensions/spine". It works only on iOS now. 2013-04-24 13:57:34 +08:00
RegionAttachment.cpp Update for spine runtime 2013-06-04 14:46:31 +08:00
RegionAttachment.h Update for spine runtime 2013-06-04 14:46:31 +08:00
Skeleton.cpp Update for spine runtime. 2013-06-04 14:47:19 +08:00
Skeleton.h Update for spine runtime 2013-06-04 14:46:31 +08:00
SkeletonData.cpp Update for spine runtime 2013-06-04 14:46:31 +08:00
SkeletonData.h issue #2075: Adding spine editor support. Adding a new test 'SpineTest' in TestCpp, adding the parse code in "extensions/spine". It works only on iOS now. 2013-04-24 13:57:34 +08:00
SkeletonJson.cpp Update for spine runtime 2013-06-04 14:46:31 +08:00
SkeletonJson.h issue #2075: Adding spine editor support. Adding a new test 'SpineTest' in TestCpp, adding the parse code in "extensions/spine". It works only on iOS now. 2013-04-24 13:57:34 +08:00
Skin.cpp Update for spine runtime 2013-06-04 14:46:31 +08:00
Skin.h Update for spine runtime 2013-06-04 14:46:31 +08:00
Slot.cpp Update for spine runtime 2013-06-04 14:46:31 +08:00
Slot.h Update for spine runtime 2013-06-04 14:46:31 +08:00
SlotData.cpp Update for spine runtime 2013-06-04 14:46:31 +08:00
SlotData.h Update for spine runtime 2013-06-04 14:46:31 +08:00
extension.cpp [LINUX] Fix a compilation error in spine/extension.cpp. 2013-06-08 17:22:49 +08:00
extension.h Update for spine runtime 2013-06-04 14:46:31 +08:00
spine-cocos2dx.cpp getInstance() / destroyInstance() are used... 2013-07-11 15:24:23 -07:00
spine-cocos2dx.h issue #2129:remove prefix of types in ccTypes.h 2013-07-05 16:49:22 +08:00
spine.h issue #2075: Adding spine editor support. Adding a new test 'SpineTest' in TestCpp, adding the parse code in "extensions/spine". It works only on iOS now. 2013-04-24 13:57:34 +08:00