Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/samples/Cpp/TestCpp
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
..
.externalToolBuilders Adding missing eclipse project files 2013-03-07 12:13:50 -08:00
Classes Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop 2013-09-15 15:19:13 +08:00
Resources fix armature hd crash 2013-09-14 23:31:33 +08:00
proj.android Add parameter in method cocos_android_app_init() to initialize plugin. 2013-09-02 16:10:08 +08:00
proj.emscripten 1. update Samples on develop branch. 2013-09-10 09:53:15 +08:00
proj.ios issue #2800:Can not hide status bar on iOS 7 2013-09-13 15:54:58 +08:00
proj.linux Merge branch '#develop' into #4551 2013-09-10 16:25:31 +08:00
proj.mac issue #2460: optimize EGLView interface 2013-08-29 11:36:16 +08:00
proj.nacl 1. update mkfile. 2013-09-10 13:08:05 +08:00
proj.qt5 closed #2517: Use LocalVarToAuto.py to change Samples src file 2013-08-16 16:05:27 +08:00
proj.tizen [Tizen] Update project files. 2013-08-25 02:22:50 +09:00
proj.win32 Merge branch '#develop' into #4551 2013-09-10 16:25:31 +08:00
.cproject Adding missing eclipse project files 2013-03-07 12:13:50 -08:00
Android.mk Merge branch '#develop' into #4551 2013-09-10 16:25:31 +08:00