Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos2dx/platform
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
..
android fixed #1322: vertical alignment works ok on android 2012-06-13 18:33:44 +08:00
ios Merge with gles20. 2012-06-13 15:56:52 -07:00
third_party Merge with gles20. 2012-06-11 10:43:07 -07:00
win32 Merge with gles20. 2012-06-11 10:43:07 -07:00
CCAccelerometerDelegate.h issue #1188: Refactor directory. Compile successfully on android and win32(vs2008 debug). 2012-04-25 16:18:04 +08:00
CCApplicationProtocol.h issue #1310: synchronize CCLabelTTF 2012-06-11 14:36:25 +08:00
CCCommon.h fixed #1179: popup message box when invoking CCAssert on Android 2012-04-20 15:12:20 +08:00
CCEGLViewProtocol.cpp Merge with gles20. 2012-06-11 10:43:07 -07:00
CCEGLViewProtocol.h issue #1310: synchronize CCLabelTTF 2012-06-11 14:36:25 +08:00
CCFileUtils.h Merge with gles20. 2012-06-11 11:50:32 -07:00
CCFileUtilsCommon_cpp.h issue #1188: Refactor directory. Compile successfully on android and win32(vs2008 debug). 2012-04-25 16:18:04 +08:00
CCImage.h fixed #1270: Fixed some warning on win32. 2012-05-29 17:11:33 +08:00
CCImageCommon_cpp.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
CCPlatformConfig.h issue #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' 2012-04-19 14:35:52 +08:00
CCPlatformMacros.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
CCSAXParser.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
CCSAXParser.h issue #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' 2012-04-19 14:35:52 +08:00
CCThread.cpp Merge with gles20. 2012-06-11 10:43:07 -07:00
CCThread.h issue #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' 2012-04-19 14:35:52 +08:00
platform.cpp issue #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' 2012-04-19 14:35:52 +08:00
platform.h issue #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' 2012-04-19 14:35:52 +08:00