Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos2dx/sprite_nodes
History
James Chen 833b5b1be8 Merge branch 'gles20' of https://github.com/mrmop/cocos2d-x into iss1557-marmalade 
Conflicts:
	cocos2dx/base_nodes/CCNode.cpp
	cocos2dx/sprite_nodes/CCSprite.cpp
	samples/TestCpp/Classes/TouchesTest/Ball.cpp
	samples/TestCpp/Classes/VisibleRect.cpp
	samples/TestCpp/Classes/VisibleRect.h
 		2012-11-12 10:20:04 +08:00
..
CCAnimation.cpp update copyright to 2012, update cocos2d version to 2.0.3 2012-09-24 21:22:20 +08:00
CCAnimation.h update copyright to 2012, update cocos2d version to 2.0.3 2012-09-24 21:22:20 +08:00
CCAnimationCache.cpp update copyright to 2012, update cocos2d version to 2.0.3 2012-09-24 21:22:20 +08:00
CCAnimationCache.h update copyright to 2012, update cocos2d version to 2.0.3 2012-09-24 21:22:20 +08:00
CCSprite.cpp Merge branch 'gles20' of https://github.com/mrmop/cocos2d-x into iss1557-marmalade 2012-11-12 10:20:04 +08:00
CCSprite.h update copyright to 2012, update cocos2d version to 2.0.3 2012-09-24 21:22:20 +08:00
CCSpriteBatchNode.cpp revert CCSpriteBatchNode::removeSpriteFromAtlas() 2012-10-30 18:20:47 +08:00
CCSpriteBatchNode.h Minor English Spelling Corrections. A few grammar corrections. 2012-09-17 00:02:24 -07:00
CCSpriteFrame.cpp update copyright to 2012, update cocos2d version to 2.0.3 2012-09-24 21:22:20 +08:00
CCSpriteFrame.h update copyright to 2012, update cocos2d version to 2.0.3 2012-09-24 21:22:20 +08:00
CCSpriteFrameCache.cpp Minor English Spelling Corrections. A few grammar corrections. 2012-09-17 00:02:24 -07:00
CCSpriteFrameCache.h Marmalade Cocos2d-x Main Repo Changes 2012-10-19 16:38:58 +01:00