Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/extensions/CocoStudio/Armature/display
History
James Chen 208f705845 Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into 2youyouo2-develop 
Conflicts:
	cocos2d_libs.xcodeproj/project.pbxproj
	samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
	samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h
 		2013-09-16 18:18:23 +08:00
..
CCBatchNode.cpp Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into 2youyouo2-develop 2013-09-16 18:18:23 +08:00
CCBatchNode.h standardizate code 2013-09-16 14:13:55 +08:00
CCDecorativeDisplay.cpp change variables name 2013-09-15 20:24:25 +08:00
CCDecorativeDisplay.h standardizate code 2013-09-16 14:13:55 +08:00
CCDisplayFactory.cpp change singleton class get method to getInstance 2013-09-16 15:16:05 +08:00
CCDisplayFactory.h 1.remove CC from class name 2013-09-15 19:08:45 +08:00
CCDisplayManager.cpp standardize code 2013-09-16 12:02:57 +08:00
CCDisplayManager.h standardizate code 2013-09-16 14:13:55 +08:00
CCSkin.cpp change singleton class get method to getInstance 2013-09-16 15:16:05 +08:00
CCSkin.h change variables name 2013-09-15 20:24:25 +08:00