Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos2dx/platform
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
..
android Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-event-dispatcher-rebase 2013-09-13 19:06:09 +08:00
apple issue #2784:Add class constructor js-binding document 2013-09-13 16:46:31 +08:00
emscripten Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-event-dispatcher-rebase 2013-09-13 19:06:09 +08:00
ios Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-event-dispatcher-rebase 2013-09-13 19:06:09 +08:00
linux Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-event-dispatcher-rebase 2013-09-13 19:06:09 +08:00
mac Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-event-dispatcher-rebase 2013-09-13 19:06:09 +08:00
nacl Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-event-dispatcher-rebase 2013-09-13 19:06:09 +08:00
qt5 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-event-dispatcher-rebase 2013-09-13 19:06:09 +08:00
third_party [develop] Warning fixes. 2013-09-08 11:26:38 +08:00
tizen Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-event-dispatcher-rebase 2013-09-13 19:06:09 +08:00
win32 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-event-dispatcher-rebase 2013-09-13 19:06:09 +08:00
CCAccelerometerDelegate.h issue #2784:Add js-binding and lua-binding document 2013-09-13 11:41:20 +08:00
CCApplicationProtocol.h issue #2784:Delete class destuctor js-binding and lua-binding document 2013-09-13 13:52:42 +08:00
CCCommon.h enum class for LanguageType, Application::Platform 2013-07-26 17:29:06 +08:00
CCDevice.h [Dispatcher] New event dispatcher, first commit. 2013-09-11 22:09:34 +08:00
CCEGLViewProtocol.cpp [dispatcher] Using temporary std::vector in handleTouchXXXX. 2013-09-12 20:43:09 +08:00
CCEGLViewProtocol.h Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-event-dispatcher-rebase 2013-09-13 19:06:09 +08:00
CCFileUtils.cpp Optimization + standardization in FileUtils 2013-09-06 22:54:08 -07:00
CCFileUtils.h issue #2784:Delete class destuctor js-binding and lua-binding document 2013-09-13 13:52:42 +08:00
CCImage.h issue #2784:Add class constructor js-binding document 2013-09-13 16:46:31 +08:00
CCImageCommon_cpp.h [develop] Warning fixes. 2013-09-08 11:26:38 +08:00
CCPlatformConfig.h Add new platform: CC_PLATFORM_QT5 2013-07-24 20:18:43 +02:00
CCPlatformMacros.h Merge pull request #3269 from metalbass/patch-4 2013-08-07 18:45:27 -07:00
CCSAXParser.cpp More best practices fixes and other bug fixes 2013-07-23 15:20:22 -07:00
CCSAXParser.h issue #2784:Add js-binding and lua-binding document 2013-09-13 11:41:20 +08:00
CCThread.cpp issue #2170: Fixing compilaction errors on Emscripten. 2013-08-05 11:10:12 +08:00
CCThread.h issue #2784:Add js-binding and lua-binding document 2013-09-13 11:41:20 +08:00