Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/extensions
History
yinkaile dfc40d354e Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop 
Conflicts:
	extensions/CocoStudio/Armature/CCArmature.cpp
	extensions/CocoStudio/Armature/CCBone.cpp
	extensions/CocoStudio/Armature/CCBone.h
	extensions/CocoStudio/Armature/display/CCDisplayManager.cpp
	extensions/CocoStudio/Armature/display/CCSkin.cpp
	extensions/CocoStudio/Armature/utils/CCDataReaderHelper.cpp
 		2013-10-29 16:18:00 +08:00
..
CocoStudio/Armature Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop 2013-10-29 16:18:00 +08:00
GUI EventDispatcher is managed by Director now, like Scheduler and ActionManager. 2013-10-26 15:04:01 +08:00
assets-manager issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
physics-nodes issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
proj.linux issue #2905:samples build ok on linux 2013-10-22 18:01:56 +08:00
proj.win32 issue #2905:modification vs-project for folder structure change 2013-10-21 22:09:21 +08:00
Android.mk issue #2905:simplify Android.mk dependence 2013-10-18 14:18:36 +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 issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +08:00