Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4610 from dumganhar/lastest-js-test 

Updates JS-test to the latest version and some binding fixes
This commit is contained in:
James Chen 2013-12-23 06:04:49 -08:00
parent 9e1801a1b8 d6850c363a
commit 44f9009a5d
5 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cocos/2d/CCTMXLayer.h
View File

@ -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;

2
cocos/scripting/javascript/bindings/cocos2d_specifics.cpp.REMOVED.git-id
View File

@ -1 +1 @@
80b25c13bca3a2d8adfc68a899c732103f68e0f5
4ff49d7d50964fb117a48243d728d75dd6d5ef77

2
samples/Javascript/Shared

@ -1 +1 @@
Subproject commit 148868f7f4407a12444f07cb5e5378b1dbd7511c
Subproject commit fda861cde4387948e95811966d9c4ceea04dc758

2
tools/bindings-generator

@ -1 +1 @@
Subproject commit 5f412d0b3a4eadba3d2abd750de87d1b0e219e0a
Subproject commit 1b34f5852fcf494499be7eb5ce2bada72a0b16a2

2
tools/tojs/cocos2dx.ini
View File

@ -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 setAnchorPoint],
Sprite::[getQuad getBlendFunc ^setPosition$ setBlendFunc],
SpriteBatchNode::[getBlendFunc setBlendFunc getDescendants],
MotionStreak::[getBlendFunc setBlendFunc draw update],