Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
12,281 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

1127 Commits

Author SHA1 Message Date
CocosRobot fd735f66b6 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-09-22 02:28:21 +00:00
minggo bcb171e3c9 fix line end in windows 2013-09-20 22:23:13 +08:00
CocosRobot 1d005642ff [AUTO] : updating submodule reference to latest autogenerated bindings 2013-09-20 12:41:13 +00:00
minggo 2549804dec fix compiling errors 2013-09-20 20:09:39 +08:00
James Chen a460f44a1a Making cc.registerTargetDelegate and cc.registerStandardDelegate compatible with Cocos2d-html5. 2013-09-19 23:43:41 +08:00
samuele3hu 64c5e183ce Add setKeypadEnabled and isKeypadEnabled deprecated functions 2013-09-18 14:49:19 +08:00
CocosRobot 8c1bdd900b [AUTO] : updating submodule reference to latest autogenerated bindings 2013-09-18 01:39:57 +00:00
minggo b91b350f2b Merge pull request #3666 from Dhilan007/develop 
android platform:fix EditBox not show input box and crash.
 2013-09-17 18:33:43 -07:00
minggo 95bdfcd84d Merge pull request #3668 from CocosRobot/updategeneratedsubmodule_1379432233 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-09-17 08:41:13 -07:00
CocosRobot eb88e8e365 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-09-17 15:37:17 +00:00
James Chen f403f7d683 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into keyboard_test 
Conflicts:
	samples/samples.xcodeproj/project.pbxproj
 2013-09-17 23:24:14 +08:00
James Chen e563c27994 Keypad event fix for js and lua bindings. 2013-09-17 23:21:45 +08:00
minggo c2e53d5673 Merge pull request #3665 from minggo/merge-physics 
Merge physics
 2013-09-17 08:18:55 -07:00
Dhilan007 3a283839bb Merge https://github.com/cocos2d/cocos2d-x into develop 2013-09-17 23:06:04 +08:00
James Chen b3dfa0f886 [jsb] Marks cc.Menu.setHanlderPriority as deprecated method. Bug fix in JSTouchDelegate class. 2013-09-17 20:33:25 +08:00
minggo ba820790ec Merge https://github.com/cocos2d/cocos2d-x into merge-physics 2013-09-17 20:06:33 +08:00
Dhilan007 087271b455 Merge branch 'develop' of github.com:cocos2d/cocos2d-x into develop 2013-09-17 19:26:53 +08:00
CocosRobot 55b252200d [AUTO] : updating submodule reference to latest autogenerated bindings 2013-09-17 10:50:55 +00:00
minggo d488796896 Merge branch 'iss2771_physical' of https://github.com/boyu0/cocos2d-x into merge-physics 2013-09-17 18:14:12 +08:00
Dhilan007 a39e0d8521 Merge branch 'develop' of github.com:cocos2d/cocos2d-x into develop 2013-09-17 18:06:48 +08:00
James Chen 236402b620 Merge pull request #3650 from samuele3hu/developTest 
Manual bind the getDescendants function of the SpriteBatchNode class
 2013-09-17 02:57:47 -07:00
samuele3hu 068d0140d9 Manual bind the getDescendants function of the SpriteBatchNode class 2013-09-17 17:41:53 +08:00
CocosRobot c0a0dc580a [AUTO] : updating submodule reference to latest autogenerated bindings 2013-09-17 09:40:09 +00:00
Dhilan007 18cea20634 Merge branch 'develop' of github.com:cocos2d/cocos2d-x into develop 2013-09-17 17:14:20 +08:00
Dhilan007 5d8ea9f1e5 JSB:manually bind SpriteBatchNode::getDescendants in "cocos2d_specifics.cpp". 2013-09-17 17:03:45 +08:00
boyu0 270bd997cc Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-09-17 14:46:36 +08:00
samuele3hu d43709446a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTest 2013-09-17 14:00:31 +08:00
Dhilan007 db169c6d91 Add setTouchPriority empty implementation for CCLayer. 2013-09-17 13:04:28 +08:00
samuele3hu 5339603bdb Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTest 2013-09-17 13:00:46 +08:00
samuele3hu 40ed7bc326 Add a deprecated function 2013-09-17 12:59:38 +08:00
boyu0 9f7bf4349c Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-09-17 11:19:47 +08:00
boyu0 54f7146d5f issue #2771: update vs project setting 2013-09-17 11:18:53 +08:00
boyu0 481ad7ef12 issue #2771: update project setting 2013-09-17 10:41:08 +08:00
CocosRobot 6de18229e2 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-09-16 15:04:01 +00:00
James Chen b128018f76 Merge branch 'suppressed-C4996' of https://github.com/savdalion/cocos2d-x into savdalion-suppressed-C4996 
Conflicts:
	extensions/CocoStudio/Armature/external_tool/GLES-Render.cpp
	samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
 2013-09-16 20:58:26 +08:00
signmotion 5dffb1b44e Deprecated methods are replaced (warning MSVC C4996 is suppressed). 2013-09-16 15:38:03 +03:00
CocosRobot f607d6d248 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-09-16 08:58:07 +00:00
CocosRobot 32abea024d [AUTO] : updating submodule reference to latest autogenerated bindings 2013-09-16 06:05:30 +00:00
minggo f47ce3f5bc Merge pull request #3607 from samuele3hu/developTest 
Reset the addChild functions of SpriteBatchNode and add some lua deprecated functions
 2013-09-15 22:45:32 -07:00
CocosRobot f01fb83e26 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-09-16 03:19:19 +00:00
minggo 81a26d44f6 Merge pull request #3596 from dumganhar/new-event-dispatcher-rename 
[New Event Dispatcher] Using rename registerEventListener to addEventListener, unregisterEventListener to removeEventListener.
 2013-09-15 20:13:51 -07:00
samuele3hu ddf28deaad Delete some end lines 2013-09-16 10:58:02 +08:00
samuele3hu faed7a3d36 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTest 2013-09-16 10:54:55 +08:00
samuele3hu a3a915ead2 Reset the addChild functions of SpriteBatchNode and add some lua deprecated functions 2013-09-16 10:54:12 +08:00
samuele3hu 85ca0136f0 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Bridge 2013-09-14 19:53:08 +08:00
James Chen 997a5a36c1 [dispatcher] Renaming 'registerEventListenerXXX' to 'addEventListenerXXX'. 2013-09-14 09:02:49 +08:00
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
CocosRobot 585f3b081e [AUTO] : updating submodule reference to latest autogenerated bindings 2013-09-13 10:30:50 +00:00
samuele3hu 3a334b7478 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into doxygen 2013-09-13 11:42:04 +08:00
samuele3hu a34ec99014 issue #2784:Add js-binding and lua-binding document 2013-09-13 11:41:20 +08:00