James Chen dc7fcce0fe Merge branch 'iss2430-modify_enum' of https://github.com/minggo/cocos2d-x into minggo-iss2430-modify_enum ... Conflicts: scripting/javascript/bindings/generated scripting/lua/cocos2dx_support/LuaCocos2d.cpp		2013-07-26 21:22:16 +08:00
..
java	Merge pull request #3118 from jotel/text-shadow-opacity-fix	2013-07-16 02:39:36 -07:00
jni	issue #2397: Application::sharedApplication --> Application::getInstance.	2013-07-15 16:24:42 +08:00
CCAccelerometer.cpp	issue #2129: Removing CC prefix for cocos2dx module.	2013-06-20 14:13:12 +08:00
CCAccelerometer.h	issue #2129: Removing CC prefix for cocos2dx module.	2013-06-20 14:13:12 +08:00
CCApplication.cpp	Platform::LINUX --> Platform::OS_LINUX, Platform::ANDROID --> Platform::OS_ANDROID. ANDROID is defined by ndk.	2013-07-26 18:17:30 +08:00
CCApplication.h	enum class for LanguageType, Application::Platform	2013-07-26 17:29:06 +08:00
CCCommon.cpp	Compilation error fixes, since CCLog has been renamed to 'log', all platforms should implement it.	2013-07-24 10:14:42 +08:00
CCDevice.cpp	issue #2129: Removing CC prefix for cocos2dx module.	2013-06-20 14:13:12 +08:00
CCEGLView.cpp	issue #2397: EGLView::sharedOpenGLView() --> EGLView::getInstance()	2013-07-12 13:11:21 +08:00
CCEGLView.h	issue #2397: EGLView::sharedOpenGLView() --> EGLView::getInstance()	2013-07-12 13:11:21 +08:00
CCFileUtilsAndroid.cpp	Added some guards in file utils.	2013-07-26 14:19:20 +02:00
CCFileUtilsAndroid.h	Removes Hungarian notation	2013-07-25 15:53:24 -07:00
CCGL.h	issue #2129: Removing CC prefix for cocos2dx module.	2013-06-20 14:13:12 +08:00
CCImage.cpp	issue #2430:use upper letters for enum item in Image	2013-07-25 23:09:18 +08:00
CCPlatformDefine.h	Assert implementation for Android	2013-01-09 18:51:49 -08:00
CCStdC.h	Moved '#include <stdint.h>' to 'platform/ios(android,linux,blackberry)/CCStdC.h' since win32 don't have a stdint.h.	2012-08-29 14:49:02 -07:00