axmol/cocos2dx/platform
James Chen 7601cc7e27 Merge branch 'iss1555-update' of https://github.com/minggo/cocos2d-x into iss1555-update
Conflicts:
	cocos2dx/layers_scenes_transitions_nodes/CCLayer.cpp
2012-11-16 16:21:16 +08:00
..
android issue #1555:build ok on android 2012-11-16 14:23:14 +08:00
blackberry issue #1530: Added empty implementation of 'CCAccelerometer::setAccelerometerInterval' for win32,blackberry,linux,mac and marmalade ports. 2012-11-16 15:56:51 +08:00
ios issue #1555:update to v2.1 beta3 2012-11-14 18:05:15 +08:00
linux issue #1530: Added empty implementation of 'CCAccelerometer::setAccelerometerInterval' for win32,blackberry,linux,mac and marmalade ports. 2012-11-16 15:56:51 +08:00
mac issue #1530: Added empty implementation of 'CCAccelerometer::setAccelerometerInterval' for win32,blackberry,linux,mac and marmalade ports. 2012-11-16 15:56:51 +08:00
marmalade issue #1530: Added empty implementation of 'CCAccelerometer::setAccelerometerInterval' for win32,blackberry,linux,mac and marmalade ports. 2012-11-16 15:56:51 +08:00
third_party Merge branch 'gles20' of https://github.com/mrmop/cocos2d-x into iss1557-marmalade 2012-11-15 10:10:53 +08:00
win32 issue #1530: Defined a macro 'snprintf' since it's named '_snprintf' on win32. 2012-11-16 15:58:19 +08:00
CCAccelerometerDelegate.h Added "executeAccelerometerEvent" for CCScriptEngineProtocol class. Exported Accelerometer event to JS. 2012-11-06 14:18:13 +08:00
CCApplicationProtocol.h Minor changes to comments. One integer literal changed to float literal. 2012-09-14 15:26:38 -07:00
CCCommon.h Marmalade Sample data removed and merged changes 2012-10-25 21:40:37 +01:00
CCEGLViewProtocol.cpp fixed #1520: Added comments for using multiresolution in HelloCpp. 2012-10-23 10:50:47 +08:00
CCEGLViewProtocol.h fixed #1520: Updated some comments. 2012-10-23 14:01:48 +08:00
CCFileUtils.h Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-09-14 15:27:55 -07:00
CCFileUtilsCommon_cpp.h Minor English Spelling Corrections, etc. 2012-09-15 14:19:14 -07:00
CCImage.h Minor English Spelling Corrections, etc. 2012-09-15 14:19:14 -07:00
CCImageCommon_cpp.h Add error handler when read image data using libjpeg. 2012-11-01 21:45:51 +08:00
CCPlatformConfig.h Minor English Spelling Corrections, etc. 2012-09-15 14:19:14 -07:00
CCPlatformMacros.h fixed #1442: use CREATE_FUNC instead of SCENE_CREATE_FUNC and NODE_CREATE_FUNC 2012-08-27 16:11:07 +08:00
CCSAXParser.cpp Minor English Spelling Corrections, etc. 2012-09-15 14:19:14 -07:00
CCSAXParser.h add groups to all classes for doxygen 2012-06-20 18:09:11 +08:00
CCThread.cpp Fixes CCThread.cpp so it is not included for Mac builds. 2012-09-15 00:37:12 -07:00
CCThread.h add groups to all classes for doxygen 2012-06-20 18:09:11 +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 add groups to all classes for doxygen 2012-06-20 18:09:11 +08:00