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

624 Commits

Author SHA1 Message Date
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
James Chen e563c27994 Keypad event fix for js and lua bindings. 2013-09-17 23:21:45 +08: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
Dhilan007 5d8ea9f1e5 JSB:manually bind SpriteBatchNode::getDescendants in "cocos2d_specifics.cpp". 2013-09-17 17:03:45 +08:00
Dhilan007 db169c6d91 Add setTouchPriority empty implementation for CCLayer. 2013-09-17 13:04:28 +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
samuele3hu a34ec99014 issue #2784:Add js-binding and lua-binding document 2013-09-13 11:41:20 +08:00
James Chen b77cac8731 [Dispatcher] Fixing touch bindings for JSB. 2013-09-12 16:02:16 +08:00
James Chen 00c0b94d65 closed #2766: Memory leak in the binding glue code of cc.FileUtils.getStringFromFile(getByteArrayFromFile). 2013-09-04 16:38:07 +08:00
James Chen 3959cb0d3c Merge pull request #3474 from xbruce/develop 
closed #2746: cc.registerTargettedDelegate doesn't support pure js object as its target.
 2013-08-28 02:29:09 -07:00
James Chen a7f4e82799 issue #2732: Adding 'scripting/auto-generated/js(lua)-bindings' to search path of include files. 2013-08-27 16:46:31 +08:00
James Chen e76e316063 issue #2732: [Win32] Updating project configuration for libJSBinding.vcxproj and liblua.vcxproj. 2013-08-27 16:30:56 +08:00
James Chen 220d4b7d8a issue #2732: Updating scripting/javascript/bindings/Android.mk and scripting/lua/proj.android/Android.mk. 2013-08-27 16:21:06 +08:00
James Chen 7552a72577 issue #2732: [iOS] Updating the reference of auto-generated binding glue codes. 2013-08-27 16:05:48 +08:00
James Chen c2099f5d3e issue #2732: Moving 'scripting/javascript/bindings/generated' to 'scripting/auto-generated'. 2013-08-27 14:50:53 +08:00
xbruce cfc5a7f669 Update cocos2d_specifics.cpp 
add need unroot
 2013-08-23 18:22:58 +08:00
xbruce 8076d568ba Update cocos2d_specifics.hpp 
add need unroot
 2013-08-23 18:20:31 +08:00
CocosRobot 8345d4849d [AUTO] : updating submodule reference to latest autogenerated bindings 2013-08-23 08:04:38 +00:00
CocosRobot 4658674175 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-08-23 03:40:19 +00:00
James Chen ca78d2d129 closed #2650: Remove ccTypeInfo since we could get the hash value from *typeid(T).hash_code()* if using c++11. 2013-08-22 18:16:50 +08:00
minggo d9da52ce86 Merge pull request #3454 from minggo/array-support-sort 
Array can be use in stl::sort() when not using vector inside
 2013-08-21 20:50:03 -07:00
minggo 2de8963a0a fix warnings caused by deprecating some functions of Array 2013-08-22 10:45:47 +08:00
James Chen 1ee7790f0e Initializing Array after it was constructed. 2013-08-22 10:15:47 +08:00
James Chen 5a393994cd [Best C++ practice] ResponseType is enum class now. Renaming properties in MinXmlHttpRequest class. 2013-08-20 18:35:15 +08:00
James Chen 5407719f44 closed #2586: The utf8 response in XmlHttpRequest are mess codes. 2013-08-20 17:50:43 +08:00
CocosRobot 1107974892 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-08-15 14:23:52 +00:00
CocosRobot 79ced6ba3a [AUTO] : updating submodule reference to latest autogenerated bindings 2013-08-15 11:25:15 +00:00
James Chen 9dbd74d2a8 Merge pull request #3413 from dumganhar/iss2521-js-ccb-owner 
Adding more ExtensionTest like CocosBuilderTest and ControlButtonTest and bug fix in CCBReader.
 2013-08-15 04:19:17 -07:00
James Chen 05534e87f4 closed #2521: Updating jsb_cocosbuilder.js, it supports CCControl now. 2013-08-12 11:27:09 +08:00
James Chen 1af0db12f6 issue #2521: Reporting an error when the callback function is undefined in 'js_cocos2dx_setCallback'. 2013-08-12 11:24:08 +08:00
James Chen f0e0b7600b issue #2521: Adding 'cc.convertColor3BtoHexString' in jsb_cocos2d.js. 2013-08-12 11:22:15 +08:00
minggo fd7d892847 Merge pull request #3403 from dumganhar/iss1690-bind-cccontrol 
closed #1690: Exposing 'cc.Control. addTargetWithActionForControlEvents' and 'cc.Control.removeTargetWithActionForControlEvents' to JS.
 2013-08-09 00:31:52 -07:00
James Chen 28789d674d issue #1690: [C++ Best Practice] Adding space in for loop. 2013-08-09 15:31:20 +08:00
James Chen 299562e3be issue #1690: Initializing member variables for JSB_ControlButtonTarget. 2013-08-09 15:08:12 +08:00
James Chen 10948fcef0 issue #1690: [C++ Best Practice] '{' in new line. 2013-08-09 15:00:06 +08:00
James Chen fd3843c4e0 issue #1690: [C++ Best Practice]Adding a space after 'if'. 2013-08-09 14:49:39 +08:00
James Chen f527387b1e closed #1690: Exposing 'cc.Control. addTargetWithActionForControlEvents' and 'cc.Control.removeTargetWithActionForControlEvents' to JS. 2013-08-09 10:58:25 +08:00
James Chen 9ce4388214 Merge branch 'iss1690-cccontorl-js' into iss1690-bind-cccontrol 2013-08-08 14:27:24 +08:00
CocosRobot 6f84509261 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-08-08 03:02:27 +00:00
CocosRobot 89b3e7e193 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-08-08 01:44:58 +00:00
James Chen 7910581654 Merge pull request #3388 from dumganhar/iss2483-sp-v23 
closed 2483: Upgrading spidermonkey library to v23.
 2013-08-07 18:39:40 -07:00
CocosRobot 98aae97de3 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-08-07 06:33:44 +00:00
boyu0 ffd821ee13 issue #2345: update generated index 2013-08-07 13:48:12 +08:00
boyu0 ec6343a9b8 fix js and linux compile error 2013-08-07 10:34:30 +08:00
James Chen 6fdd95e3aa issue #2483: The callback type of 'delete' property has been changed from 'JS_PropertyStub' to 'JS_DeletePropertyStub' in v23. 2013-08-07 10:29:12 +08:00
CocosRobot a53a388005 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-08-05 05:44:27 +00:00
James Chen 5ee6e7d79a Merge branch 'develop' into carlomorgantinizynga-new_develop_merge 
Conflicts:
	cocos2dx/Android.mk
 2013-08-05 10:09:15 +08:00
James Chen 78ad7bcb48 ControlEvent --> Control::EventType. 2013-08-05 10:03:02 +08:00