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
Ricardo Quesada a3eb0a058e Merge branch 'develop' into dictionary_array_fixes 
Conflicts:
	cocos2dx/platform/mac/CCFileUtilsMac.mm
	extensions/CCBReader/CCBAnimationManager.cpp
	extensions/CCBReader/CCBReader.cpp
	extensions/CCBReader/CCBSequenceProperty.cpp
	extensions/GUI/CCScrollView/CCScrollView.cpp
 		2013-08-21 20:27:19 -07:00
..
Simulation Re-adds 'CC' prefix to objective-c classes. 2013-06-20 17:46:22 -07:00
CCAccelerometer.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCAccelerometer.mm Re-adds 'CC' prefix to objective-c classes. 2013-06-20 17:46:22 -07:00
CCApplication.h Fixed more documentation errors. 2013-08-01 20:55:43 +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 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 #2430: Refactoring enum 'ResolutionPolicy'. 2013-07-26 18:18:58 +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
CCFileUtilsIOS.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCFileUtilsIOS.mm Merge branch 'develop' into dictionary_array_fixes 2013-08-21 20:27:19 -07: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
CCLock.cpp issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCLock.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08: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
CCThread.mm issue #2170: A typo fix. 2013-08-05 11:33:59 +08: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