samuele3hu
8fa8eaf64d
issue #3956:Remove some unrelated modification
2014-02-24 10:08:00 +08:00
samuele3hu
ac88d70d58
issue #3956:Update the related compile file
2014-02-24 10:01:00 +08:00
samuele3hu
a765178a5f
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developDynamic
2014-02-24 09:38:08 +08:00
samuele3hu
8cbe22b12b
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developFix
2014-02-23 20:57:45 +08:00
samuele3hu
5f28e6bd72
Replace “cc.object” with “cc.ref” for lua binding
2014-02-23 20:56:49 +08:00
CocosRobot
e306c53d21
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-02-23 09:21:10 +00:00
samuele3hu
293ea66401
issue #3956:Remove the usage of “tolua.cast”
2014-02-21 16:22:35 +08:00
CocosRobot
2eadbefaeb
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-02-21 03:48:50 +00:00
samuele3hu
e436aa4022
issue #3956:Replace Object with Ref
2014-02-21 10:22:03 +08:00
samuele3hu
555ef20202
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developDynamic
...
Conflicts:
cocos/scripting/lua/bindings/LuaBasicConversions.h
cocos/scripting/lua/bindings/lua_cocos2dx_physics_manual.cpp
2014-02-21 10:10:20 +08:00
samuele3hu
3532665520
issue #3956:Change tolua_fix.c to tolua_fix.cpp and modify the toluafix_pushusertype_ccobject function to get real type of object
2014-02-21 09:45:33 +08:00
CocosRobot
6f2f35ab7a
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-02-20 13:11:20 +00:00
CocosRobot
9e061b751a
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-02-20 09:52:15 +00:00
samuele3hu
e2596bce8b
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developEventTrigger
...
Conflicts:
tools/tojs/cocos2dx.ini
tools/tolua/cocos2dx.ini
2014-02-20 17:20:51 +08:00
CocosRobot
01bd61839b
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-02-20 07:38:05 +00:00
James Chen
e2cb0e3ba5
Reverts auto-generated submodule.
2014-02-20 15:14:55 +08:00
James Chen
0af0ce9032
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss4058-ref-step1
...
Conflicts:
cocos/scripting/auto-generated
2014-02-20 15:13:40 +08:00
samuele3hu
7b85ffcb82
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developEventTrigger
2014-02-20 15:11:56 +08:00
samuele3hu
514112921f
close #4094:Add deprected support for EGLView and EGLViewProtocol on the lua binding
2014-02-20 15:10:34 +08:00
James Chen
f7c8eb8de2
Merge pull request #5394 from samuele3hu/developEventTrigger
...
issue #3229:The second param of glGetProgramiv which was called in the tolua_Cocos2d_glGetUniformfv00 was wrong
2014-02-20 12:44:53 +08:00
CocosRobot
66906c3f66
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-02-20 03:38:12 +00:00
James Chen
5e6130c92c
issue #4058 : Get rid of Object ,rename it to Ref.
2014-02-20 10:53:49 +08:00
samuele3hu
e1387f40eb
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developEventTrigger
2014-02-19 16:57:18 +08:00
CocosRobot
1f45dd4349
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-02-19 08:27:37 +00:00
samuele3hu
d7b0efd6d7
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developEventTrigger
2014-02-19 16:27:08 +08:00
samuele3hu
ce1656fa8d
fix: The lua binding of getPropertiesForGID would lead to compile error
2014-02-19 15:47:45 +08:00
samuele3hu
52a0b906da
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developEventTrigger
2014-02-19 13:58:15 +08:00
CocosRobot
4ecd7ba58d
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-02-19 05:58:15 +00:00
samuele3hu
d28e8485ec
issue #3229:Lua version of GLGetUniformTest raise error on iOS when calling glGetUniformfv
2014-02-19 13:56:06 +08:00
James Chen
e1a256d6f1
Merge pull request #5319 from samuele3hu/developDynamic
...
issue #3956:Add the conversional functions which are used in the templates of lua binding-generator
2014-02-19 13:52:08 +08:00
CocosRobot
97ff6c5bdf
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-02-18 08:04:14 +00:00
samuele3hu
5acb556c74
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developEventTrigger
2014-02-18 13:46:21 +08:00
samuele3hu
8cb424b535
close #3593:Add more test cases about SceneReader of cocoStudio
2014-02-18 13:44:11 +08:00
xingsenma
1ec2d35631
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_20140103
2014-02-17 10:12:49 +08:00
CocosRobot
a5a8ff2d87
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-02-14 06:22:19 +00:00
James Chen
c7b1ab4525
Merge pull request #5362 from ucchen/develop
...
closed #4037 : fix copy-paste error, all spxxx_to_jsval use lower case;
2014-02-14 14:17:33 +08:00
ucchen
185ed86214
fix copy-paste error, all spxxx_to_jsval use lower case and add missing data structs getAttachment;
2014-02-14 13:24:56 +08:00
CocosRobot
104e0b4b29
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-02-14 03:24:11 +00:00
James Chen
78163e604e
Merge pull request #5358 from dumganhar/merge5343
...
closed #4037:Exposed the missing data structures of Spine to JS
2014-02-14 11:17:38 +08:00
James Chen
32012ee72a
Adds missing files for vs.
2014-02-14 10:53:30 +08:00
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