Merge pull request #7257 from CocosRobot/update_lua_bindings_1404121406

[AUTO]: updating luabinding automatically

cocos/scripting/lua-bindings/auto/api/ActionTimeline.lua

@@ -47,6 +47,11 @@
 -- @param self
 -- @return int#int ret (return value: int)
         
+--------------------------------
+-- @function [parent=#ActionTimeline] setCurrentFrame 
+-- @param self
+-- @param #int int
+        
 --------------------------------
 -- @function [parent=#ActionTimeline] setTimeSpeed 
 -- @param self
@@ -84,10 +89,13 @@
 --          
 -- overload function: gotoFrameAndPlay(int, int, bool)
 --          
+-- overload function: gotoFrameAndPlay(int, int, int, bool)
+--          
 -- @function [parent=#ActionTimeline] gotoFrameAndPlay
 -- @param self
 -- @param #int int
 -- @param #int int
+-- @param #int int
 -- @param #bool bool
 
 --------------------------------

cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.cpp

@@ -19605,6 +19605,52 @@ int lua_cocos2dx_studio_ActionTimeline_getEndFrame(lua_State* tolua_S)
 
     return 0;
 }
+int lua_cocos2dx_studio_ActionTimeline_setCurrentFrame(lua_State* tolua_S)
+{
+    int argc = 0;
+    cocostudio::timeline::ActionTimeline* cobj = nullptr;
+    bool ok  = true;
+
+#if COCOS2D_DEBUG >= 1
+    tolua_Error tolua_err;
+#endif
+
+
+#if COCOS2D_DEBUG >= 1
+    if (!tolua_isusertype(tolua_S,1,"ccs.ActionTimeline",0,&tolua_err)) goto tolua_lerror;
+#endif
+
+    cobj = (cocostudio::timeline::ActionTimeline*)tolua_tousertype(tolua_S,1,0);
+
+#if COCOS2D_DEBUG >= 1
+    if (!cobj) 
+    {
+        tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_studio_ActionTimeline_setCurrentFrame'", nullptr);
+        return 0;
+    }
+#endif
+
+    argc = lua_gettop(tolua_S)-1;
+    if (argc == 1) 
+    {
+        int arg0;
+
+        ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0);
+        if(!ok)
+            return 0;
+        cobj->setCurrentFrame(arg0);
+        return 0;
+    }
+    CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setCurrentFrame",argc, 1);
+    return 0;
+
+#if COCOS2D_DEBUG >= 1
+    tolua_lerror:
+    tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_studio_ActionTimeline_setCurrentFrame'.",&tolua_err);
+#endif
+
+    return 0;
+}
 int lua_cocos2dx_studio_ActionTimeline_setTimeSpeed(lua_State* tolua_S)
 {
     int argc = 0;
@@ -19941,7 +19987,30 @@ int lua_cocos2dx_studio_ActionTimeline_gotoFrameAndPlay(lua_State* tolua_S)
         }
     }while(0);
     ok  = true;
-    CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "gotoFrameAndPlay",argc, 3);
+    do{
+        if (argc == 4) {
+            int arg0;
+            ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0);
+
+            if (!ok) { break; }
+            int arg1;
+            ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1);
+
+            if (!ok) { break; }
+            int arg2;
+            ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2);
+
+            if (!ok) { break; }
+            bool arg3;
+            ok &= luaval_to_boolean(tolua_S, 5,&arg3);
+
+            if (!ok) { break; }
+            cobj->gotoFrameAndPlay(arg0, arg1, arg2, arg3);
+            return 0;
+        }
+    }while(0);
+    ok  = true;
+    CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "gotoFrameAndPlay",argc, 4);
     return 0;
 
 #if COCOS2D_DEBUG >= 1
@@ -20127,6 +20196,7 @@ int lua_register_cocos2dx_studio_ActionTimeline(lua_State* tolua_S)
         tolua_function(tolua_S,"getDuration",lua_cocos2dx_studio_ActionTimeline_getDuration);
         tolua_function(tolua_S,"addTimeline",lua_cocos2dx_studio_ActionTimeline_addTimeline);
         tolua_function(tolua_S,"getEndFrame",lua_cocos2dx_studio_ActionTimeline_getEndFrame);
+        tolua_function(tolua_S,"setCurrentFrame",lua_cocos2dx_studio_ActionTimeline_setCurrentFrame);
         tolua_function(tolua_S,"setTimeSpeed",lua_cocos2dx_studio_ActionTimeline_setTimeSpeed);
         tolua_function(tolua_S,"init",lua_cocos2dx_studio_ActionTimeline_init);
         tolua_function(tolua_S,"setDuration",lua_cocos2dx_studio_ActionTimeline_setDuration);

cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.hpp

@@ -489,6 +489,7 @@ int register_all_cocos2dx_studio(lua_State* tolua_S);
 
 
 
+
 
 
 #endif // __cocos2dx_studio_h__