Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos2dx/platform/mac
History
James Chen dd7bfd7b60 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-event-dispatcher-rebase 
Conflicts:
	cocos2dx/CCDirector.h
	cocos2dx/keyboard_dispatcher/CCKeyboardDispatcher.h
	cocos2dx/keypad_dispatcher/CCKeypadDelegate.h
	cocos2dx/keypad_dispatcher/CCKeypadDispatcher.h
	cocos2dx/layers_scenes_transitions_nodes/CCLayer.h
	cocos2dx/menu_nodes/CCMenu.h
	cocos2dx/platform/CCAccelerometerDelegate.h
	cocos2dx/platform/android/CCAccelerometer.h
	cocos2dx/platform/ios/CCAccelerometer.h
	cocos2dx/platform/mac/CCAccelerometer.h
	cocos2dx/platform/win32/CCAccelerometer.h
	cocos2dx/script_support/CCScriptSupport.h
	cocos2dx/touch_dispatcher/CCTouchDelegateProtocol.h
	cocos2dx/touch_dispatcher/CCTouchDispatcher.h
	cocos2dx/touch_dispatcher/CCTouchHandler.h
	extensions/CocoStudio/Components/CCInputDelegate.h
 		2013-09-13 19:06:09 +08:00
..
CCAccelerometer.h issue #2784:Delete class destuctor js-binding and lua-binding document 2013-09-13 13:52:42 +08:00
CCApplication.h issue #2784:Add class constructor js-binding document 2013-09-13 16:46:31 +08:00
CCApplication.mm issue #2460: glfw mac version 2013-08-21 12:01:56 +08:00
CCCommon.mm More CCLog --> log. 2013-07-24 10:46:13 +08:00
CCDevice.mm [Dispatcher] New event dispatcher, first commit. 2013-09-11 22:09:34 +08:00
CCDirectorCaller.h Re-adds 'CC' prefix to objective-c classes. 2013-06-20 17:46:22 -07:00
CCDirectorCaller.mm Better destructors logs 2013-08-21 20:08:51 -07:00
CCEGLView.h issue #2784:Add class constructor js-binding document 2013-09-13 16:46:31 +08:00
CCEGLView.mm [Dispatcher] New event dispatcher, first commit. 2013-09-11 22:09:34 +08:00
CCEventDispatcher.h [Dispatcher] New event dispatcher, first commit. 2013-09-11 22:09:34 +08:00
CCEventDispatcher.mm [Dispatcher] New event dispatcher, first commit. 2013-09-11 22:09:34 +08:00
CCGL.h issue #2371: [Mac] glClearDepth --> glClearDepthf, glDepthRange --> glDepthRangef, glReleaseShaderCompiler --> NULL . 2013-07-04 16:31:50 +08:00
CCImage.mm Closed #2345 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345 2013-07-29 11:40:18 +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
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 Better destructors logs 2013-08-21 20:08:51 -07:00