Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/extensions
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
..
AssetsManager issue #2784:Add class constructor js-binding document 2013-09-13 16:46:31 +08:00
CCArmature Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop 2013-09-15 15:19:13 +08:00
CCBReader issue #2784:Add class constructor js-binding document 2013-09-13 16:46:31 +08:00
CocoStudio Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop 2013-09-14 19:54:49 +08:00
GUI issue #2784:Add class constructor js-binding document 2013-09-13 16:46:31 +08:00
LocalStorage [Tizen] Enable LocalStorage 2013-08-07 19:01:41 +09:00
network issue #2784:Add class constructor js-binding document 2013-09-13 16:46:31 +08:00
physics_nodes issue #2784:Add class constructor js-binding document 2013-09-13 16:46:31 +08:00
proj.emscripten [emscripten] Fixing compilation errors. 2013-07-29 16:33:34 +08:00
proj.ios 1. remove any unused functions. 2013-09-10 11:02:50 +08:00
proj.linux update linux Makefile 2013-09-14 23:47:15 +08:00
proj.mac cocos2d-x in Mac: 2013-06-28 19:02:10 -07:00
proj.nacl 1. add shadernode.cpp to linux, nacl mk files. 2013-09-10 11:47:02 +08:00
proj.qt5 Qt 5 port: Fixes to build against "develop" branch 2013-07-26 08:55:46 +00:00
proj.tizen [Tizen] CC_ENABLE_CHIPMUNK_INTEGRATION=1 2013-08-06 14:42:53 +09:00
proj.win32 update armature 2013-09-13 18:07:37 +08:00
spine Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop 2013-09-14 19:54:49 +08:00
Android.mk 1. fixes error of 34 line in android.mk. 2013-09-10 11:50:08 +08:00
CCDeprecated-ext.cpp issue #2430: Moved constant to header file to avoid errors in 'switch case', the error is 'case value is not a constant expression'. 2013-07-27 00:55:41 +08:00
CCDeprecated-ext.h Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into DrawNode 2013-07-28 14:35:38 +08:00
ExtensionMacros.h issue #1483: Added LICENSE_CCControlExtension.txt, and added license information for headers of CCControlExtension. 2012-09-25 17:26:09 +08:00
cocos-ext.h update armature 2013-09-13 18:07:37 +08:00