Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_adjust

.gitignore

@@ -103,6 +103,7 @@ CMakeCache.txt
 CMakeFiles
 Makefile
 cmake_install.cmake
+CMakeLists.txt.user
 
 # Ignore files generated by console
 build/build/

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

@@ -0,0 +1,146 @@
+
+--------------------------------
+-- @module CSLoader
+-- @parent_module cc
+
+--------------------------------
+-- 
+-- @function [parent=#CSLoader] createNodeFromJson 
+-- @param self
+-- @param #string filename
+-- @return Node#Node ret (return value: cc.Node)
+        
+--------------------------------
+-- 
+-- @function [parent=#CSLoader] createNodeFromProtocolBuffers 
+-- @param self
+-- @param #string filename
+-- @return Node#Node ret (return value: cc.Node)
+        
+--------------------------------
+-- 
+-- @function [parent=#CSLoader] init 
+-- @param self
+        
+--------------------------------
+-- 
+-- @function [parent=#CSLoader] setRecordXMLPath 
+-- @param self
+-- @param #bool record
+        
+--------------------------------
+-- 
+-- @function [parent=#CSLoader] setJsonPath 
+-- @param self
+-- @param #string jsonPath
+        
+--------------------------------
+-- 
+-- @function [parent=#CSLoader] loadNodeWithFile 
+-- @param self
+-- @param #string fileName
+-- @return Node#Node ret (return value: cc.Node)
+        
+--------------------------------
+-- 
+-- @function [parent=#CSLoader] loadNodeWithContent 
+-- @param self
+-- @param #string content
+-- @return Node#Node ret (return value: cc.Node)
+        
+--------------------------------
+-- 
+-- @function [parent=#CSLoader] isRecordProtocolBuffersPath 
+-- @param self
+-- @return bool#bool ret (return value: bool)
+        
+--------------------------------
+-- 
+-- @function [parent=#CSLoader] isRecordXMLPath 
+-- @param self
+-- @return bool#bool ret (return value: bool)
+        
+--------------------------------
+-- 
+-- @function [parent=#CSLoader] getProtocolBuffersPath 
+-- @param self
+-- @return string#string ret (return value: string)
+        
+--------------------------------
+-- 
+-- @function [parent=#CSLoader] getXMLPath 
+-- @param self
+-- @return string#string ret (return value: string)
+        
+--------------------------------
+-- 
+-- @function [parent=#CSLoader] createNodeFromXML 
+-- @param self
+-- @param #string filename
+-- @return Node#Node ret (return value: cc.Node)
+        
+--------------------------------
+-- 
+-- @function [parent=#CSLoader] isRecordJsonPath 
+-- @param self
+-- @return bool#bool ret (return value: bool)
+        
+--------------------------------
+-- 
+-- @function [parent=#CSLoader] setRecordProtocolBuffersPath 
+-- @param self
+-- @param #bool record
+        
+--------------------------------
+-- 
+-- @function [parent=#CSLoader] getJsonPath 
+-- @param self
+-- @return string#string ret (return value: string)
+        
+--------------------------------
+-- 
+-- @function [parent=#CSLoader] setRecordJsonPath 
+-- @param self
+-- @param #bool record
+        
+--------------------------------
+-- 
+-- @function [parent=#CSLoader] setProtocolBuffersPath 
+-- @param self
+-- @param #string protocolBuffersPath
+        
+--------------------------------
+-- 
+-- @function [parent=#CSLoader] purge 
+-- @param self
+        
+--------------------------------
+-- 
+-- @function [parent=#CSLoader] setXMLPath 
+-- @param self
+-- @param #string xmlPath
+        
+--------------------------------
+-- 
+-- @function [parent=#CSLoader] destroyInstance 
+-- @param self
+        
+--------------------------------
+-- 
+-- @function [parent=#CSLoader] createNode 
+-- @param self
+-- @param #string filename
+-- @return Node#Node ret (return value: cc.Node)
+        
+--------------------------------
+-- 
+-- @function [parent=#CSLoader] getInstance 
+-- @param self
+-- @return CSLoader#CSLoader ret (return value: cc.CSLoader)
+        
+--------------------------------
+-- 
+-- @function [parent=#CSLoader] CSLoader 
+-- @param self
+        
+return nil

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

@@ -1216,4 +1216,9 @@
 -- @field [parent=#cc] Component#Component Component preloaded module
 
 
+--------------------------------------------------------
+-- the cc CSLoader
+-- @field [parent=#cc] CSLoader#CSLoader CSLoader preloaded module
+
+
 return nil

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

@@ -1562,6 +1562,30 @@ int register_all_cocos2dx(lua_State* tolua_S);
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 

templates/cocos2dx_files.json

@@ -4250,6 +4250,7 @@
         "cocos/scripting/lua-bindings/auto/api/Button.lua", 
         "cocos/scripting/lua-bindings/auto/api/CCBAnimationManager.lua", 
         "cocos/scripting/lua-bindings/auto/api/CCBReader.lua", 
+        "cocos/scripting/lua-bindings/auto/api/CSLoader.lua", 
         "cocos/scripting/lua-bindings/auto/api/CallFunc.lua", 
         "cocos/scripting/lua-bindings/auto/api/Camera.lua", 
         "cocos/scripting/lua-bindings/auto/api/CardinalSplineBy.lua",