Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/extensions/CCArmature/display
History
Ricardo Quesada d7590affda Merge branch 'develop' into dictionary_array_fixes 
Conflicts:
	cocos2dx/cocoa/CCArray.cpp
	cocos2dx/cocoa/CCArray.h
	cocos2dx/label_nodes/CCLabel.cpp
	extensions/CCArmature/datas/CCDatas.cpp
	extensions/CCArmature/display/CCDisplayManager.cpp
 		2013-08-21 21:27:44 -07:00
..
CCBatchNode.cpp issue #2430:move GLProgram enum into class 2013-07-25 17:48:22 +08:00
CCBatchNode.h issue #2129: Removing CC prefix for extension module. 2013-06-20 14:15:53 +08:00
CCDecorativeDisplay.cpp issue #2129: Removing CC prefix for extension module. 2013-06-20 14:15:53 +08:00
CCDecorativeDisplay.h issue #2129: Removing CC prefix for extension module. 2013-06-20 14:15:53 +08:00
CCDisplayFactory.cpp Array & Dictionary fixes 2013-08-21 20:12:09 -07:00
CCDisplayFactory.h issue #2129: Removing CC prefix for extension module. 2013-06-20 14:15:53 +08:00
CCDisplayManager.cpp Merge branch 'develop' into dictionary_array_fixes 2013-08-21 21:27:44 -07:00
CCDisplayManager.h issue #2129: Removing CC prefix for extension module. 2013-06-20 14:15:53 +08:00
CCShaderNode.cpp ccGLXXX -> GL::xxx 2013-07-25 18:42:53 -07:00
CCShaderNode.h issue #2129:remove prefix of types in ccTypes.h 2013-07-05 16:49:22 +08:00
CCSkin.cpp Some more changes to make the code more c++ friendly: 2013-07-16 18:16:04 -07:00
CCSkin.h issue #2129: Removing CC prefix for extension module. 2013-06-20 14:15:53 +08:00