From 00611f7ec1ffcf10c35fdc4598e2af81873b00a0 Mon Sep 17 00:00:00 2001 From: samuele3hu Date: Wed, 18 Jun 2014 11:47:43 +0800 Subject: [PATCH 1/3] Update cocos2dx_spine.ini --- tools/tolua/cocos2dx_spine.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/tolua/cocos2dx_spine.ini b/tools/tolua/cocos2dx_spine.ini index f1eefdea94..783e2a052e 100644 --- a/tools/tolua/cocos2dx_spine.ini +++ b/tools/tolua/cocos2dx_spine.ini @@ -37,7 +37,7 @@ classes = Skeleton SkeletonAnimation # functions from all classes. skip = Skeleton::[findBone findSlot getAttachment setAttachment update draw createWith.*], - SkeletonAnimation::[addAnimationState setAnimationStateData update createWith.* (s|g)etBlendFunc addAnimation getCurrent setAnimation onAnimationStateEvent] + SkeletonAnimation::[addAnimationState setAnimationStateData update createWith.* (s|g)etBlendFunc addAnimation getCurrent setAnimation] rename_functions = From 15d070f7fc363f55b8baca2c754d3b3f4a3881f4 Mon Sep 17 00:00:00 2001 From: samuele3hu Date: Wed, 18 Jun 2014 11:50:24 +0800 Subject: [PATCH 2/3] Update submodule --- tools/bindings-generator | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/bindings-generator b/tools/bindings-generator index 79153cce44..8768e84011 160000 --- a/tools/bindings-generator +++ b/tools/bindings-generator @@ -1 +1 @@ -Subproject commit 79153cce443f3efbfd79c08835c63ec58a6c1462 +Subproject commit 8768e84011ab7e254f7e1915a541e595c33a3a66 From 477816e883bc7063c9700a8334b6c7cfa9d9fe82 Mon Sep 17 00:00:00 2001 From: samuele3hu Date: Thu, 19 Jun 2014 14:42:09 +0800 Subject: [PATCH 3/3] update bindings-generator submodule --- tools/bindings-generator | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/bindings-generator b/tools/bindings-generator index 8768e84011..fdc2209f5f 160000 --- a/tools/bindings-generator +++ b/tools/bindings-generator @@ -1 +1 @@ -Subproject commit 8768e84011ab7e254f7e1915a541e595c33a3a66 +Subproject commit fdc2209f5fca3b369bd48d14e20418842ef05a6e