Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos2dx/platform/ios
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
..
Simulation Re-adds 'CC' prefix to objective-c classes. 2013-06-20 17:46:22 -07:00
CCAccelerometer.h issue #2784:Add class constructor js-binding document 2013-09-13 16:46:31 +08:00
CCApplication.h issue #2784:Add class constructor js-binding document 2013-09-13 16:46:31 +08:00
CCApplication.mm Platform::LINUX --> Platform::OS_LINUX, Platform::ANDROID --> Platform::OS_ANDROID. ANDROID is defined by ndk. 2013-07-26 18:17:30 +08:00
CCCommon.mm Array & Dictionary fixes 2013-08-21 20:12:09 -07:00
CCDevice.mm [Dispatcher] Updating ios/CCDevice.mm. 2013-09-12 20:41:59 +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 #2784:Add js-binding and lua-binding document 2013-09-13 11:41:20 +08:00
CCEGLView.mm [EventDispatcher] Remove unused file(CCTouchDispatcher) reference in CCEGLView.mm. 2013-09-12 14:24:30 +08:00
CCES2Renderer.h issue #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' 2012-04-19 14:35:52 +08:00
CCES2Renderer.m Better destructors logs 2013-08-21 20:08:51 -07:00
CCESRenderer.h issue #1269:make tests HelloWorld HelloLua and testjs refer subproject cocos2dx 2012-06-19 13:50:11 +08:00
CCGL.h ios and mac projects unified in one simple xcode project 2013-07-02 18:20:38 -07:00
CCImage.mm Array & Dictionary fixes 2013-08-21 20:12:09 -07:00
CCPlatformDefine.h fixed some bugs 2012-05-30 15:42:29 +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
EAGLView.h issue #2129: Re-adds 'CC' prefix to objective-c classes for all projects. 2013-06-21 11:14:03 +08:00
EAGLView.mm issue #2397: EGLView::sharedOpenGLView() --> EGLView::getInstance() 2013-07-12 13:11:21 +08:00
OpenGL_Internal.h fixed #1180: synchronize CCConfiguration 2012-04-20 11:39:12 +08:00