axmol/cocos2dx/platform/mac
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
..
CCAccelerometer.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCApplication.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCApplication.mm Re-adds 'CC' prefix to objective-c classes. 2013-06-20 17:46:22 -07:00
CCCommon.mm Re-adds 'CC' prefix to objective-c classes. 2013-06-20 17:46:22 -07: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 issue #2129: Re-adds 'CC' prefix to objective-c classes for all projects. 2013-06-21 11:14:03 +08:00
CCEGLView.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCEGLView.mm issue #2129: Re-adds 'CC' prefix to objective-c classes for all projects. 2013-06-21 11:14:03 +08:00
CCEventDispatcher.h Re-adds 'CC' prefix to objective-c classes. 2013-06-20 17:46:22 -07:00
CCEventDispatcher.mm fixed issues on win32 and mac keyboard 2013-07-02 11:39:18 +02:00
CCFileUtilsMac.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCFileUtilsMac.mm issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCGL.h issue #2371: [Mac] glClearDepth --> glClearDepthf, glDepthRange --> glDepthRangef, glReleaseShaderCompiler --> NULL . 2013-07-04 16:31:50 +08:00
CCImage.mm Re-adds 'CC' prefix to objective-c classes. 2013-06-20 17:46:22 -07: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 issue #2129: Re-adds 'CC' prefix to objective-c classes for all projects. 2013-06-21 11:14:03 +08:00