From b3cc7d7e688c1d639ec0a232a4af872bc78c81e8 Mon Sep 17 00:00:00 2001 From: James Chen Date: Mon, 23 Dec 2013 20:25:11 +0800 Subject: [PATCH 1/7] Bindings-generator skips Node::setContentSize. Binds it manually. --- tools/tojs/cocos2dx.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/tojs/cocos2dx.ini b/tools/tojs/cocos2dx.ini index 9f17145f6a..ba177b8a27 100644 --- a/tools/tojs/cocos2dx.ini +++ b/tools/tojs/cocos2dx.ini @@ -37,7 +37,7 @@ classes_need_extend = Node Layer.* Sprite MenuItemFont Scene DrawNode # will apply to all class names. This is a convenience wildcard to be able to skip similar named # functions from all classes. -skip = Node::[^setPosition$ setGrid setGLServerState description getUserObject .*UserData getGLServerState .*schedule], +skip = Node::[^setPosition$ setGrid setGLServerState description getUserObject .*UserData getGLServerState .*schedule setContentSize], Sprite::[getQuad getBlendFunc ^setPosition$ setBlendFunc], SpriteBatchNode::[getBlendFunc setBlendFunc getDescendants], MotionStreak::[getBlendFunc setBlendFunc draw update], From 3096c3431145d2fa90a79e27f2ffa98083e31e0e Mon Sep 17 00:00:00 2001 From: James Chen Date: Mon, 23 Dec 2013 20:25:46 +0800 Subject: [PATCH 2/7] Removes unneeded binding glue codes, Sprite::setPosition. --- .../javascript/bindings/cocos2d_specifics.cpp.REMOVED.git-id | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cocos/scripting/javascript/bindings/cocos2d_specifics.cpp.REMOVED.git-id b/cocos/scripting/javascript/bindings/cocos2d_specifics.cpp.REMOVED.git-id index fb16fc8a01..4e31a5e98a 100644 --- a/cocos/scripting/javascript/bindings/cocos2d_specifics.cpp.REMOVED.git-id +++ b/cocos/scripting/javascript/bindings/cocos2d_specifics.cpp.REMOVED.git-id @@ -1 +1 @@ -80b25c13bca3a2d8adfc68a899c732103f68e0f5 \ No newline at end of file +3ea69b3bde8950d0af9d3a2d25c04bdb0e085f00 \ No newline at end of file From 92ee688b731d593dbf07c430f601c1a7f30b3e41 Mon Sep 17 00:00:00 2001 From: James Chen Date: Mon, 23 Dec 2013 20:26:13 +0800 Subject: [PATCH 3/7] Updates js tests to the latest version. --- samples/Javascript/Shared | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/Javascript/Shared b/samples/Javascript/Shared index 148868f7f4..24c7cad588 160000 --- a/samples/Javascript/Shared +++ b/samples/Javascript/Shared @@ -1 +1 @@ -Subproject commit 148868f7f4407a12444f07cb5e5378b1dbd7511c +Subproject commit 24c7cad588c85c5ddc83d1a380203913607ebd4a From b08995ae67138e530a9f29c6376ce181a5828209 Mon Sep 17 00:00:00 2001 From: James Chen Date: Mon, 23 Dec 2013 21:14:55 +0800 Subject: [PATCH 4/7] Updates JS-tests to the latest version. --- samples/Javascript/Shared | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/Javascript/Shared b/samples/Javascript/Shared index 24c7cad588..fda861cde4 160000 --- a/samples/Javascript/Shared +++ b/samples/Javascript/Shared @@ -1 +1 @@ -Subproject commit 24c7cad588c85c5ddc83d1a380203913607ebd4a +Subproject commit fda861cde4387948e95811966d9c4ceea04dc758 From 5f17984826e54f9fcd8a30c7d41c13ee59256e88 Mon Sep 17 00:00:00 2001 From: James Chen Date: Mon, 23 Dec 2013 21:53:23 +0800 Subject: [PATCH 5/7] =?UTF-8?q?Don=E2=80=99t=20hide=20parent=E2=80=99s=20a?= =?UTF-8?q?ddChild=20method=20in=20TMXLayer=20class.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cocos/2d/CCTMXLayer.h | 1 + 1 file changed, 1 insertion(+) diff --git a/cocos/2d/CCTMXLayer.h b/cocos/2d/CCTMXLayer.h index b2d254fac4..31cd4b9cbd 100644 --- a/cocos/2d/CCTMXLayer.h +++ b/cocos/2d/CCTMXLayer.h @@ -185,6 +185,7 @@ public: /** TMXLayer doesn't support adding a Sprite manually. @warning addchild(z, tag); is not supported on TMXLayer. Instead of setTileGID. */ + using SpriteBatchNode::addChild; virtual void addChild(Node * child, int zOrder, int tag) override; // super method void removeChild(Node* child, bool cleanup) override; From 3327614a999945668d0dc23928b92a37a8ff9aab Mon Sep 17 00:00:00 2001 From: James Chen Date: Mon, 23 Dec 2013 21:54:02 +0800 Subject: [PATCH 6/7] Binds Node::setAnchorPoint manually. --- .../javascript/bindings/cocos2d_specifics.cpp.REMOVED.git-id | 2 +- tools/tojs/cocos2dx.ini | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cocos/scripting/javascript/bindings/cocos2d_specifics.cpp.REMOVED.git-id b/cocos/scripting/javascript/bindings/cocos2d_specifics.cpp.REMOVED.git-id index 4e31a5e98a..333d98180a 100644 --- a/cocos/scripting/javascript/bindings/cocos2d_specifics.cpp.REMOVED.git-id +++ b/cocos/scripting/javascript/bindings/cocos2d_specifics.cpp.REMOVED.git-id @@ -1 +1 @@ -3ea69b3bde8950d0af9d3a2d25c04bdb0e085f00 \ No newline at end of file +4ff49d7d50964fb117a48243d728d75dd6d5ef77 \ No newline at end of file diff --git a/tools/tojs/cocos2dx.ini b/tools/tojs/cocos2dx.ini index ba177b8a27..b95333b068 100644 --- a/tools/tojs/cocos2dx.ini +++ b/tools/tojs/cocos2dx.ini @@ -37,7 +37,7 @@ classes_need_extend = Node Layer.* Sprite MenuItemFont Scene DrawNode # will apply to all class names. This is a convenience wildcard to be able to skip similar named # functions from all classes. -skip = Node::[^setPosition$ setGrid setGLServerState description getUserObject .*UserData getGLServerState .*schedule setContentSize], +skip = Node::[^setPosition$ setGrid setGLServerState description getUserObject .*UserData getGLServerState .*schedule setContentSize setAnchorPoint], Sprite::[getQuad getBlendFunc ^setPosition$ setBlendFunc], SpriteBatchNode::[getBlendFunc setBlendFunc getDescendants], MotionStreak::[getBlendFunc setBlendFunc draw update], From d6850c363aabb6a53b19d8cbf6360901e79ec421 Mon Sep 17 00:00:00 2001 From: James Chen Date: Mon, 23 Dec 2013 22:00:11 +0800 Subject: [PATCH 7/7] Updates Bindings-generator. --- tools/bindings-generator | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/bindings-generator b/tools/bindings-generator index 5f412d0b3a..1b34f5852f 160000 --- a/tools/bindings-generator +++ b/tools/bindings-generator @@ -1 +1 @@ -Subproject commit 5f412d0b3a4eadba3d2abd750de87d1b0e219e0a +Subproject commit 1b34f5852fcf494499be7eb5ce2bada72a0b16a2