Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos2dx/cocoa
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
..
CCAffineTransform.cpp issue #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' 2012-04-19 14:35:52 +08:00
CCAffineTransform.h issue #1188: Refactor directory. Compile successfully on android and win32(vs2008 debug). 2012-04-25 16:18:04 +08:00
CCArray.cpp Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1324_create 2012-06-14 17:36:31 +08:00
CCArray.h Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1324_create 2012-06-14 17:36:31 +08:00
CCAutoreleasePool.cpp CCAutoreleasepool: Fixed typo. 2012-06-05 16:22:42 -07:00
CCAutoreleasePool.h issue #1188: Refactor directory. Compile successfully on android and win32(vs2008 debug). 2012-04-25 16:18:04 +08:00
CCDictionary.cpp issue #1324: Reverted old interfaces. 2012-06-14 17:18:05 +08:00
CCDictionary.h issue #1324: Reverted old interfaces. 2012-06-14 17:18:05 +08:00
CCGeometry.cpp issue #1324: Added create() for static member functions that new an autorelease object 2012-06-14 15:13:16 +08:00
CCGeometry.h issue #1324: Added create() for static member functions that new an autorelease object 2012-06-14 15:13:16 +08:00
CCInteger.h issue #1324: Reverted old interfaces. 2012-06-14 17:18:05 +08:00
CCNS.cpp refactor updated... 2012-04-18 18:43:45 +08:00
CCNS.h refactor updated... 2012-04-18 18:43:45 +08:00
CCObject.cpp issue #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' 2012-04-19 14:35:52 +08:00
CCObject.h Merge with gles20. 2012-06-11 10:43:07 -07:00
CCSet.cpp issue #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' 2012-04-19 14:35:52 +08:00
CCSet.h issue #1310: Some typo fixes. Updated CCTexture2D.h/.cpp. 2012-06-11 21:58:04 +08:00
CCString.cpp issue #1324: Reverted old interfaces. 2012-06-14 17:18:05 +08:00
CCString.h issue #1324: Reverted old interfaces. 2012-06-14 17:18:05 +08:00
CCZone.cpp issue #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' 2012-04-19 14:35:52 +08:00
CCZone.h issue #1188: Refactor directory. Compile successfully on android and win32(vs2008 debug). 2012-04-25 16:18:04 +08:00