axmol/cocos2dx/platform
James Chen a67ac821f7 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2371-add-lua-ios-mac
Conflicts:
	scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2013-07-04 17:15:09 +08:00
..
android - Fixing shadows for text with stroke in iOS 2013-07-02 22:45:07 +01:00
blackberry issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
emscripten Fixing compilation errors for Emscripten port. 2013-06-24 10:21:36 +08:00
ios Merge branch 'develop' into ios_mac_one_project 2013-07-03 11:39:00 -07:00
linux closed #2347: Macros like CC_KEYBOARD_SUPPORT should not be in header file. 2013-07-01 16:48:42 +08:00
mac Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2371-add-lua-ios-mac 2013-07-04 17:15:09 +08:00
marmalade issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
nacl [NaCl] Don't cache font size 2013-06-20 12:56:13 -07:00
third_party issue #2305: [Win32] Removing the third party library pthreadVCE2. 2013-06-26 12:52:38 +08:00
tizen Fix compile error. 2013-06-20 19:20:27 +09:00
win32 KEYBOARD_SUPPORT renamed to CC_KEYBOARD_SUPPORT 2013-07-03 15:51:24 +02:00
CCAccelerometerDelegate.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCApplicationProtocol.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCCommon.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCDevice.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCEGLViewProtocol.cpp issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCEGLViewProtocol.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCFileUtils.cpp issue #2371: std::vector<std::string>::iterator --> auto in CCFileUtils.cpp. 2013-07-04 16:30:35 +08:00
CCFileUtils.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCImage.h issue #2329: remove unneeded codes 2013-06-26 16:42:11 +08:00
CCImageCommonWebp.cpp issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCImageCommon_cpp.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCPlatformConfig.h Adding defines and enums for Tizen. 2013-05-16 19:49:16 +09:00
CCPlatformMacros.h Adds const to getters 2013-07-03 17:22:15 -07:00
CCSAXParser.cpp issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCSAXParser.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCThread.cpp issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCThread.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
platform.cpp issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
platform.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00