Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos2dx/platform/android
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
..
java issue #2433:Modify platform config and some test samples 2013-08-30 11:56:35 +08:00
jni remove unneeded files 2013-08-26 17:40:25 +08:00
Android.mk [Dispatcher] Updating Android.mk, and some refractor. 2013-09-12 17:31:37 +08:00
CCAccelerometer.h issue #2784:Add class constructor js-binding document 2013-09-13 16:46:31 +08:00
CCApplication.cpp ccx : setAnimationInterval() not implemented. 2013-08-05 02:05:39 -07:00
CCApplication.h issue #2784:Add class constructor js-binding document 2013-09-13 16:46:31 +08:00
CCCommon.cpp [Android] Fixing build errors for ndk-r9. 2013-07-29 14:54:00 +08:00
CCDevice.cpp [Dispatcher] Updating Android.mk, and some refractor. 2013-09-12 17:31:37 +08:00
CCEGLView.cpp [Dispatcher] Updating Android.mk, and some refractor. 2013-09-12 17:31:37 +08:00
CCEGLView.h issue #2784:Add class constructor js-binding document 2013-09-13 16:46:31 +08:00
CCFileUtilsAndroid.cpp Adds const in FileUtils 2013-09-06 22:52:55 -07:00
CCFileUtilsAndroid.h issue #2784:Delete class destuctor js-binding and lua-binding document 2013-09-13 13:52:42 +08:00
CCGL.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCImage.cpp Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345 2013-07-27 22:06:30 +08:00
CCPlatformDefine.h Assert implementation for Android 2013-01-09 18:51:49 -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
nativeactivity.cpp [Dispatcher] Updating Android.mk, and some refractor. 2013-09-12 17:31:37 +08:00
nativeactivity.h Accelerometer 2013-08-05 02:05:47 -07:00