Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/HelloWorld
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
..
Classes issue #1324: Added create() for static member functions that new an autorelease object 2012-06-14 15:13:16 +08:00
Resources issue #1246:use CCLabelBMFont instead of CCLabelTTF in CCDirector.cpp 2012-05-24 10:48:39 +08:00
proj.android fixed #1322: vertical alignment works ok on android 2012-06-13 18:33:44 +08:00
proj.ios issue #1310: make tests and HelloWorld work ok 2012-06-11 10:41:52 +08:00
proj.win32 fixed #1301: CCEGLView::sharedOpenGLView().setScissorInPoints() should apply scissor in points. 2012-06-06 14:13:40 +08:00