axmol/cocos2dx/platform/mac
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
..
CCAccelerometer.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCApplication.h enum class for LanguageType, Application::Platform 2013-07-26 17:29:06 +08:00
CCApplication.mm Application::Platform::OS_MACOS --> Application::Platform::OS_MAC. 2013-07-26 20:24:33 +08:00
CCCommon.mm More CCLog --> log. 2013-07-24 10:46:13 +08:00
CCDevice.mm issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCDirectorCaller.h Re-adds 'CC' prefix to objective-c classes. 2013-06-20 17:46:22 -07:00
CCDirectorCaller.mm getInstance() / destroyInstance() are used... 2013-07-11 15:24:23 -07:00
CCEGLView.h issue #2397: EGLView::sharedOpenGLView() --> EGLView::getInstance() 2013-07-12 13:11:21 +08:00
CCEGLView.mm issue #2397: EGLView::sharedOpenGLView() --> EGLView::getInstance() 2013-07-12 13:11:21 +08:00
CCEventDispatcher.h Re-adds 'CC' prefix to objective-c classes. 2013-06-20 17:46:22 -07:00
CCEventDispatcher.mm getInstance() / destroyInstance() are used... 2013-07-11 15:24:23 -07:00
CCFileUtilsMac.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCFileUtilsMac.mm Added some guards in file utils. 2013-07-26 14:19:20 +02:00
CCGL.h issue #2371: [Mac] glClearDepth --> glClearDepthf, glDepthRange --> glDepthRangef, glReleaseShaderCompiler --> NULL . 2013-07-04 16:31:50 +08:00
CCImage.mm fix warnings 2013-07-26 15:22:45 +08:00
CCPlatformDefine.h [Mac] fix CC_ASSERT error 2012-09-04 11:16:59 +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
CCThread.mm issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCWindow.h Re-adds 'CC' prefix to objective-c classes. 2013-06-20 17:46:22 -07:00
CCWindow.m Re-adds 'CC' prefix to objective-c classes. 2013-06-20 17:46:22 -07:00
EAGLView.h Re-adds 'CC' prefix to objective-c classes. 2013-06-20 17:46:22 -07:00
EAGLView.mm closed #2393: fix conflicts 2013-07-12 18:04:32 +08:00