Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/tools
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_mk_generator [dispatcher] Adding new EventDispatcher Test to Makefile and project. 2013-09-13 18:08:00 +08:00
bindings-generator@9d98b45fcd issue #2433:Modify ScriptHandlerMgr's enum to enum class and modify some related functions 2013-09-04 22:17:26 +08:00
closure-compiler improve obfuscate.py to be more reliable. 2013-04-06 22:00:52 +08:00
cocos2d-console@37a695d46c issue #2483: Updating cocos2d-console. 2013-08-07 18:06:31 +08:00
emscripten-templates Multi-resolution emscripten html template. 2013-08-05 09:24:47 +02:00
jenkins_scripts Updating genbindings.sh, cxx-generator ~> bindings-generator. 2013-04-09 11:03:39 +08:00
localvartoauto #closed #2434: refactor LocalVarToAuto.py to use the PathUtils and fix some errors 2013-08-22 13:40:57 +08:00
make-package closed #2446: Add a tool to auto export releasing zip file 2013-08-26 16:57:10 +08:00
project_creator Python2.x 3.x runnable 2013-08-28 11:53:18 +09:00
pylib #closed #2434: refactor LocalVarToAuto.py to use the PathUtils and fix some errors 2013-08-22 13:40:57 +08:00
tojs Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-event-dispatcher-rebase 2013-09-13 19:06:09 +08:00
tolua issue #2784:Add js-binding and lua-binding document 2013-09-13 11:41:20 +08:00
tolua++ issue #2345: edit linux command to link the libpng12-dev.lib instead of use ourselves. Move ccTexParams into CCTexture2D 2013-08-06 11:34:48 +08:00
travis-scripts issue #2460: script compile error 2013-08-30 10:29:59 +08:00
__init__.py add creating project script in root 2013-07-26 10:50:37 +08:00
android-buildsetup.sh Setup user environment for building Android port. 2013-03-15 16:44:09 -07:00
android-emulator-README.md Clearer description of command line options 2013-03-19 16:08:38 -07:00