Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos/platform/ios
History
andyque aef0f5e729 Merge branch 'v3' into mergeExtensionEditBox 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/ui/Android.mk
	cocos/ui/CMakeLists.txt
	cocos/ui/proj.win32/libui.vcxproj
	cocos/ui/proj.win32/libui.vcxproj.filters
	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.cpp
	tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters
 		2014-09-01 15:26:25 +08:00
..
CCApplication.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCApplication.mm Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCCommon.mm Add new line at the end of a file to *.mm 2014-06-19 20:48:50 +09:00
CCDevice.mm setKeepScreenOn method 2014-08-19 15:00:58 +04:00
CCDirectorCaller.h invalidate NSTimer instance in destroy to prevent memory leak 2014-05-28 15:19:07 +08:00
CCDirectorCaller.mm GLView Hook 2014-07-31 00:53:04 +08:00
CCEAGLView.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCEAGLView.mm merge extension EditBox to ui module 2014-08-19 10:28:24 +08:00
CCES2Renderer.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCES2Renderer.m Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCESRenderer.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCGL.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCGLViewImpl.h OpenGL context attributions setting revise -2 2014-08-22 16:22:16 +08:00
CCGLViewImpl.mm Merge pull request #7893 from slackmoehrle/glview_fix 2014-08-28 10:10:17 +08:00
CCImage.mm The filename should be converted to lower case before comparing. 2014-06-13 15:32:49 +08:00
CCPlatformDefine.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCStdC.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
OpenGL_Internal.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00