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

2641 Commits

Author SHA1 Message Date
James Chen 79e7d218cb Updates Android.mk 2014-02-14 10:37:50 +08:00
James Chen 2078f6de57 Updates CMakeLists. 2014-02-14 10:34:28 +08:00
James Chen acefa4e237 Merge commit 'refs/pull/5343/head' of git://github.com/cocos2d/cocos2d-x into merge5343 2014-02-14 09:33:42 +08:00
CocosRobot 498a5e5b47 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-02-14 01:29:48 +00:00
xingsenma 4eecc7e56b #3947 Simulate 'setTimeout' and 'setInterval' in JSB. 2014-02-13 13:54:05 +08:00
ucchen 2c961bdfbf add spine manual binding; 2014-02-13 11:01:54 +08:00
Éloi Rivard 8adca38efa Linux javascript bindings support. 
- Adds Linux javascript test.
- Adds Linux javascript template.
- Adds Travis CI test.
 2014-02-13 01:42:14 +01:00
chuanweizhang2013 d5aee5eb04 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into jsruntime 2014-02-11 18:08:14 +08:00
CocosRobot 29bae34bc3 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-02-11 06:34:17 +00:00
chuanweizhang2013 e9dd3d828a issue #3498: commit jsruntime 2014-02-10 18:15:30 +08:00
samuele3hu 67a48c2a85 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developDynamic 2014-02-10 17:41:06 +08:00
samuele3hu ba73217667 issue #3956:Add the conversional functions which are used in the templates of lua binding-generator 2014-02-10 15:03:53 +08:00
CocosRobot 12b5fba628 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-02-10 06:42:10 +00:00
James Chen 51ba0cbb17 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into merge5268 2014-02-10 14:09:57 +08:00
CocosRobot 4f54b36127 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-02-10 05:58:44 +00:00
James Chen a05cd6fbb2 Compilation error fix after merging https://github.com/cocos2d/cocos2d-x/pull/5311 2014-02-10 12:53:08 +08:00
James Chen 99c20c4e30 Merge commit 'refs/pull/5268/head' of git://github.com/cocos2d/cocos2d-x into merge5268 
Conflicts:
	tests/test-javascript/tests
 2014-02-10 11:38:56 +08:00
Ricardo Quesada 1c4321304c Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into gl_vertices 2014-02-09 19:01:55 -08:00
Ricardo Quesada ceba63db8b Merge branch 'develop' into fast_tmx 2014-02-08 09:08:33 -08:00
hbb f5d4dd4afe remove the redundant check 
ccbreader can load file without the owner setting
 2014-02-08 19:12:33 +08:00
CocosRobot c775681767 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-02-08 06:09:04 +00:00
James Chen 5163f1f78d issue #3900: Updates debugger codes to Firefox v27. 'step into' works now. congratulations! ;) 2014-02-08 10:35:03 +08:00
Ricardo Quesada 616feadda1 More fixes and "tiles" is an uint32 (GID) 2014-02-07 18:11:17 -08:00
James Chen 6cc22ac0b0 issue #3900: Fixes wrong include. 2014-02-07 17:26:28 +08:00
James Chen f0418a17d3 issue #3900: Include fix. jsapi.h and jsfriendapi.h should be included before cocos2d.h, otherwise it will cause char16_t redefinition on windows. 2014-02-07 17:04:44 +08:00
James Chen c25787e575 issue #3900: Removes the definition of DEBUG. Windows uses _DEBUG . 2014-02-07 16:01:57 +08:00
James Chen 03292f44e2 issue #3900: TestJavascript could run on Mac platform with spidermonkey v27. 2014-02-07 13:09:38 +08:00
James Chen e4366e3e00 issue #3900: JSBool -> bool, JS_TRUE -> true, JS_FALSE -> false. 2014-02-07 11:16:13 +08:00
James Chen 408c3fdda9 issue #3900: JSBool -> bool, JS_TRUE -> true, JS_FALSE -> false. 2014-02-07 11:15:05 +08:00
CocosRobot 3198bd85ef [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-31 03:37:29 +00:00
boyu0 a5863aafb3 closed #3716: edit lua support 2014-01-28 17:06:37 +08:00
CocosRobot a2fc1cf970 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-27 09:50:08 +00:00
samuele3hu 46ce35c0bd fix:Resolve the compile error of the cast_type on vs 2014-01-26 22:30:26 +08:00
samuele3hu d3824c9592 issue #3863:Rename the lua binding of the `registerScriptHandler` and `unregisterScriptHandler` of the SkeletonAnimation 2014-01-26 22:27:37 +08:00
samuele3hu d2cc2d4065 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBug 2014-01-26 17:22:49 +08:00
samuele3hu 2d66419394 close #3802: Add the createWithTTF(text, ...) lua binding to support 3.0beta0 2014-01-26 17:21:36 +08:00
CocosRobot 8fa44baa2e [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-26 09:12:47 +00:00
James Chen 351ac4a5d7 [LUA] Adds missing cc prefix for lua classes. 2014-01-26 17:05:35 +08:00
James Chen a4a010465c Merge commit 'refs/pull/5071/head' of git://github.com/cocos2d/cocos2d-x into merge5071 2014-01-26 16:41:35 +08:00
CocosRobot 4862bbbd86 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-26 08:30:04 +00:00
samuele3hu cf684bc3f4 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBug 2014-01-26 15:16:02 +08:00
CocosRobot 8260a2a5c1 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-26 06:56:11 +00:00
James Chen d2893c1e1e Merge pull request #5229 from dumganhar/iss3858-jsclass-log-fix 
closed #3858: Pure JS class which is inherited from cc.Class will trigger an irrelevant log.
 2014-01-25 22:46:56 -08:00
James Chen 6ecc8d37c5 Fix a typo, this._is_nativeObj -> this.__nativeObj. 2014-01-26 14:45:45 +08:00
James Chen 26125f4e26 closed #3858: Pure JS class which is inherited from cc.Class will trigger an irrelevant log. 
Please refer to http://www.cocos2d-x.org/issues/3858.
 2014-01-26 14:41:27 +08:00
James Chen 6f45d9ca27 Merge pull request #5227 from dumganhar/iss3856-remote-debug-crash-mac 
closed #3856: Crash when Firefox connects to JSB application.
 2014-01-25 21:55:34 -08:00
James Chen 04f2cc48a2 closed #3856: Crash when Firefox connects to JSB application. 2014-01-26 13:54:48 +08:00
minggo b7d5d430a4 Merge pull request #5225 from dumganhar/iss3853-jsb-crash-debug-mode 
closed #3853: Some JSB projects(TestJavascript, WatermelonWithMe) crash in DEBUG mode on iOS platform.
 2014-01-25 20:37:31 -08:00
boyu0 682a6819cb issue #3401: change getContactData function return value back to pointer. 2014-01-26 12:02:42 +08:00
samuele3hu 48498f726e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBug 
Conflicts:
	cocos/scripting/lua/bindings/CCLuaStack.cpp
 2014-01-26 11:59:54 +08:00
James Chen 5b9f1697d3 closed #3853: Some JSB projects(TestJavascript, WatermelonWithMe) crash in DEBUG mode on iOS platform. Don’t define `DEBUG` macro in our projects since all third party libraries(e.g. Spidermonkey) were built in RELEASE mode. 2014-01-26 11:16:25 +08:00
Dhilan007 c7e9cee835 updated vs project[Lua]: 
1.add files of socket
2.fixed miss include path
3.fixed miss lib for release
 2014-01-26 10:25:49 +08:00
samuele3hu 7a8ecb108c issue #3837:Add the debug support for Mac 2014-01-26 09:42:07 +08:00
minggo cdae60b6c8 Merge pull request #5212 from samuele3hu/developBug 
Add luasocket's support for lua
 2014-01-24 02:00:15 -08:00
CocosRobot 8c3af04b72 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-24 09:48:11 +00:00
samuele3hu e2325924e4 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBug 2014-01-24 17:24:46 +08:00
samuele3hu 58eab72d26 issue:Add luasocket's support for lua 2014-01-24 17:24:10 +08:00
CocosRobot e19c6e2caa [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-24 07:38:34 +00:00
samuele3hu 402d0cf7b1 issue #3822:Update the test cases which are related with touch using the `EventListenerTouchAllAtOnce` or `EventListenerTouchOneByOne` 2014-01-23 22:26:14 +08:00
samuele3hu a91d9161c7 issue #3822:Update the KeypadTest using the new event-dispatcher 2014-01-23 16:17:24 +08:00
CocosRobot 5edc28c849 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-23 05:58:35 +00:00
CocosRobot b0c828b471 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-23 03:56:45 +00:00
pandamicro 913360e526 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-01-22 22:32:44 +08:00
pandamicro d6df71cc11 Fixed #3806: Change parameters to const & 2014-01-22 22:31:26 +08:00
CocosRobot e900504e8b [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-22 10:03:04 +00:00
James Chen 1b89a058fa Merge pull request #5160 from samuele3hu/developBugFix 
fix:Update the some test cases for lua
 2014-01-22 01:21:50 -08:00
samuele3hu e1476c8d60 fix:Replace cc.TextureCache:getInstance() —> cc.Director:getInstance():getTextureCache() 2014-01-22 17:09:33 +08:00
CocosRobot f9615d891e [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-22 08:57:36 +00:00
samuele3hu e848167b25 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBugFix 2014-01-22 15:44:33 +08:00
samuele3hu c4d2f1d83c fix:Add the deprecated function for the “dumpCachedTextureInfo” and update the related test case 2014-01-22 15:41:46 +08:00
CocosRobot 97b473731d [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-22 04:20:57 +00:00
CocosRobot 4efb5bd686 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-22 03:41:19 +00:00
pandamicro 3de7ed93f9 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 
Conflicts:
	cocos/scripting/javascript/bindings/cocos2d_specifics.cpp
 2014-01-21 18:18:32 +08:00
pandamicro a467fe3244 Fixed #3806: SAXParser supported with manual binding in JSB 2014-01-21 18:12:12 +08:00
samuele3hu 77b5d4c772 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBugFix 2014-01-21 17:52:13 +08:00
samuele3hu 2338d773dc fix:Add the “setZOrder” and “getZOrder” deprecated functions of the Node class in the lua’s script and update the related test cases 2014-01-21 17:51:49 +08:00
samuele3hu 88be8606b9 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developPerf 2014-01-21 16:46:28 +08:00
samuele3hu da8e208f47 close #3802: Add some manual lua-binding functions for the Lable and update the related test cases 2014-01-21 16:36:29 +08:00
Dhilan007 b8adba4c64 fix crash cause by string(null). 2014-01-21 11:59:43 +08:00
James Chen e5f723774d Updates jsbindings and localStorage. 2014-01-20 22:45:40 +08:00
CocosRobot 47c8243812 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-18 19:53:43 +00:00
edwardzhou 86e102ab16 fix namespace in spine lua manual binding 2014-01-18 10:58:17 +08:00
James Chen 3c74044929 Merge pull request #5117 from samuele3hu/test-rebase 
close #3626:Add the “override “ keyword
 2014-01-17 18:49:33 -08:00
samuele3hu 9d040ff09c Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into test-rebase 2014-01-17 22:23:57 +08:00
samuele3hu 85539e7548 issue #3626:Add the “override “ keyword 2014-01-17 22:20:21 +08:00
CocosRobot d485ade977 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-17 14:14:30 +00:00
James Chen 8eca8e25cb Merge pull request #5099 from samuele3hu/test-rebase 
close #3626:Make lua bindings-generator support the namespace binding
 2014-01-17 06:07:45 -08:00
CocosRobot 0c777b0d85 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-17 06:11:22 +00:00
Ricardo Quesada d0dbf34319 removes "include "cocos2d.h" from cocos2d files 2014-01-16 21:35:58 -08:00
samuele3hu cf857aade2 issue #3626:Modify some files that skipped some modifications because of merge 2014-01-17 11:22:03 +08:00
samuele3hu d086f7a259 issue #3626:Add the deprecated support for the tolua.cast 2014-01-17 10:19:57 +08:00
samuele3hu 31339d10e5 issue #3626:Add the deprecated support for the WebSocket and the XMLHttpRequest in the script 2014-01-17 10:19:57 +08:00
samuele3hu d49e28610b issue #3626:Resolve the error that the lua binding of the EventListenerAcceleration and the EventListenerCustom have been bound two times 2014-01-17 10:19:56 +08:00
samuele3hu 35d031ea06 issue #3626:Make the lua binding of the WebSocket and the XMLHttpRequest used in lua in the “cc” module 2014-01-17 10:19:56 +08:00
samuele3hu de698aaea7 issue #3626:Add lua binding for ScollView and TableView classes in the cocos2d::extension namespace and the related test cases 2014-01-17 10:19:55 +08:00
samuele3hu 811aa69d39 issue #3626:Add namespace’s support for manual lua binding functions for classes related OpenGL and update the related test cases 2014-01-17 10:19:55 +08:00
samuele3hu fdac224a7b issue #3626:Add namespace’s support for manual lua binding functions for classes in the cocostudio and cocos2d::gui namespace 2014-01-17 10:19:55 +08:00
samuele3hu 510fce7b12 issue #3626:Add namespace’s support for manual lua binding of functions about physics 2014-01-17 10:19:55 +08:00
samuele3hu b72f309076 issue #3626:Add namespace’s support for manual lua binding of classes in the cocos2d::extension and cocosbuilder namespace and update the related test cases 2014-01-17 10:19:54 +08:00
CocosRobot beb7015d7e [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-16 02:43:13 +00:00
James Chen 2e7516c582 Merge pull request #5041 from Dhilan007/develop_label 
closed #3630:Uses a struct of TTF configuration for Label::createWithTTF  to reduce parameters and make this interface more easily to use.
 2014-01-15 18:37:40 -08:00
Dhilan007 68eddf3cd7 fix compiling error 2014-01-15 17:29:07 +08:00
boyu0 a5c26b7da9 issue #3401: add physics action and pump test for lua. 2014-01-15 13:52:24 +08:00
CocosRobot 3b208337fe [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-15 02:39:20 +00:00
CocosRobot 82797d8434 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-15 01:37:15 +00:00
boyu0 de30a9cfea issue #3401: add lua physics slide test, add more banding code, and fix some bugs. 2014-01-14 15:48:44 +08:00
CocosRobot c49aa1f125 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-13 23:07:44 +00:00
Dhilan007 69c004108b issue#3630:Adjust some method for more easily create and change type. 2014-01-11 22:33:07 +08:00
CocosRobot b10783972f [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-11 04:39:03 +00:00
CocosRobot f76fcf7f2a [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-11 04:06:53 +00:00
Ricardo Quesada c88f81481b JSB compiles OK 2014-01-10 19:22:04 -08:00
CocosRobot 8b350cb20a [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-10 03:14:18 +00:00
James Chen 2ce23dca2a Merge pull request #5015 from samuele3hu/developNewUI 
closed #3643:Lua websocket can't receive more than 64 bytes of data
 2014-01-09 02:12:49 -08:00
samuele3hu 2cbe502113 issue #3643:Lua websocket can't receive more than 64 bytes of data 2014-01-09 17:23:22 +08:00
CocosRobot c60681c556 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-09 09:17:11 +00:00
CocosRobot ce0b86e7fe [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-09 06:56:48 +00:00
CocosRobot 2945322b97 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-09 04:50:38 +00:00
CocosRobot 746a360176 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-09 03:37:44 +00:00
CocosRobot e66468025d [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-09 02:59:53 +00:00
minggo 6529380b77 Merge pull request #4988 from dumganhar/develop 
If this.ctor was not found, output a log.
 2014-01-07 06:41:53 -08:00
James Chen 65b5a7c031 If this.ctor was not found, output a log. 2014-01-07 22:39:14 +08:00
James Chen 20f2f7255e Merge pull request #4986 from CocosRobot/updategeneratedsubmodule_1389104844 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-07 06:28:04 -08:00
CocosRobot a650ddf88b [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-07 14:27:34 +00:00
samuele3hu a61f9fce27 Fix:Resolve the pLengthSQ’s error in the Cocos2d.lua 2014-01-07 22:16:07 +08:00
CocosRobot 6fd72db513 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-07 13:28:43 +00:00
James Chen 54cbfe938b Merge pull request #4973 from CocosRobot/updategeneratedsubmodule_1389091226 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-07 02:41:53 -08:00
CocosRobot ab84228037 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-07 10:40:28 +00:00
James Chen 18963b46f5 Merge pull request #4971 from Dhilan007/develop_crash 
update liblua vs project for add miss file.
 2014-01-07 02:31:58 -08:00
Dhilan007 ba4833e070 update liblua vs project for add miss file. 2014-01-07 18:30:12 +08:00
James Chen ac3697db19 fix for jsval_to_ssize and ssize_to_jsval, it only supports 32 bits now. Otherwise, (string).toFixed(0) will fails. Do we need 64 bit for JS? 2014-01-07 18:28:46 +08:00
James Chen 5391024399 Adds override keyword. 2014-01-07 18:27:04 +08:00
CocosRobot 6967caeff9 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-07 09:47:05 +00:00
CocosRobot 7e142d79f7 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-07 09:05:07 +00:00
James Chen d733556270 Merge pull request #4955 from CocosRobot/updategeneratedsubmodule_1389081296 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-07 00:00:19 -08:00
James Chen 49ca35fc3d Merge pull request #4956 from dumganhar/move-temp-obj 
Uses CMAKE_BINARY_DIR instead of CMAKE_SOURCE_DIR, all temporary files will be in 'build'  folder.
 2014-01-06 23:58:42 -08:00
CocosRobot f8e7f570f3 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-07 07:54:58 +00:00
James Chen f5ae2bbacc Merge pull request #4932 from boyu0/iss3401_physical_lua_binding 
issue #3401: physical lua binding
 2014-01-06 23:48:47 -08:00
James Chen 2a3481f20c Moves temp files to CURRENT_BINARY_DIR. 2014-01-06 23:44:36 -08:00
Zhe Wang 9b6027d284 Merge pull request #4947 from walzer/develop 
udpate copyrights for the new year 2014 and Chukong.
 2014-01-06 19:50:18 -08:00
walzer d4c1aa92d5 add copyrights for 2014, in folders other then 2d. 2014-01-07 11:47:11 +08:00
CocosRobot 641255e3ef [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-07 03:25:39 +00:00
boyu0 f7c88a8134 issue #3401: update cmake project set 2014-01-07 11:09:40 +08:00
boyu0 8e64ef6d6d issue #3401: add physics lua auto generate to android.mk 2014-01-07 10:20:59 +08:00
boyu0 cf146b32cf Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss3401_physical_lua_binding 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/scripting/lua/bindings/CCLuaStack.cpp
	cocos/scripting/lua/script/Cocos2d.lua
	cocos/scripting/lua/script/Cocos2dConstants.lua
 2014-01-07 10:16:44 +08:00
samuele3hu c553fd2b73 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI 2014-01-07 10:10:17 +08:00
samuele3hu 01013195d3 Fix:Resolve the release lua test sample compile error 2014-01-07 10:08:58 +08:00
boyu0 eaa3041a97 issue #3401: physical lua banding script, add testlua->physics test 2014-01-06 22:19:40 +08:00
James Chen 1bd0f90437 Warning fix in js_manual_conversions.cpp/h 2014-01-06 20:02:01 +08:00
CocosRobot cc4bee319c [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-05 10:43:05 +00:00
CocosRobot 5f8d4f867c [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-05 05:52:52 +00:00
CocosRobot f44775b581 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-04 14:05:19 +00:00
CocosRobot 0b2926cb70 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-04 11:09:00 +00:00
samuele3hu 362c1dc0ea Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI 2014-01-04 18:37:34 +08:00
samuele3hu 465aba951c Fix:Remove the ScollView and TableView of extension gui lua binding 2014-01-04 18:36:33 +08:00
CocosRobot c793f2e0fc [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-04 10:19:07 +00:00
samuele3hu 70ee13e2e1 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI 2014-01-04 15:46:27 +08:00
samuele3hu 0550ec33ad Fix:Resolve the bugs that some lua test cases can’t run 2014-01-04 15:46:04 +08:00
CocosRobot ad11468b7b [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-04 07:40:50 +00:00
James Chen 98346474b8 Merge pull request #4863 from Dhilan007/develop_crash 
fix compiling error and miss file on vs.
 2014-01-03 20:41:19 -08:00
Dhilan007 35246b0810 fix compiling error and miss file on vs. 2014-01-04 12:25:12 +08:00
CocosRobot e42f721c6b [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-04 04:22:17 +00:00
CocosRobot d29cdb5b52 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-04 03:58:44 +00:00
CocosRobot 0ed307a583 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-04 02:58:59 +00:00
James Chen f3eb21e748 Merge pull request #4852 from dumganhar/iss3579-lua-bugtest914-crash 
closed #3579: TestLua->BugsTest->bug914 crashes if clicking 'reset' button all the time.
 2014-01-03 18:51:16 -08:00
James Chen 61af958976 closed #3579: Bug fix in setTouchEnabledForLayer for jsbindings. 2014-01-04 10:32:04 +08:00
James Chen baeacaddfc closed #3579: Bug fix in setTouchEnabledForLayer for luabindings. 
Also fixed lua module error.
 2014-01-04 10:30:11 +08:00
CocosRobot 54ee3392fc [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-04 01:40:17 +00:00
Dhilan007 e017609fc4 fix compiling error in jsb_cocos2dx_studio_manual.cpp on android. 2014-01-03 23:59:05 +08:00
Dhilan007 b6e676caa4 fix warn and compiling error in jsb_cocos2dx_studio_manual.cpp. 2014-01-03 23:03:48 +08:00
Dhilan007 b4d392dc38 update js binding for studio change. 2014-01-03 21:33:48 +08:00
CocosRobot 126c315673 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-03 11:32:54 +00:00
CocosRobot 37c8b03253 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-03 08:37:25 +00:00
James Chen 5346677a47 Merge pull request #4825 from samuele3hu/developNewUI 
Update the lua test cases about the armature
 2014-01-03 00:29:24 -08:00
Dhilan007 8e2c51d31e update vs project for split spine binding. 2014-01-03 15:29:50 +08:00
samuele3hu a72cf0428c Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI 2014-01-03 14:53:15 +08:00
samuele3hu 2b19da00df Update the lua test cases about the armature 2014-01-03 14:51:36 +08:00
CocosRobot 0661d87cdb [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-03 05:02:28 +00:00
samuele3hu 53f2415fcf Resolve the android compile error 2014-01-03 11:29:56 +08:00
samuele3hu 51e3e3fd1b Resolve the android and linux compile error 2014-01-03 11:15:46 +08:00
samuele3hu bfc7441453 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI 2014-01-03 10:51:05 +08:00
samuele3hu cdc82d6e8c Add a newline 2014-01-03 10:50:06 +08:00
samuele3hu c4588722dd Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI 2014-01-03 10:41:03 +08:00
samuele3hu 07a3efb585 Update the lua test cases about the GUI 2014-01-03 10:39:19 +08:00
James Chen 04760f2508 [Android] Adds jsb-spine module. TestJavascript now depends on jsb-spine module. 2014-01-03 10:30:55 +08:00
James Chen 831e0b08e0 Merge pull request #4807 from dumganhar/iss3291-xmlhttprequest-error-fix-develop 
closed #3291: XMLHttpRequest.status needs to be assigned even when connection fails.
 2014-01-02 06:46:25 -08:00
CocosRobot c120394cae [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-02 14:20:27 +00:00
James Chen e337fb35fc closed #3291: XMLHttpRequest.status needs to be assigned even when connection fails. 2014-01-02 21:59:47 +08:00
minggo d345139a08 fix compiling errors 2014-01-02 21:53:18 +08:00
minggo 674b38beef no in header file 2014-01-02 21:43:27 +08:00
minggo 2b5be1bacf Merge pull request #4801 from minggo/namespace 
fix compiling errors because of new namespace of network module
 2014-01-02 04:03:03 -08:00
minggo 9124f189c3 fix compiling errors because of new namespace of network module 2014-01-02 19:44:46 +08:00
CocosRobot 1c5638ad4f [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-02 11:36:25 +00:00
James Chen c29e328490 Merge pull request #4779 from samuele3hu/DispatcherBak1 
Develop branch adds lua trigger for CocoStudio
 2014-01-02 00:29:30 -08:00
James Chen 67c5ba8dfb closed #3565: Adds missing `lua_pop`to prevent lua stack issues. 2014-01-02 16:21:35 +08:00
Kenneth Chan 80df88d2cf Add missing bindings to setBlendFunc for various classes 
Conflicts:
	cocos/scripting/lua/bindings/lua_cocos2dx_manual.cpp
 2014-01-02 16:21:35 +08:00
samuele3hu d802518413 Rename Cocos2dStudio.lua to CocoStudio.lua 2014-01-02 15:51:25 +08:00
samuele3hu a2b706c87c Rename some common script files to keep consistent 2014-01-02 15:18:32 +08:00
CocosRobot c6425172b7 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-02 06:58:15 +00:00
CocosRobot ada5eb82ec [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-02 06:49:06 +00:00
James Chen dd54e906f0 ccs.XXX —> ccui.XXX for gui js bindings. 2014-01-02 14:21:24 +08:00
samuele3hu b8d4010ae5 Develop branch adds lua trigger for CocoStudio 2014-01-02 12:00:37 +08:00
boyu0 0a06d93328 issue #3401: physical lua banding script and auto script 2014-01-02 11:45:11 +08:00
CocosRobot ff550bf865 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-01 13:49:57 +00:00
James Chen 8c1c9fef15 Bug fix in cc.VisibleRect 2013-12-31 18:17:20 +08:00
James Chen 74a7f68dc1 [JSB] Adds cc.VisibleRect. 2013-12-31 18:12:42 +08:00
CocosRobot 2555318c13 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-31 03:36:47 +00:00
CocosRobot 674804f1b4 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-30 13:49:19 +00:00
James Chen 1d8ee016e5 Merge pull request #4596 from boyu0/bug2050_tilemap_firstgid_bug 
closed #2050: fix tilemap firstgid bug
 2013-12-30 05:42:19 -08:00
James Chen edb2ad0933 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into ccs-binding 
Conflicts:
	cocos/editor-support/cocostudio/TriggerMng.cpp
 2013-12-30 21:06:57 +08:00
James Chen 165e6c2a78 Adds an empty LuaEngine::parseConfig function. 2013-12-30 21:04:00 +08:00
James Chen 1edf748dc3 [JSB] Adds trigger bindings for CocoStudio. 2013-12-30 20:57:46 +08:00
minggo 714af52e0c Merge pull request #4732 from Dhilan007/update_vs_project 
fix compiling error on liblua VS 2012 project
 2013-12-29 23:24:01 -08:00
Dhilan007 30b3a6f8c3 fix compiling error on liblua VS 2012 project 2013-12-30 14:21:32 +08:00
CocosRobot a269fba371 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-30 05:58:34 +00:00
boyu0 1f72fafd08 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug2050_tilemap_firstgid_bug 
Conflicts:
	cocos/2d/CCTMXXMLParser.cpp
	cocos/2d/CCTMXXMLParser.h
 2013-12-30 12:30:59 +08:00
CocosRobot 203b0f183e [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-28 06:59:45 +00:00
CocosRobot 2051041df7 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-27 13:12:17 +00:00
James Chen 0d16f7bc3b Merge pull request #4712 from dumganhar/cocostudio-test 
Merge PR #4672: We need to replace trigger system by EventDispatcher in future.
 2013-12-27 05:05:41 -08:00
James Chen b03c8259b1 Merge commit 'refs/pull/4672/head' of git://github.com/cocos2d/cocos2d-x into cocostudio-test 
Conflicts:
	cocos/scripting/auto-generated
 2013-12-27 20:18:58 +08:00
samuele3hu aa0eb36071 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into DispatcherBak1 2013-12-27 20:08:09 +08:00
samuele3hu 30439e4689 Improve the coding style 2013-12-27 20:07:00 +08:00
James Chen bf881f3ac0 Merge pull request #4691 from samuele3hu/DispatcherBak1 
Reconstruct the operation of handling lua script event
 2013-12-27 03:58:08 -08:00
CocosRobot 0116866e58 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-27 10:16:22 +00:00
CocosRobot 68cf83ee7d [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-27 09:55:01 +00:00
chengstory faaf6d3f2b fixed #3457 fixes some bug. 2013-12-27 17:21:13 +08:00
samuele3hu ee7aa0f077 Rename EVENT_KEYBOARD_RELEASED and resolve a possible memory leak bug 2013-12-27 12:05:12 +08:00
samuele3hu d51440f62a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into DispatcherBak1 
Conflicts:
	cocos/scripting/lua/bindings/lua_cocos2dx_extension_manual.cpp
 2013-12-27 11:17:11 +08:00
samuele3hu 6d9e865f15 Delete some ScriptEventType only used to Lua 、adjust the event callback mechanism and rename cc.HANDLERTYP_ related to avoid overlong 2013-12-27 10:35:44 +08:00
CocosRobot edeeae4ff9 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-26 14:48:08 +00:00
James Chen 17ff6ef764 Renames: IntValueMap —> ValueMapIntKey 2013-12-26 22:07:20 +08:00
James Chen 93ed5a4f0f long --> ssize_t for TableView callback. 2013-12-26 04:09:24 -08:00
samuele3hu 756a72cbca Reconstruct the operation of handling lua script event 2013-12-26 19:43:49 +08:00
CocosRobot 50a379b8f0 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-26 09:04:04 +00:00
CocosRobot 09996ea82c [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-26 08:20:26 +00:00
James Chen 5dfb7f321a Compilation fixes after merge PR #4669 https://github.com/cocos2d/cocos2d-x/pull/4669 2013-12-26 16:03:30 +08:00
CocosRobot e6727ea087 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-26 02:50:37 +00:00
CocosRobot 6492f61691 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-25 10:34:46 +00:00
samuele3hu 7c3978bdd8 Add missing file for linux lua binding 2013-12-25 17:42:59 +08:00
samuele3hu a2c5881699 Add include_directories for spine 2013-12-25 17:22:14 +08:00
samuele3hu 1075a711e0 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Spine 2013-12-25 16:58:19 +08:00
samuele3hu 9cf45a292b Delete some annotated statement about spine and add some reserve manual lua binding functions 2013-12-25 16:42:40 +08:00
CocosRobot c71cd5a407 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-25 06:39:38 +00:00
samuele3hu 9fd64df099 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Spine 2013-12-25 13:48:10 +08:00
samuele3hu 45cfe00ec4 Modify iOS project set and some manual lua binding 2013-12-25 13:47:22 +08:00
CocosRobot 9aa48cac37 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-25 03:49:23 +00:00
James Chen 0ff85852cc Don’t use FileUtils::getInstance()->getFileData, please use getStringFromFile and getDataFromFile instead. 2013-12-24 18:08:40 +08:00
CocosRobot c3b7406b43 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-24 09:00:04 +00:00
James Chen d33b2c41c7 Merge branch 'develop' into data-refactor 
Conflicts:
	tools/tolua/cocos2dx.ini
 2013-12-24 16:24:17 +08:00
samuele3hu e497f823ea Merge branch 'lua_spine_dev' of https://github.com/edwardzhou/cocos2d-x into Spine 2013-12-24 16:14:10 +08:00
CocosRobot 3875d89ce6 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-24 07:31:29 +00:00
James Chen 451d76f6b0 Merge pull request #4611 from dumganhar/spine-test 
Merge PR #4572, Spine JS test support.
 2013-12-23 22:55:58 -08:00
CocosRobot 4775b4c4d8 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-24 06:33:43 +00:00
CocosRobot c170559759 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-24 05:59:50 +00:00
samuele3hu 7f4e384886 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into NewEventDispatcher 2013-12-24 13:43:57 +08:00
samuele3hu 98e4e802f4 Support pass by value for setPosition\setAnchorPoint\setContentSize for lua binding 2013-12-24 13:42:32 +08:00
Edward Zhou 4082c86070 1. add Spine LUA binding with testcase; 2. CCSkeleton inherites from Node since NodeRGBA is deprecated. 2013-12-24 11:55:53 +08:00
CocosRobot e50b6b616b [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-24 03:45:37 +00:00
James Chen 325f2e21a7 [JSB] long —> ssize_t in JSB_TableViewDataSource::callJSDelegate. 2013-12-24 10:41:45 +08:00
CocosRobot d22f2aaf67 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-24 02:28:17 +00:00
CocosRobot a9d8a64e63 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-23 14:10:01 +00:00
James Chen 05f6a5b09b Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into spine-test 2013-12-23 22:05:20 +08:00
James Chen 44f9009a5d Merge pull request #4610 from dumganhar/lastest-js-test 
Updates JS-test to the latest version and some binding fixes
 2013-12-23 06:04:49 -08:00
James Chen 3327614a99 Binds Node::setAnchorPoint manually. 2013-12-23 21:54:02 +08:00
CocosRobot cc7aa1ee0d [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-23 13:45:59 +00:00
James Chen 6b73fa570e Merge pull request #4601 from samuele3hu/toluaerror 
issue #3353 Lua gc mechanism will make the extended attributes of lua userdata disapper
 2013-12-23 05:40:15 -08:00
samuele3hu b1dd233a04 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into NewEventDispatcher 2013-12-23 20:30:33 +08:00
samuele3hu 48a95cfa55 [Lua Binding] Supports to bind more container: std::vector<std::string>, std::vector<int>, cocos2d::Map<std::string, T>. 2013-12-23 20:29:05 +08:00
James Chen cafebe7295 Merge commit 'refs/pull/4572/head' of git://github.com/cocos2d/cocos2d-x into spine-test 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2013-12-23 20:28:51 +08:00
James Chen 3096c34311 Removes unneeded binding glue codes, Sprite::setPosition. 2013-12-23 20:25:46 +08:00
CocosRobot 2efe4b7420 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-23 12:14:14 +00:00
CocosRobot 509d4513eb [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-23 11:48:15 +00:00
James Chen eb9cb237d5 Merge pull request #4600 from dumganhar/remove-unneeded-bindings-codes 
closed #3480: Removes unneeded codes of override function.
 2013-12-23 03:43:27 -08:00
samuele3hu 783be69322 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into toluaerror 
Conflicts:
	tools/tolua/cocos2dx.ini
 2013-12-23 17:20:17 +08:00
boyu0 669ba8149a closed #2050: fix js glue code. 2013-12-23 17:06:13 +08:00
James Chen 43e9df17bb Removes unneeded ‘clone’ in cocos2d_specifics.cpp. 2013-12-23 16:39:25 +08:00
James Chen 9dff1dcd36 [LUA] Removes CCCameraDeprecated table in Deprecated.lua. 2013-12-23 16:37:40 +08:00
CocosRobot 9901703f4a [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-23 05:52:59 +00:00
James Chen 2fec81fcae Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into data-refactor 
Conflicts:
	tools/tolua/cocos2dx.ini
 2013-12-23 13:52:15 +08:00
James Chen aeafe06d7f Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into data-refactor 
Conflicts:
	cocos/scripting/lua/bindings/lua_cocos2dx_manual.cpp
 2013-12-23 11:57:29 +08:00
James Chen ca082080b5 Binds FileUtils::getStringFromFile automatically since we have added this method. 2013-12-23 11:47:56 +08:00
samuele3hu 9128960c13 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into NewEventDispatcher 2013-12-23 11:22:41 +08:00
samuele3hu f0dc7f0b15 issue #3403:Modify the registerScriptHandler functions inputparams and some EventData struct info 2013-12-23 11:19:55 +08:00
James Chen 0a2490333b Compilation fix after this PR (https://github.com/cocos2d/cocos2d-x/pull/4583). 2013-12-23 10:03:36 +08:00
samuele3hu 71d5896d41 issue #3403:Delete Camera manual lua binding 2013-12-23 09:42:36 +08:00
samuele3hu 50bcdee725 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into NewEventDispatcher 2013-12-22 22:11:17 +08:00
samuele3hu 97f26176e8 issue #3403:Add the EventDispatcher lua binding and the releated test cases 2013-12-22 22:10:21 +08:00
CocosRobot bc5fd247ac [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-21 20:35:41 +00:00
CocosRobot 58e25a657f [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-21 03:47:33 +00:00
CocosRobot f3d3e65e76 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-20 09:35:05 +00:00
James Chen 55ff96df3a closed #3463: Potential hash collision by using typeid(T).hash_code() in JSB and LuaBinding. 
Instead of using std::unordered_map<long, T>(long is the hash_code generated by typeid(T).hash_code()),
We needs to use std::unordered_map<std::string, T> to avoid collision since unordered_map internally processes collisions.
 2013-12-20 17:13:09 +08:00
byeonggee.seo 0a30a9a604 spine simple JS binding supported 2013-12-20 16:10:15 +09:00
CocosRobot 8c0d74bb33 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-20 02:56:57 +00:00
minggo 756f8f7a11 Merge pull request #4482 from dabingnn/develop_gridNode 
Develop grid node
 2013-12-19 18:30:42 -08:00
CocosRobot 982d5626fc [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-19 13:13:34 +00:00
CocosRobot fc1516aee4 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-19 12:54:14 +00:00
James Chen 755d29b0e1 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into more_container_bind 2013-12-19 20:17:54 +08:00
James Chen f73e939b57 Supports to bind more container: std::vector<std::string>, std::vector<int>, cocos2d::Map<std::string, T>. 2013-12-19 20:17:44 +08:00
CocosRobot 8421d43195 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-19 10:12:28 +00:00
Huabing.Xu d51ad36613 Merge branch 'develop' into develop_gridNode 
* develop: (67 commits)
  Adds const in ShaderTest2.h
  Skew works again!
  [AUTO] : updating submodule reference to latest autogenerated bindings
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Reverts submodule.
  Updates submodule of bindings-generator.
  Adds `std::for_each` test in invocation
  Reverts bindings-generator.
  fixed not render
  iterator in Sprite fixes
  update vs project for removes unneeded files
  getNodeToParentTransform fixes
  Node cleanup
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Improves SpriteTest
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Android and Linux fixes
  removes `using namespace std` from header file
  Removes unneeded files
  change play arguments
  ...

Conflicts:
	cocos/2d/CCNode.cpp
	samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
 2013-12-19 17:20:22 +08:00
boyu0 ef54ed3c15 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into HEAD 
Conflicts:
	cocos/2d/CCLabel.cpp
	cocos/2d/CCLabel.h
	cocos/2d/CCLabelBMFont.cpp
	cocos/2d/CCLabelBMFont.h
	cocos/2d/CCLayer.cpp
	cocos/2d/CCLayer.h
	cocos/2d/CCNode.cpp
	extensions/GUI/CCControlExtension/CCControl.cpp
	extensions/GUI/CCControlExtension/CCControlButton.cpp
	extensions/GUI/CCControlExtension/CCScale9Sprite.cpp
	tools/tojs/cocos2dx.ini
 2013-12-19 17:05:59 +08:00
CocosRobot ac24dec620 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-19 04:19:07 +00:00
CocosRobot 403315e315 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-19 03:58:41 +00:00
CocosRobot 228b4ebf75 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-18 22:11:07 +00:00
CocosRobot d0779b5352 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-18 20:14:20 +00:00
CocosRobot 000958bf82 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-18 09:57:15 +00:00
James Chen 9c0d39c6f9 Merge pull request #4531 from dumganhar/extension-warning-fix 
Some warning fixes in SocketIO, ContriolButton, js_manual_conversion.h/.cpp.
 2013-12-18 01:48:14 -08:00
James Chen 589b71eecf Merge pull request #4530 from samuele3hu/developConversion 
issue #3402:Add the new label lua binding and the releated test cases
 2013-12-18 01:16:47 -08:00
James Chen 0695e32fff Some warning fixes in SocketIO, ContriolButton, js_manual_conversion.h/.cpp. 2013-12-18 15:40:31 +08:00
samuele3hu f5f95399fd Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developConversion 2013-12-18 14:58:35 +08:00
CocosRobot 8f1e94471e [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-18 06:52:09 +00:00
samuele3hu 55830c3023 Add support for unsigned short 2013-12-18 13:47:59 +08:00
samuele3hu 4d4b96ba30 issue #3402:Add the new label lua binding and the releated test cases 2013-12-18 11:39:43 +08:00
CocosRobot 12d8740537 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-17 10:39:43 +00:00
James Chen 37f408f2b9 Merge pull request #4506 from Dhilan007/ushort_jsb 
add API for transform unsigned short
 2013-12-17 02:20:56 -08:00
Dhilan007 0414926b52 add API for transform unsigned short 2013-12-17 18:17:04 +08:00
Huabing.Xu 25fc3d3c2a Merge branch 'develop' into develop_gridNode 
* develop: (105 commits)
  update armature to new render
  iOS & Mac project fix.
  [AUTO] : updating submodule reference to latest autogenerated bindings
  use size_t replace unsigned int for record redeque::size returned value.
  issue #2171: Updates CMakeLists.txt.
  issue #2171: Binds New renderer classes, ignores NewTextureAtlas.
  issue #2171: Adds header files of renderer in cocos2d.h.
  issue #2171: Reorder renderer files for iOS & mac project.
  issue #2171: small fix in ccTypes.h
  issue #2171: Don’t ‘using namespace std;’ in header file.
  [AUTO] : updating submodule reference to latest autogenerated bindings
  issue #2171: Ignores Director::getFrustum.
  issue #2171: Fixing compilation errors for Linux port.
  issue #2171: NULL —> nullptr for Android warning of CCBAnimationManager.cpp.
  issue #2171: [New Renderer] Fixing compilation errors for Android.
  [Win32] fix argument type. - argument of interface is ssize_t.
  Update AUTHORS [ci skip]
  Update CHANGELOG [ci skip]
  Add mouse scrolling support for extension test
  issue #3341:fix Incorrect at TextureCache::addImageAsync for repeatedly execute for the same image
  ...

Conflicts:
	cocos/2d/CCNode.cpp
	cocos/2d/cocos2d.vcxproj.filters
	samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
 2013-12-17 18:16:05 +08:00
CocosRobot 30521ff5a4 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-17 09:50:36 +00:00
CocosRobot 91cfecb931 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-17 08:13:06 +00:00
CocosRobot 21c74322bd [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-17 07:25:00 +00:00
Huabing.Xu d63d3b3c24 remove manually JS binding functions 2013-12-16 14:45:21 +08:00
CocosRobot 1e645cfcd5 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-16 06:36:50 +00:00
James Chen 3a11dafda7 Uses reinterpret_cast instead of static_cast for jsval_to_ssize and luaval_to_ssize. 2013-12-16 14:13:24 +08:00
James Chen adb45d3c68 Adds conversions for ssize_t. 2013-12-16 13:01:20 +08:00
boyu0 c15ad14ed3 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect 2013-12-16 03:45:06 +08:00
boyu0 defae416f3 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect 2013-12-13 18:09:39 +08:00
Dhilan007 4e2e423615 fix compile error related to ssize_t. 2013-12-13 17:53:03 +08:00
CocosRobot 4114b682ca [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-13 09:10:37 +00:00
samuele3hu 6c49131ed6 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developConversion 2013-12-13 15:51:03 +08:00
samuele3hu 98bd84c436 Fix:Add lua binding of ’registerScriptHandler’、’unregisterScriptHandler’ and ’removeObjectAllHandlers’ of ScriptHandlerMgr and some constants define 2013-12-13 15:50:12 +08:00
boyu0 aabb2c655d issue #3162: reset submodule 2013-12-13 11:48:16 +08:00
boyu0 d4c8fb0be6 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect 2013-12-13 10:47:52 +08:00
boyu0 c8c0e2270e issue #3162: deprecated RGBAProtocol, NodeRGBA and LayerRGBA 2013-12-13 10:10:49 +08:00
CocosRobot 644e2d923c [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-12 22:48:57 +00:00
boyu0 d7106d49be Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect 2013-12-12 17:04:21 +08:00
samuele3hu 4ccceea230 Fix:Remove some needless lua binding functions and resolve a bug 2013-12-12 14:47:35 +08:00
CocosRobot f12895a020 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-12 03:32:44 +00:00
James Chen 320ae15db4 issue #2790: Lua compilation fix. 2013-12-12 10:54:41 +08:00
samuele3hu d104f49dea Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developConversion 2013-12-11 12:06:37 +08:00
samuele3hu 6d8deac8a8 issue #3374:Register the lua manual binding funtions leading to the top index of lua state 2013-12-11 12:05:46 +08:00
CocosRobot bf11a8d309 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-10 11:27:50 +00:00
boyu0 a71394b122 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect 2013-12-10 18:03:41 +08:00
samuele3hu 89c079009b issue #2790:Resolve some errors of basical conversion functions 2013-12-10 18:01:40 +08:00
CocosRobot a775f7940d [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-10 08:30:00 +00:00
CocosRobot b5a0048ffd [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-10 07:21:39 +00:00
CocosRobot 1927e3e62c [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-10 04:08:19 +00:00
samuele3 85783fff2b issue #2790:Unify the format 2013-12-10 11:47:51 +08:00
samuele3 34c0147cf3 issue #2790:Resolve the compile error 2013-12-10 11:33:57 +08:00
samuele3 f801a8e5fe Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developConversion 2013-12-10 11:21:59 +08:00
samuele3 c2e7299d8f Issue #2790:Add more conversion functions to support templates containers 2013-12-10 11:21:30 +08:00
CocosRobot b2e7966137 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-09 03:53:01 +00:00
boyu0 d6d7923134 closed #3162: add RGBAProtocol, NodeRGBA and LayerRGBA back and deprecate them 2013-12-09 11:32:28 +08:00
James Chen f406dcfebc Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss2790-deprecate-ccarray 2013-12-07 23:32:49 +08:00
James Chen be7c62a2b9 issue #2790: Removes unused CCSet binding glue codes. 2013-12-07 14:44:21 +08:00
boyu0 4d0e3dbd8d Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect 2013-12-06 18:16:26 +08:00
boyu0 af5f496861 issue #3162: Merge Node and NodeRGBA, fix bug: Child's opacity will not be changed when its parent's setCascadeOpacityEnabled was set to true and opacity was changed. 2013-12-06 18:07:16 +08:00
CocosRobot 8442f17259 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-06 09:31:16 +00:00
James Chen b5978eeee6 issue #2790: Bindings-generator supports binding Vector<T> and some bug fixes. 2013-12-06 16:46:19 +08:00
samuele3 c006bfd68e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into toluaerror 2013-12-06 14:17:23 +08:00
samuele3 ad8638d976 issue #3353:Lua gc mechanism will make the extended attributes of lua userdata disapper 2013-12-06 14:16:33 +08:00
CocosRobot d04f777351 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-05 04:02:07 +00:00
CocosRobot a354031526 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-04 07:47:50 +00:00
samuele3 c1a226686f issue #3309:Modify some deprecated cpp files and lua files 2013-12-04 15:15:55 +08:00
samuele3 a8c1bba464 issue #3309:Add some deprecated functions and classes to support master cocostudio lua bindings 2013-12-03 15:40:59 +08:00
CocosRobot a24af527a3 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-28 03:14:39 +00:00
James Chen 468ba24183 Merge pull request #4397 from CocosRobot/updategeneratedsubmodule_1385533506 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-11-26 22:32:04 -08:00
James Chen 1a283ab600 Merge pull request #4396 from dumganhar/iss3289-armature-crash 
closed #3289: [JSB] 'Test Frame Event' of CocoStudioArmatureTest Crashes...
 2013-11-26 22:29:36 -08:00
CocosRobot 4d327b8180 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-27 06:25:08 +00:00
James Chen 6dc9183c8a closed #3289: [JSB] 'Test Frame Event' of CocoStudioArmatureTest Crashes! 2013-11-27 14:12:43 +08:00
James Chen 4311e7c469 [Script Binding] Bind ‘unsigned long’. 2013-11-27 13:52:41 +08:00
James Chen f4610c5272 Merge pull request #4382 from dumganhar/iss3279-xmlhttprequest-bin 
closed #3279: XMLHttpRequest receives wrong binary array.
 2013-11-26 19:02:07 -08:00
CocosRobot dda13b7e8a [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-27 02:18:42 +00:00
James Chen f6a1f5cc95 issue #3279: A warning fix for 64bit platform. 2013-11-26 21:54:48 +08:00
James Chen ecc7783685 closed #3279: XMLHttpRequest receives wrong binary array. 2013-11-26 20:31:44 +08:00
CocosRobot 17c4631f45 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-26 08:36:22 +00:00
James Chen 999b7ccd07 Merge pull request #4375 from dumganhar/constructors_are_protected 
issue #3258: Merge PR #4351: Constructors are protected
 2013-11-26 00:30:06 -08:00
James Chen ebcdf2f87d issue #3258: Bug fix of MenuItemToggle binding. 2013-11-26 15:44:49 +08:00
James Chen 5fbf164142 closed #3274: Can't override cc.Node.setPosition in JSB. 2013-11-26 10:14:56 +08:00
Ricardo Quesada a198fb51df JS Bindings Menu 
doesn't initialize the menu twice.
 2013-11-25 16:24:33 -08:00
Ricardo Quesada b6f6e72c94 Merge branch 'develop' into constructors_are_protected 
Conflicts:
	cocos/2d/CCActionInstant.h
 2013-11-25 13:59:24 -08:00
James Chen 9ebc4e3722 Merge pull request #4358 from samuele3hu/developTableView 
issue #3228:CallFuncND + auto remove lua test case have no effect
 2013-11-25 00:18:30 -08:00
James Chen b9fa8566f2 closed #3273: ScriptingCore::evalString crashes 2013-11-25 15:52:59 +08:00
James Chen 8574fb0494 Build fix for XMLHttpRequest after using std::unordered_map instead of std::map. 2013-11-25 15:11:43 +08:00
CocosRobot a4c2ccdf65 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-25 02:16:36 +00:00
samuele3 192deb7952 issue #3228: Reconstruct the Callfunc create method to support std::function and add callFuncND + auto remove lua test case 2013-11-22 11:51:07 +08:00
Ricardo Quesada b6ddc6d048 Uses std::unordered_map<> instead of std::map<> 
and more fixes.
 2013-11-21 13:43:59 -08:00
CocosRobot 54ef1d6c15 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-20 04:24:55 +00:00
CocosRobot d8ec58831a [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-19 09:40:27 +00:00
CocosRobot 0855ff0841 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-19 03:50:57 +00:00
minggo fb2c2ec7f2 Merge pull request #4323 from Dhilan007/jssubmodule 
[ci skip]fix miss bind setGrid\getGrid for JS.
 2013-11-18 18:53:51 -08:00
CocosRobot 186b6fd98b [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-19 02:40:44 +00:00
Dhilan007 ce0a6d5b57 fix miss bind setGrid\getGrid for JS. 2013-11-19 10:33:11 +08:00
minggo 27f35ac3e3 Merge pull request #4312 from samuele3hu/developTableView 
[ci skip]Hot fix:Repair some lua test samples and modify layer touch listener functions
 2013-11-18 07:09:57 -08:00
minggo 0e2ea2971d Merge pull request #4313 from minggo/develop 
[ci skip]fix compiling error of js template
 2013-11-18 06:33:23 -08:00
minggo 2028cde015 fix compiling error of js template 2013-11-18 22:32:13 +08:00
samuele3 6c88dd34c0 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTableView 2013-11-18 22:17:47 +08:00
samuele3 a2e9920288 Hot fix:Repair some lua test samples and modify layer touch listener functions 2013-11-18 22:16:49 +08:00
CocosRobot 853a895c69 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-18 10:57:00 +00:00
James Chen 060e8413dd Merge pull request #4307 from CocosRobot/updategeneratedsubmodule_1384771216 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-11-18 02:51:11 -08:00
CocosRobot 7afb8877c5 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-18 10:40:18 +00:00
minggo 593c0f8946 Merge pull request #4304 from Dhilan007/di3223 
[ci skip]issue #3223:bind gui and studio
 2013-11-18 02:28:53 -08:00
Dhilan007 8b14575d7e bind gui and studio. 2013-11-18 16:54:52 +08:00
samuele3 ee815c8e9a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTableView 2013-11-18 15:57:14 +08:00
samuele3 b281a2f06f Hot fix:repalce unsigned int/int type of params with long to solve tableview bug 2013-11-18 15:55:58 +08:00
samuele3 5c8d24a11e hot fix:Repair the crash of cocostudio and the bug of some lua test samples can't come in 2013-11-18 14:12:07 +08:00
samuele3 c1bdd8ad3c Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 2013-11-15 13:49:19 +08:00
samuele3 ec9bc0069f Modify template of lua ios_mac config and some bugs 2013-11-15 13:48:34 +08:00
Huabing.Xu 022b5c7b9a Merge branch 'develop' into free_instead_of_delete 
# By CaiWenzhi (4) and others
# Via minggo (7) and others
* develop:
  fix asynchronize loading bug
  [AUTO] : updating submodule reference to latest autogenerated bindings
  fixed #3185 support for html5.
  fixed bug of widget
  fixed bugs of widget
  fixed #3185  ComponentTest and SceneTest NULL to nullptr.
  Add deprecated functions of class TextureCache
  fix warning
  set z order after reorder
  fixed #3185 replace NULL to nullptr.
  add "override"
  fixed #3185
  Modify code criterion

Conflicts:
	cocos/editor-support/cocostudio/CCSGUIReader.cpp
	cocos/editor-support/cocostudio/CCSSceneReader.cpp
 2013-11-15 09:44:29 +08:00
minggo f06d71dd49 Merge pull request #4258 from CocosRobot/updategeneratedsubmodule_1384421963 
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
 2013-11-14 02:26:45 -08:00
CocosRobot 523cb2e8d9 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-14 09:39:25 +00:00
Huabing.Xu bc55d3246b Merge branch 'develop' into free_instead_of_delete 
# By minggo (12) and others
# Via minggo (18) and others
* develop: (78 commits)
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Update CHANGELOG[ci skip]
  Update AUTHORS [ci skip]
  fix bug: cccolor to jsval function has error in jsb
  [ci skip]
  [ci skip]
  [ci skip]
  [ci skip]
  [ci skip]
  C++11: NULL -> nullptr
  [ci skip]
  Fix: UserDefault::createXMLFile with correct XML definition.
  [ci skip]
  [ci skip]
  [ci skip]
  Fix bug: rename const with under line seperator
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Fix bug: Z fighting on TransitionScenePageTurn
  Fixed bugs
  Modify reader and fixed bugs
  ...

Conflicts:
	cocos/editor-support/cocostudio/CCSGUIReader.cpp
 2013-11-14 14:47:01 +08:00
samuele3 a20620c185 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 2013-11-14 14:14:52 +08:00
samuele3 babc985409 Add deprecated functions of class TextureCache 2013-11-14 14:12:25 +08:00
CocosRobot 515d20d863 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-14 04:32:48 +00:00
rablwupei 96462eb81f fix bug: cccolor to jsval function has error in jsb 2013-11-14 12:03:44 +08:00
CocosRobot dff9c6a5b5 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-14 01:52:57 +00:00
samuele3 17f74eeb17 issue #2868:Modify armature test samples and add more armature test samples 2013-11-13 18:18:29 +08:00
samuele3 26c3266711 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 2013-11-13 10:15:24 +08:00
samuele3 f429c4c632 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 2013-11-12 17:51:33 +08:00
CocosRobot 0acaa1f76e [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-12 09:50:13 +00:00
samuele3 ae6597dbaa Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCheck 
Conflicts:
	tools/bindings-generator
 2013-11-12 17:23:41 +08:00
samuele3 18bc96096c Resolve some warning and modify uint32_t to long 2013-11-12 17:18:51 +08:00
samuele3 c1d256c159 issue #2868:modify ccs lua test samples 2013-11-12 16:52:03 +08:00
samuele3 cfb1cfdf65 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 
Conflicts:
	cocos/editor-support/cocostudio/CCSGUIReader.h
 2013-11-12 15:30:36 +08:00
samuele3 482ee5d47f issue #2868:Add more ccs lua test samples 2013-11-12 15:25:47 +08:00
Ricardo Quesada be64dd97cf replaces `delete[]` with `free()` in C-based API 
API that returns a newly allocated buffer as an output argument (not return value) are error-prone.

- Users forget to release the newly allocated buffer
- Or the call `delete` instead of `delete[]`

But some of those API need to call `realloc` on the buffer.
But `realloc` is only valid if the buffer was previously allocated with `malloc`.
If a buffer needs to be re-allocated using a C++ API, then `std::vector<char*>` should be used instead...

So, this patch does:

- Migrates the API from  `new []` / `delete[]` to  `malloc()` / `free()`
- Fixes all the memory issues: incorrect deallocs and memory leaks
- Updates the documentation
- And fixes misc issues with the API: removes `cc` from the ZipUtils class.
 2013-11-11 18:09:47 -08:00
CocosRobot 3472d7ad50 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-11 10:57:57 +00:00
minggo b868c3f1dc Merge pull request #4173 from minggo/remove-makefile 
[ci skip]remove makefiles
 2013-11-11 02:19:16 -08:00
minggo 1e15071dc7 remove makefiles 2013-11-11 17:29:48 +08:00
samuele3 7cfe890d5d Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 2013-11-11 17:04:37 +08:00
samuele3 06c7d3e96d issue #2868:Add ccd lua test samples 2013-11-11 17:03:43 +08:00
James Chen 49289d7576 Adding cc.TextureCache.getInstance() to jsb_deprecated.js. 2013-11-11 16:45:44 +08:00
James Chen 20b350a58b Removing cocosjs_manual_conversions.h(.cpp). Put all jsval <-> native value conversion codes to js_manual_conversions.h(.cpp). 2013-11-11 16:45:44 +08:00
CocosRobot 2e52dd4905 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-11 08:05:15 +00:00
James Chen 9d7a8c44f9 Reverts auto-generated. 2013-11-11 14:40:23 +08:00
James Chen 8f8d0f86d7 Updating Bindings-generator. 2013-11-11 14:38:12 +08:00
James Chen ff3bfbe8a2 Using std::unordered_map instead of UTHASH for js_type_class_t. 
Since xxx.hash_code() return size_t which is 8bytes on 64bit system, we should not use HASH_ADD_INT and HASH_FIND_INT for js_type_class_t.
 2013-11-11 14:36:43 +08:00
James Chen 5a0df8d2e8 VS2012 doesn’t support invoke another constructor method in current constructor. 2013-11-11 14:36:43 +08:00
James Chen fe88f7c941 Fixing memory leak of JSStringWrapper::set . 2013-11-11 14:36:43 +08:00
James Chen 9d5813b7d9 Some fixes: 
1) Moving the implementation of JSStringWrapper to .cpp file. Removing override operator() which will be easy to make errors.
2) Deleting JSCallFuncWrapper since it isn’t needed after using std::function for MenuItem’s Callback.
3) Fixing ChipmunkTest crash sometimes on MAC platform(64bit).
 2013-11-11 14:36:42 +08:00
James Chen 0c4b6e7a37 Removing JSB Version since JSB source codes will be updated with cocos2d-x. 
Also, remove some unused codes.
 2013-11-11 10:40:51 +08:00
minggo 9a3d2e941e Merge pull request #3969 from dualface/develop 
[ci skip]fix tolua_fix, cleanup peertable after object deleted
 2013-11-10 17:44:24 -08:00
dualface c75c20de04 fix Lua 5.2 compatibility 2013-11-10 11:49:52 +08:00
CocosRobot 6e6c63e111 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-10 03:29:03 +00:00
samuele3 d4dbc7a442 Add conversion config for long type 2013-11-10 09:21:33 +08:00
dualface 2a2fc81f86 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-11-10 00:00:19 +08:00
samuele3 e26fe04deb Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 2013-11-09 23:04:11 +08:00
samuele3 286393d28e issue #2868:Add more manual lua binding functions 2013-11-09 22:58:40 +08:00
Ricardo Quesada 5faae4a51e removes exe bit from text files 2013-11-08 11:30:50 -08:00
CocosRobot fd37d3e973 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-08 04:17:15 +00:00
CocosRobot 240fc2ade1 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-08 03:10:36 +00:00
samuele3 f56269ce85 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 2013-11-07 23:23:11 +08:00
samuele3 16d572c04f issue #2868:Add manual lua binding files 2013-11-07 23:22:11 +08:00
CocosRobot a116e7ec79 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-07 09:11:22 +00:00
samuele3 8c025a2cee Reslove the linux compiled error 2013-11-07 15:12:19 +08:00
James Chen d6d041f561 issue #3113: [Linux] Adding options for modules. 2013-11-06 19:17:34 +08:00
CocosRobot 8a836dc477 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-06 09:38:34 +00:00
CocosRobot d990699417 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-06 08:00:35 +00:00
James Chen 9d3716e964 Merge pull request #4109 from HoGarfield/JS_Call 
Missing add "JSB_AUTOCOMPARTMENT_WITH_GLOBAL_OBJCET " before calling JS_CallFunctionValue
 2013-11-05 23:56:03 -08:00
garfield_ho f36fd002cd Remove duplicate 2013-11-06 15:40:23 +08:00
garfield_ho f6070406cd Missing add "JSB_AUTOCOMPARTMENT_WITH_GLOBAL_OBJCET " before calling JS_CallFunctionValue 2013-11-06 15:31:58 +08:00
James Chen 2e80e95a37 [Linux] compilation fix for PR #4099 2013-11-06 15:26:33 +08:00
James Chen 4e4798fdcc Merge commit 'refs/pull/4099/head' of https://github.com/cocos2d/cocos2d-x into 64bit-fix 2013-11-06 15:15:47 +08:00
CocosRobot d7ed908818 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-06 06:20:17 +00:00
Ricardo Quesada 84a6aa29cd Adds more 64-bit fixes 
Replaces more `int` with `long` where it makes sense.

Also , it repalces some `unsigned long` with `long` for "lenght"
values as described in our c++ guideline
 2013-11-05 17:36:44 -08:00
CocosRobot 47e0d343ff [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-05 11:30:43 +00:00
James Chen 64b9cba5d5 Merge pull request #4092 from samuele3hu/developCCS 
issue 2868:Move armature related lua binding from namespace 'cc' to namespace 'ccs'
 2013-11-05 03:24:20 -08:00
samuele3 66256e9ad7 issue #2868:Move armature related lua binding from namespace 'cc' to namespace 'ccs' 2013-11-05 17:48:29 +08:00
samuele3 61d8f9673c issue #2868:Move armature related lua binding from namespace 'cc' to namespace 'ccd' 2013-11-05 17:34:25 +08:00
CocosRobot 8c75cd0dfa [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-05 08:07:15 +00:00
samuele3 b76865c692 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 2013-11-05 15:11:05 +08:00
samuele3 b445f0824a issue #2868:Bind UI and Scene parser to lua by bindings-generator and add releated test samples 2013-11-05 15:09:51 +08:00
CocosRobot 5cecc93c3e [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-05 06:31:26 +00:00
James Chen daa91ad413 [CMake] Update library dependency. 2013-11-04 21:03:07 +08:00
James Chen c085412636 [CMake] TestLua and HelloLua is ok. 2013-11-04 21:03:07 +08:00
CocosRobot 1cf0a926e1 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-04 02:46:22 +00:00
CocosRobot 6360c40725 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-01 13:03:20 +00:00
CocosRobot a272bcd6ea [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-01 10:02:54 +00:00
samuele3 80f3a7d57a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager 
Conflicts:
	build/cocos2d_samples.xcodeproj/project.pbxproj
	cocos/scripting/lua/bindings/LuaScriptHandlerMgr.h
	cocos/scripting/lua/script/Cocos2dConstants.lua
 2013-11-01 17:17:21 +08:00
CocosRobot 8aac938531 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-01 07:42:11 +00:00
CocosRobot 6eb6809b2c [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-01 06:52:31 +00:00
James Chen db6bce4cf0 Merge pull request #4023 from samuele3hu/developHttp 
issue #3049:Add XMLHttpRequest lua binding and corresponding test sample
 2013-10-31 20:40:29 -07:00
James Chen 3a8c052ae5 Merge pull request #4039 from dumganhar/spv25 
issue #2826: Bug fix of 'js::IsInRequest'
 2013-10-31 19:56:09 -07:00
James Chen baccf828f3 closed #2826: Removing js::IsInRequest in ScriptingCore.cpp for win32. 2013-11-01 10:45:01 +08:00
James Chen 074f688d95 Merge pull request #4030 from dumganhar/spv25 
[sp v25] Updating SpiderMonkey library to FFv25.
 2013-10-31 07:08:09 -07:00
samuelhu 4031556398 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developHttp 
Conflicts:
	build/cocos2d_samples.xcodeproj/project.pbxproj
	samples/Lua/TestLua/Resources/luaScript/mainMenu.lua
 2013-10-31 21:57:24 +08:00
samuelhu 5891f00967 issue #3037:Add assetsmananger lua binding and a releated test sample 2013-10-31 21:52:28 +08:00
James Chen 8884c58ac1 issue #2826: Updating ScriptingCore.cpp. runScript small fix. 2013-10-31 21:03:06 +08:00
samuelhu 7c45ddafe2 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2013-10-31 17:22:14 +08:00
James Chen 4b2429186c closed #3093: The last test of OpenglTest crashes on Windows. 2013-10-31 16:27:00 +08:00
samuelhu de4b4dcc73 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developLuaOcBridge 2013-10-31 15:23:25 +08:00
samuelhu faf3b30e9b issue #3069:Add LuaObjectCBridge and related test sample 2013-10-31 15:20:53 +08:00
James Chen f478e2d2a5 issue #2826: Bug fixes for win32. 2013-10-31 15:15:52 +08:00
James Chen 6f978c5cbd issue #2826: Bug fixes after using Spidermonkey v25. Adding JSB_AUTOCOMPARTMENT_WITH_GLOBAL_OBJCET macro. 2013-10-31 15:13:49 +08:00
dingpinglv 7e8faed7af fixed #3048: rename some comments 2013-10-31 14:36:17 +08:00
dingpinglv f172abbc14 fixed #3048: add some comments for cc.rect 2013-10-31 14:31:25 +08:00
dingpinglv c116d070d3 Closed #3048: cc.rect can receiving different type parameters now 2013-10-31 14:16:42 +08:00
James Chen 0f7a99f898 [sp v25] Don't use 'using namespace std;' to make android build happy. 2013-10-31 11:15:18 +08:00
James Chen 541a0478ac [sp v25] Removing unused comments in main.js 2013-10-31 11:15:18 +08:00
James Chen d2fc29dbfa [sp v25] Updating Debugger script. 2013-10-31 11:15:17 +08:00
James Chen a81998ccf6 [sp v25] Debugger script, loading file is ok. 2013-10-31 11:15:17 +08:00
James Chen d1b88b0a78 [sp v25] Updating auto-generated and bindings-generated submodules. 2013-10-31 11:15:17 +08:00
James Chen 3b86d6398f [sp v25] Fixing complication errors after updating Spidermonkey to v25. 2013-10-31 11:15:17 +08:00
samuelhu 1f07a659a6 issue #3069:Modify layer lua register and add some compatible lua binding functions 2013-10-31 09:49:04 +08:00
samuelhu c08a09a7e0 #3049:Add LICENSE_JSON4LUA and some constant values. 2013-10-30 10:52:04 +08:00
samuelhu 471bbb8af9 issue #3049:Add XMLHttpRequest lua binding and corresponding test sample 2013-10-29 18:21:15 +08:00
samuelhu b611177a65 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developHttp 2013-10-29 17:58:00 +08:00
samuelhu 70082ddc29 issue #3409:Add XMLHttpRequest lua binding and corresponding test sample 2013-10-29 17:54:35 +08:00
James Chen bb568e84e8 Updating auto generated binding codes. 2013-10-29 15:09:13 +08:00
samuelhu 3508213615 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developHttp 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2013-10-29 11:45:19 +08:00
samuelhu a4d028e905 issue #3409:Add XMLHttpRequest lua binding and corresponding test sample 2013-10-29 11:40:41 +08:00
James Chen 48ce5e39fe EventDispatcher is managed by Director now, like Scheduler and ActionManager. 2013-10-26 15:04:01 +08:00
James Chen 1339ef7ecb [JSB] These are only for v2.x JSB compatibility after removing controller codes in Layer. 2013-10-25 15:20:06 +08:00
James Chen a56475e872 Updating jsb. 2013-10-25 10:53:46 +08:00
Dhilan007 56ef197146 update the reference to cocos2d-x repo. 2013-10-24 18:36:36 +08:00
Dhilan007 fd993e2fa2 issues #2905:split jsbinding module 2013-10-24 17:54:57 +08:00
samuelhu d7689073e0 issue #3049:Add XMLHttpRequest lua binding and corresponding test sample 2013-10-24 11:12:21 +08:00
samuelhu 26caaa0a36 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager 2013-10-23 09:57:21 +08:00
minggo abcf8f268d fix conflicts 2013-10-22 18:36:13 +08:00
minggo 6a664d480a issue #2905:samples build ok on linux 2013-10-22 18:01:56 +08:00
samuelhu 5f769b2313 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager 2013-10-22 16:52:44 +08:00
James Chen feee6ca84b Merge pull request #3978 from HoGarfield/cc.RESOLUTION_POLICY 
Add cc.RESOLUTION_POLICY to jsb_cocos2d.js,so it can use setDesignResolutionSize in cc.EGLView
 2013-10-22 01:34:44 -07:00
samuelhu be1f17ca0f issue #3037:Add assetsmananger lua binding and a releated test sample 2013-10-22 16:14:49 +08:00
garfield_ho 55d45081f6 Fixed name 2013-10-22 15:41:43 +08:00
Dhilan007 232f0d598b issues #2905:add new vs project 2013-10-21 22:21:11 +08:00
Dhilan007 f11dba586a issue #2905:modification vs-project for folder structure change 2013-10-21 22:09:21 +08:00
garfield_ho 54ac8f3537 Add cc.RESOLUTION_POLICY to jsb_cocos2d.js,so it can use setDesignResolutionSize in cc.EGLView 2013-10-19 16:44:14 +08:00
dualface 8f2f524f2d fix tolua_fix, cleanup peertable after object deleted 2013-10-18 11:30:28 +08:00
James Chen 39afa3b8df Merge pull request #3967 from dumganhar/change-url 
Changing the submodule URL for 'auto-generated'.
 2013-10-17 19:00:36 -07:00
James Chen 8c0d7e151c Updating the submodule reference of 'auto-generated'. 2013-10-18 10:02:47 +08:00
minggo 9c3cac759c issue #2905:simple game and assets manager build ok on android 2013-10-17 18:39:37 +08:00
minggo e50f9fc43b issue #2905: jsbinding samples and lua binding samples build ok on android 2013-10-17 15:04:30 +08:00
minggo 8f9756f030 issue #2905:TestJavascript build ok on Android 2013-10-17 11:28:57 +08:00
James Chen afe2b8e0c1 Update auto-generated submodule manually. 2013-10-16 17:37:34 +08:00
James Chen 225738ecc5 issue #2905: [iOS Mac] HelloLua and TestLua work now. 2013-10-16 17:19:02 +08:00
James Chen 352d1f6768 issue #2905: Renaming lua/cocos2dx_support to lua/bindings. 2013-10-16 16:40:07 +08:00
James Chen 6fba0dd5db issue #2905: [iOS Mac] TestJavascript works now. 2013-10-16 15:43:59 +08:00
James Chen f6275667bf Removing unused ios projects. 2013-10-12 15:02:28 +08:00
James Chen 7de6646213 Don't ignore (D|d)ebugXXX folders or files. And move scripting/javascript/bindings/js to 'scripting/javascript/script/' folder. 2013-10-12 14:56:40 +08:00
minggo 5acbe663e0 issue #2905: add missing files 2013-10-12 13:44:57 +08:00
minggo ad6325b0dd fix conflicts 2013-10-12 11:31:32 +08:00
minggo 4313c46e93 issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00