Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos2dx/tileMap_parallax_nodes
History
James Chen 3a410c14a1 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1324_create 
Conflicts:
	cocos2dx/extensions/CCBReader/CCBReader_v2.cpp
	cocos2dx/extensions/CCControlExtension/CCScale9Sprite.cpp
	cocos2dx/label_nodes/CCLabelBMFont.cpp
	cocos2dx/menu_nodes/CCMenuItem.cpp
	cocos2dx/menu_nodes/CCMenuItem.h
	cocos2dx/misc_nodes/CCRenderTexture.h
	cocos2dx/tileMap_parallax_nodes/CCTileMapAtlas.cpp
	tests/tests/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder.cpp
	tests/tests/LabelTest/LabelTest.cpp
 		2012-06-14 17:36:31 +08:00
..
CCParallaxNode.cpp issue #1324: Reverted old interfaces. 2012-06-14 17:18:05 +08:00
CCParallaxNode.h issue #1324: Reverted old interfaces. 2012-06-14 17:18:05 +08:00
CCTMXLayer.cpp Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1324_create 2012-06-14 17:36:31 +08:00
CCTMXLayer.h issue #1324: Reverted old interfaces. 2012-06-14 17:18:05 +08:00
CCTMXObjectGroup.cpp issue #1324: Added create() for static member functions that new an autorelease object, updated cocoa folder. 2012-06-14 16:05:58 +08:00
CCTMXObjectGroup.h issue #1188: Refactor directory. Compile successfully on android and win32(vs2008 debug). 2012-04-25 16:18:04 +08:00
CCTMXTiledMap.cpp issue #1324: Reverted old interfaces. 2012-06-14 17:18:05 +08:00
CCTMXTiledMap.h issue #1324: Reverted old interfaces. 2012-06-14 17:18:05 +08:00
CCTMXXMLParser.cpp issue #1324: Added create() for static member functions that new an autorelease object, updated cocoa folder. 2012-06-14 16:05:58 +08:00
CCTMXXMLParser.h issue #1324: Added create() for static member functions that new an autorelease object, updated cocoa folder. 2012-06-14 16:05:58 +08:00
CCTileMapAtlas.cpp issue #1324: Reverted old interfaces. 2012-06-14 17:18:05 +08:00
CCTileMapAtlas.h issue #1324: Reverted old interfaces. 2012-06-14 17:18:05 +08:00