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

688 Commits

Author SHA1 Message Date
James Chen 3f967e5e8d issue #2823: Removing some codes for debugging in ScriptingCore.h/.cpp. 2013-10-10 16:18:12 +08:00
James Chen 154061319c issue #2823: Removing unused js files in 'js/debugger' folder. 2013-10-10 16:18:12 +08:00
James Chen d8a4a7a595 issue #2823: Updating webconsole.js and loading webconsole.js in jsb_debugger.js.[ Console can't work now, TO BE DONE ] 2013-10-10 16:18:11 +08:00
James Chen d25cbcdbd9 issue #2823: Removing unused conversion. 2013-10-10 16:18:11 +08:00
James Chen 6b455463fa issue #2823: Removing some log outputs in transport.js. 2013-10-10 16:18:11 +08:00
James Chen 7328ae89a5 issue #2823: Adding XPCInspector support in debugger/main.js. 2013-10-10 16:18:11 +08:00
James Chen 7a6861c800 issue #2823: Reverting script.js. 2013-10-10 16:18:11 +08:00
James Chen 2e9644446a issue #2823: Renaming '_lockVM' to '_enterNestedEventLoop', '_unlockVM' to '_exitNestedEventLoop'. 2013-10-10 16:18:10 +08:00
James Chen adbb3585ac issue #2823: _lockVM take no arguments now. 2013-10-10 16:18:10 +08:00
James Chen a919fd5de1 issue #2823: Fix socket errors on WINDOWS. 2013-10-10 16:18:10 +08:00
James Chen 0ad7a9fd4b issue #2823: minor fix and logs. 2013-10-10 16:18:10 +08:00
James Chen 43b4269c11 issue #2823: Removing unused file 'main.debug.js'. 2013-10-10 16:18:09 +08:00
James Chen 6185f6fac2 issue #2823: Removing unused codes in jsb_debugger.js. 2013-10-10 16:18:09 +08:00
James Chen e69aebc34f issue #2823: Fixing mess code when modifying the value of variables which contains utf8 letters. 2013-10-10 16:18:09 +08:00
James Chen ef4fcb5e56 issue #2823: Moving 'utf16to8' to DevToolsUtils.js and adding 'utf8to16' function. 2013-10-10 16:18:09 +08:00
James Chen 7e82ab14a0 issue #2823: debugger loading js source with utf8 is ok. 2013-10-10 16:18:09 +08:00
James Chen b5d02d8cca issue #2823: firefox debugger step ok. 2013-10-10 16:18:09 +08:00
James Chen b5679cbc3a issue #2823: load js file in firefox. 2013-10-10 16:18:08 +08:00
James Chen d033411bbe issue #2823: comment some test codes. 2013-10-10 16:18:08 +08:00
James Chen c381e4ce50 issue #2823: firefox remote connection ok. 2013-10-10 16:18:08 +08:00
James Chen 16fec3386b Merge pull request #3902 from rablwupei/xmlhttprequest_leak 
fix XMLHTTPRequest.cpp memory leak
 2013-10-09 02:05:10 -07:00
rablwupei a4053c805f fix XMLHTTPRequest.cpp memory leak 2013-10-09 16:51:37 +08:00
rablwupei d51a04585c fix bug: sys.localStorage.getItem() do not support utf8 in jsb. 2013-10-09 16:48:05 +08:00
James Chen b54a75d47e Merge pull request #3891 from rablwupei/ccaction_array 
fixed #2733: add feature: cc.Sequence.create() and cc.Spawn.create() can pass Array actions
 2013-10-08 23:20:40 -07:00
minggo 55bbbf7ed4 Merge pull request #3892 from rablwupei/script_leak 
[ci skip]fix memory leak
 2013-10-08 19:13:44 -07:00
rablwupei dee3065dbe fix memory leak 2013-10-08 19:56:03 +08:00
rablwupei 98fc2e61d2 add feature: cc.Sequence.create() and cc.Spawn.create() can pass Array actions. 
eg: cc.Sequence.create([cc.Show.create(), cc.Delay.create(1),
cc.Hide.create()]);
 2013-10-08 19:50:24 +08:00
Dhilan007 20971b0ad2 issues #2895:Synchronize JSB from master to developer 2013-10-08 15:57:34 +08:00
minggo bcb171e3c9 fix line end in windows 2013-09-20 22:23:13 +08: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
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