Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/samples/Lua/TestLua
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 closed #2517: Use LocalVarToAuto.py to change Samples src file 2013-08-16 16:05:27 +08:00
Resources [Dispatcher] New event dispatcher, first commit. 2013-09-11 22:09:34 +08:00
proj.android Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into TableView 2013-09-04 14:03:21 +08:00
proj.emscripten closed #2517: Use LocalVarToAuto.py to change Samples src file 2013-08-16 16:05:27 +08:00
proj.ios issue #2800:Can not hide status bar on iOS 7 2013-09-13 16:07:02 +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.tizen closed #2517: Use LocalVarToAuto.py to change Samples src file 2013-08-16 16:05:27 +08:00
proj.win32 Merge pull request #3503 from dabingnn/Iss2460-glfw-refractor 2013-09-05 18:28:31 -07:00
.gitignore issue #2103 add cocosbuilder lua test sample 2013-06-05 15:17:00 +08:00