Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/scripting/lua
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
..
cocos2dx_support Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-event-dispatcher-rebase 2013-09-13 19:06:09 +08:00
lua [NaCl] Remove missing functions from lua stdlib. 2013-06-20 12:56:15 -07:00
luajit issue #2371: Adding scripting/lua/luajit/mac/libluajit.a 2013-07-04 17:11:13 +08:00
proj.android issue #2433:Remove some functions and files in cocos2dx_support 2013-09-02 10:54:39 +08:00
proj.emscripten issue #2433:Remove some functions and files in cocos2dx_support 2013-09-02 10:54:39 +08:00
proj.ios issue #2325: Updating project configuration, tested on iPad 3. 2013-06-24 18:32:06 +08:00
proj.linux issue #2433:Remove some functions and files in cocos2dx_support 2013-09-02 10:54:39 +08:00
proj.nacl issue #2103 modify some compile setup 2013-06-03 18:14:06 +08:00
proj.qt5 issue #2433:Modify platform config and some test samples 2013-08-22 15:06:34 +08:00
proj.tizen [Tizen] Fix Debug Settings. 2013-08-06 01:26:56 +09:00
proj.win32 issue #2433:Remove some functions and files in cocos2dx_support 2013-09-02 10:54:39 +08:00
script issue #2764:Add TableView lua binding and releated test sample 2013-09-04 14:02:22 +08:00
tolua issue #2433:Modify platform config and some test samples 2013-08-30 11:56:35 +08:00