Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/samples/Cpp/SimpleGame
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
..
Classes [dispatcher] Updating SimpleGame. 2013-09-12 22:12:58 +08:00
Resources add SimpleGame Marmalade config files 2013-01-03 15:20:58 +01:00
proj.android Add parameter in method cocos_android_app_init() to initialize plugin. 2013-09-02 16:10:08 +08:00
proj.emscripten Multi-resolution emscripten html template. 2013-08-05 09:24:47 +02:00
proj.ios issue #2800:Can not hide status bar on iOS 7 2013-09-13 15:54:58 +08:00
proj.linux issue #2460: change other sample projects to glfw version 2013-09-02 11:46:23 +08:00
proj.mac issue #2460: change other sample projects to glfw version 2013-09-02 11:46:23 +08:00
proj.nacl issue #2397: Application::sharedApplication --> Application::getInstance. 2013-07-15 16:24:42 +08:00
proj.qt5 closed #2517: Use LocalVarToAuto.py to change Samples src file 2013-08-16 16:05:27 +08:00
proj.tizen closed #2517: Use LocalVarToAuto.py to change Samples src file 2013-08-16 16:05:27 +08:00