Merge pull request #1 from cocos2d/master

merge

Author: VisualSJ

README.md

@@ -2,7 +2,12 @@
 
 cocos2d-js
 ===========
-Cocos2d-JS provides a console tool that makes the development of CH5 and JSB application more simpler and much convenient. You can use it to create a new project, publish it to android, iOS, Mac OS or web, and it's very easy to use.
+
+Cocos2d-JS is Cocos2d-x engine's javascript version. It support full Cocos2d-x features with a set of simplified javascript friendly APIs.
+
+Cocos2d-JS provides a consistent development experience for whichever platform you want to distribute to, both web and native. "Code once, run everywhere" is incredibly easy and natural in Cocos2d-JS. With one single javascript code base, you can run your game on both web browsers and native platform including Mac OS, Windows, iOS, Android. This will bring your game great opportunities in almost all canals of distribution.
+
+Furthermore, javascript friendly API makes your game development experience a breeze, easy to code, test and distribute. Cocos2d-JS also offers Cocos Console, a script tool, to simplify the creation of projects and let you start coding right away. You can use it to create a new project and publish it to android, iOS, Mac OS or web.
 
 ##Setup
 

frameworks/cocos2d-html5

@@ -328,20 +328,6 @@ getFragmentShaderLog : function (
     return ;
 },
 
-/**
- * @method initWithByteArrays
- * @param {char} arg0
- * @param {char} arg1
- * @return {bool}
- */
-initWithByteArrays : function (
-char, 
-char 
-)
-{
-    return false;
-},
-
 /**
  * @method bindAttribLocation
  * @param {char} arg0
@@ -368,20 +354,6 @@ int
 {
 },
 
-/**
- * @method initWithFilenames
- * @param {String} arg0
- * @param {String} arg1
- * @return {bool}
- */
-initWithFilenames : function (
-str, 
-str 
-)
-{
-    return false;
-},
-
 /**
  * @method getUniformLocationForName
  * @param {char} arg0
@@ -413,23 +385,41 @@ getVertexShaderLog : function (
 },
 
 /**
- * @method setUniformsForBuiltins
-* @param {kmMat4} kmmat4
-*/
-setUniformsForBuiltins : function(
-kmmat4 
+ * @method initWithByteArrays
+ * @param {char} arg0
+ * @param {char} arg1
+ * @return {bool}
+ */
+initWithByteArrays : function (
+char, 
+char 
 )
 {
+    return false;
 },
 
 /**
- * @method getMaterialProgramID
- * @return {unsigned int}
+ * @method initWithFilenames
+ * @param {String} arg0
+ * @param {String} arg1
+ * @return {bool}
  */
-getMaterialProgramID : function (
+initWithFilenames : function (
+str, 
+str 
+)
+{
+    return false;
+},
+
+/**
+ * @method setUniformsForBuiltins
+* @param {kmMat4} kmmat4
+*/
+setUniformsForBuiltins : function(
+kmmat4 
 )
 {
-    return 0;
 },
 
 /**
@@ -497,15 +487,13 @@ char
 },
 
 /**
- * @method setUniformLocationWith1i
- * @param {int} arg0
- * @param {int} arg1
+ * @method link
+ * @return {bool}
  */
-setUniformLocationWith1i : function (
-int, 
-int 
+link : function (
 )
 {
+    return false;
 },
 
 /**
@@ -589,13 +577,15 @@ int
 },
 
 /**
- * @method link
- * @return {bool}
+ * @method setUniformLocationWith1i
+ * @param {int} arg0
+ * @param {int} arg1
  */
-link : function (
+setUniformLocationWith1i : function (
+int, 
+int 
 )
 {
-    return false;
 },
 
 /**
@@ -1177,6 +1167,16 @@ Texture2D : function (
  */
 cc.EventListener = {
 
+/**
+ * @method setEnabled
+ * @param {bool} arg0
+ */
+setEnabled : function (
+bool 
+)
+{
+},
+
 /**
  * @method clone
  * @return {cc.EventListener}
@@ -1187,6 +1187,16 @@ clone : function (
     return cc.EventListener;
 },
 
+/**
+ * @method isEnabled
+ * @return {bool}
+ */
+isEnabled : function (
+)
+{
+    return false;
+},
+
 /**
  * @method checkAvailable
  * @return {bool}
@@ -3145,11 +3155,13 @@ getDelayPerUnit : function (
  * @method initWithSpriteFrames
  * @param {Array} arg0
  * @param {float} arg1
+ * @param {unsigned int} arg2
  * @return {bool}
  */
 initWithSpriteFrames : function (
 array, 
-float 
+float, 
+int 
 )
 {
     return false;
@@ -7885,18 +7897,16 @@ AtlasNode : function (
 cc.DrawNode = {
 
 /**
- * @method drawQuadraticBezier
+ * @method drawTriangle
  * @param {PointObject} arg0
  * @param {PointObject} arg1
  * @param {PointObject} arg2
- * @param {unsigned int} arg3
- * @param {Color4FObject} arg4
+ * @param {Color4FObject} arg3
  */
-drawQuadraticBezier : function (
+drawTriangle : function (
 point, 
 point, 
 point, 
-int, 
 color4f 
 )
 {
@@ -7922,22 +7932,6 @@ clear : function (
 {
 },
 
-/**
- * @method drawTriangle
- * @param {PointObject} arg0
- * @param {PointObject} arg1
- * @param {PointObject} arg2
- * @param {Color4FObject} arg3
- */
-drawTriangle : function (
-point, 
-point, 
-point, 
-color4f 
-)
-{
-},
-
 /**
  * @method init
  * @return {bool}
@@ -7962,6 +7956,24 @@ color4f
 {
 },
 
+/**
+ * @method drawQuadraticBezier
+ * @param {PointObject} arg0
+ * @param {PointObject} arg1
+ * @param {PointObject} arg2
+ * @param {unsigned int} arg3
+ * @param {Color4FObject} arg4
+ */
+drawQuadraticBezier : function (
+point, 
+point, 
+point, 
+int, 
+color4f 
+)
+{
+},
+
 /**
  * @method drawCubicBezier
  * @param {PointObject} arg0
@@ -15862,7 +15874,7 @@ getInstance : function (
 /**
  * @class SAXParser
  */
-cc.SAXParser = {
+cc.PlistParser = {
 
 /**
  * @method init
@@ -16341,12 +16353,12 @@ bool
 
 /**
  * @method getColorSpaceHolder
- * @return {Color3BObject}
+ * @return {Color4BObject}
  */
 getColorSpaceHolder : function (
 )
 {
-    return cc.Color3B;
+    return cc.Color4B;
 },
 
 /**
@@ -16371,9 +16383,9 @@ float
 
 /**
  * @method setColorSpaceHolder
- * @param {Color3BObject} arg0
- */
-setColorSpaceHolder : function (
+* @param {Color4BObject|Color3BObject} color4b
+*/
+setColorSpaceHolder : function(
 color3b 
 )
 {

frameworks/js-bindings/bindings/auto/api/jsb_cocos2dx_auto_api.js

@@ -32,12 +32,12 @@ float
 
 /**
  * @method initWithSpriteFrameName
-* @param {char|char} char
+* @param {String|String} str
 * @param {RectObject} rect
 * @return {bool|bool}
 */
 initWithSpriteFrameName : function(
-char,
+str,
 rect 
 )
 {
@@ -162,13 +162,13 @@ getOriginalSize : function (
 
 /**
  * @method initWithFile
-* @param {char|char|RectObject|char} char
-* @param {RectObject|RectObject|char} rect
+* @param {String|String|RectObject|String} str
+* @param {RectObject|RectObject|String} rect
 * @param {RectObject} rect
 * @return {bool|bool|bool|bool}
 */
 initWithFile : function(
-char,
+str,
 rect,
 rect 
 )
@@ -252,13 +252,13 @@ float
 
 /**
  * @method create
-* @param {char|RectObject|char|char} char
-* @param {RectObject|char|RectObject} rect
+* @param {String|RectObject|String|String} str
+* @param {RectObject|String|RectObject} rect
 * @param {RectObject} rect
 * @return {cc.Scale9Sprite|cc.Scale9Sprite|cc.Scale9Sprite|cc.Scale9Sprite|cc.Scale9Sprite}
 */
 create : function(
-char,
+str,
 rect,
 rect 
 )
@@ -268,12 +268,12 @@ rect
 
 /**
  * @method createWithSpriteFrameName
-* @param {char|char} char
+* @param {String|String} str
 * @param {RectObject} rect
 * @return {cc.Scale9Sprite|cc.Scale9Sprite}
 */
 createWithSpriteFrameName : function(
-char,
+str,
 rect 
 )
 {