Merge pull request cocos2d#14684 from CocosRobot/update_lua_bindings_1450153784

[ci skip][AUTO]: updating luabinding & jsbinding automatically

Author: pandamicro

cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_auto_api.js

@@ -12011,6 +12011,16 @@ float
 {
 },
 
+/**
+ * @method getWidth
+ * @return {float}
+ */
+getWidth : function (
+)
+{
+    return 0;
+},
+
 /**
  * @method getString
  * @return {String}
@@ -12081,6 +12091,16 @@ float
 {
 },
 
+/**
+ * @method getAdditionalKerning
+ * @return {float}
+ */
+getAdditionalKerning : function (
+)
+{
+    return 0;
+},
+
 /**
  * @method getBMFontSize
  * @return {float}
@@ -12111,6 +12131,16 @@ getHorizontalAlignment : function (
     return 0;
 },
 
+/**
+ * @method getShadowOffset
+ * @return {size_object}
+ */
+getShadowOffset : function (
+)
+{
+    return cc.Size;
+},
+
 /**
  * @method setClipMarginEnabled
  * @param {bool} arg0
@@ -12141,6 +12171,16 @@ str
 {
 },
 
+/**
+ * @method getOutlineSize
+ * @return {int}
+ */
+getOutlineSize : function (
+)
+{
+    return 0;
+},
+
 /**
  * @method setBMFontFilePath
  * @param {String} arg0
@@ -12270,15 +12310,25 @@ int
 },
 
 /**
- * @method getAdditionalKerning
+ * @method getShadowBlurRadius
  * @return {float}
  */
-getAdditionalKerning : function (
+getShadowBlurRadius : function (
 )
 {
     return 0;
 },
 
+/**
+ * @method getEffectColor
+ * @return {color4f_object}
+ */
+getEffectColor : function (
+)
+{
+    return cc.Color4F;
+},
+
 /**
  * @method removeAllChildrenWithCleanup
  * @param {bool} arg0
@@ -12367,6 +12417,16 @@ getLineHeight : function (
     return 0;
 },
 
+/**
+ * @method getShadowColor
+ * @return {color4f_object}
+ */
+getShadowColor : function (
+)
+{
+    return cc.Color4F;
+},
+
 /**
  * @method getTTFConfig
  * @return {cc._ttfConfig}
@@ -12420,13 +12480,13 @@ float
 },
 
 /**
- * @method getWidth
- * @return {float}
+ * @method isShadowEnabled
+ * @return {bool}
  */
-getWidth : function (
+isShadowEnabled : function (
 )
 {
-    return 0;
+    return false;
 },
 
 /**
@@ -12519,6 +12579,16 @@ isWrapEnabled : function (
     return false;
 },
 
+/**
+ * @method getLabelEffectType
+ * @return {cc.LabelEffect}
+ */
+getLabelEffectType : function (
+)
+{
+    return 0;
+},
+
 /**
  * @method setAlignment
 * @param {cc.TextHAlignment|cc.TextHAlignment} texthalignment
@@ -23463,27 +23533,4 @@ getInstance : function (
  */
 cc.ComponentJS = {
 
-/**
- * @method create
- * @param {String} arg0
- * @return {cc.ComponentJS}
- */
-create : function (
-str 
-)
-{
-    return cc.ComponentJS;
-},
-
-/**
- * @method ComponentJS
- * @constructor
- * @param {String} arg0
- */
-ComponentJS : function (
-str 
-)
-{
-},
-
 };

cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_extension_auto_api.js

@@ -548,11 +548,13 @@ getCurrentTitle : function(
  * @method initWithLabelAndBackgroundSprite
  * @param {cc.Node} arg0
  * @param {ccui.Scale9Sprite} arg1
+ * @param {bool} arg2
  * @return {bool}
  */
 initWithLabelAndBackgroundSprite : function (
 node, 
-scale9sprite 
+scale9sprite, 
+bool 
 )
 {
     return false;
@@ -582,15 +584,15 @@ state
 
 /**
  * @method create
-* @param {ccui.Scale9Sprite|cc.Node|String} scale9sprite
-* @param {ccui.Scale9Sprite|String} scale9sprite
-* @param {float} float
-* @return {cc.ControlButton|cc.ControlButton|cc.ControlButton|cc.ControlButton}
+* @param {ccui.Scale9Sprite|cc.Node|String|cc.Node} scale9sprite
+* @param {ccui.Scale9Sprite|String|ccui.Scale9Sprite} scale9sprite
+* @param {float|bool} float
+* @return {cc.ControlButton|cc.ControlButton|cc.ControlButton|cc.ControlButton|cc.ControlButton}
 */
 create : function(
-str,
-str,
-float 
+node,
+scale9sprite,
+bool 
 )
 {
     return cc.ControlButton;

cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_ui_auto_api.js

@@ -2383,6 +2383,16 @@ labeleffect
 {
 },
 
+/**
+ * @method getLabelEffectType
+ * @return {cc.LabelEffect}
+ */
+getLabelEffectType : function (
+)
+{
+    return 0;
+},
+
 /**
  * @method getTextColor
  * @return {color4b_object}
@@ -2423,6 +2433,16 @@ bool
 {
 },
 
+/**
+ * @method getShadowOffset
+ * @return {size_object}
+ */
+getShadowOffset : function (
+)
+{
+    return cc.Size;
+},
+
 /**
  * @method setString
  * @param {String} arg0
@@ -2433,6 +2453,16 @@ str
 {
 },
 
+/**
+ * @method getOutlineSize
+ * @return {int}
+ */
+getOutlineSize : function (
+)
+{
+    return 0;
+},
+
 /**
  * @method init
  * @param {String} arg0
@@ -2449,6 +2479,16 @@ float
     return false;
 },
 
+/**
+ * @method getShadowBlurRadius
+ * @return {float}
+ */
+getShadowBlurRadius : function (
+)
+{
+    return 0;
+},
+
 /**
  * @method isTouchScaleChangeEnabled
  * @return {bool}
@@ -2511,6 +2551,16 @@ int
 {
 },
 
+/**
+ * @method getEffectColor
+ * @return {color4b_object}
+ */
+getEffectColor : function (
+)
+{
+    return cc.Color4B;
+},
+
 /**
  * @method getType
  * @return {ccui.Text::Type}
@@ -2531,6 +2581,16 @@ getTextHorizontalAlignment : function (
     return 0;
 },
 
+/**
+ * @method isShadowEnabled
+ * @return {bool}
+ */
+isShadowEnabled : function (
+)
+{
+    return false;
+},
+
 /**
  * @method setFontSize
  * @param {float} arg0
@@ -2541,6 +2601,16 @@ float
 {
 },
 
+/**
+ * @method getShadowColor
+ * @return {color4b_object}
+ */
+getShadowColor : function (
+)
+{
+    return cc.Color4B;
+},
+
 /**
  * @method setTextColor
  * @param {color4b_object} arg0