Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/extensions/CCArmature
History
2youyou2 9fd89dbfc2 Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop 
Conflicts:
	extensions/CCArmature/CCArmature.cpp
	extensions/CCArmature/CCArmature.h
	extensions/CCArmature/CCBone.cpp
	extensions/CCArmature/CCBone.h
	extensions/CCArmature/animation/CCArmatureAnimation.cpp
	extensions/CCArmature/animation/CCTween.cpp
	extensions/CCArmature/animation/CCTween.h
	extensions/CCArmature/datas/CCDatas.cpp
	extensions/CCArmature/datas/CCDatas.h
	extensions/CCArmature/display/CCDecorativeDisplay.cpp
	extensions/CCArmature/display/CCDecorativeDisplay.h
	extensions/CCArmature/display/CCDisplayFactory.cpp
	extensions/CCArmature/display/CCDisplayFactory.h
	extensions/CCArmature/display/CCDisplayManager.cpp
	extensions/CCArmature/display/CCDisplayManager.h
	extensions/CCArmature/display/CCSkin.cpp
	extensions/CCArmature/display/CCSkin.h
	extensions/CCArmature/external_tool/CCTexture2DMutable.cpp
	extensions/CCArmature/external_tool/Json/CSContentJsonDictionary.cpp
	extensions/CCArmature/external_tool/Json/CSContentJsonDictionary.h
	extensions/CCArmature/external_tool/Json/lib_json/json_reader.cpp
	extensions/CCArmature/external_tool/Json/lib_json/json_value.cpp
	extensions/CCArmature/external_tool/Json/lib_json/value.h
	extensions/CCArmature/physics/CCColliderDetector.cpp
	extensions/CCArmature/physics/CCColliderDetector.h
	extensions/CCArmature/utils/CCArmatureDataManager.cpp
	extensions/CCArmature/utils/CCArmatureDefine.h
	extensions/CCArmature/utils/CCDataReaderHelper.cpp
	extensions/CCArmature/utils/CCSpriteFrameCacheHelper.cpp
	extensions/CCArmature/utils/CCSpriteFrameCacheHelper.h
	extensions/CCArmature/utils/CCUtilMath.cpp
	extensions/cocos-ext.h
	extensions/proj.win32/libExtensions.vcxproj
	extensions/proj.win32/libExtensions.vcxproj.filters
	samples/Cpp/TestCpp/Classes/ExtensionsTest/ArmatureTest/ArmatureScene.cpp
	samples/Cpp/TestCpp/Classes/ExtensionsTest/ArmatureTest/ArmatureScene.h
	samples/Cpp/TestCpp/Resources/armature/Cowboy.ExportJson
 		2013-09-15 15:19:13 +08:00
..
animation Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop 2013-09-15 15:19:13 +08:00
datas 1. merge scenereader Armature merge to cocos2dx 3.0. 2013-09-09 19:51:26 +08:00
display Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop 2013-09-15 15:19:13 +08:00
external_tool Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop 2013-09-15 15:19:13 +08:00
physics 1. merge scenereader Armature merge to cocos2dx 3.0. 2013-09-09 19:51:26 +08:00
utils Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop 2013-09-15 15:19:13 +08:00
CCArmature.cpp 1. merge scenereader Armature merge to cocos2dx 3.0. 2013-09-09 19:51:26 +08:00
CCArmature.h 1. merge scenereader Armature merge to cocos2dx 3.0. 2013-09-09 19:51:26 +08:00
CCBone.cpp 1. merge scenereader Armature merge to cocos2dx 3.0. 2013-09-09 19:51:26 +08:00
CCBone.h 1. merge scenereader Armature merge to cocos2dx 3.0. 2013-09-09 19:51:26 +08:00