From 4d46a03797d4f8357a641fd7e97ec0959a590fb3 Mon Sep 17 00:00:00 2001 From: zhangbin Date: Tue, 28 Jul 2015 14:54:42 +0800 Subject: [PATCH 1/4] Solve the error : the VS release configuration of lua template cause `cocos run` error. --- .../frameworks/runtime-src/proj.win32/HelloLua.vcxproj | 1 - 1 file changed, 1 deletion(-) diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj b/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj index 0bc39b97e9..cdb0085d2a 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj +++ b/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj @@ -159,7 +159,6 @@ xcopy "$(ProjectDir)..\..\..\src" "$(LocalDebuggerWorkingDirectory)\src" /D /E / libcurl_imp.lib;websockets.lib;%(AdditionalDependencies);$(_COCOS_LIB_WIN32_BEGIN);$(_COCOS_LIB_WIN32_END) libcmt.lib true - $(ProjectDir)../../../simulator/win32/$(TargetName)$(TargetExt) 0x0409 From 8bc96a10b436e0e23a6286992dd1bc7274201002 Mon Sep 17 00:00:00 2001 From: zhangbin Date: Tue, 28 Jul 2015 15:06:28 +0800 Subject: [PATCH 2/4] Update the reference of submodule cocos2d-console. --- tools/cocos2d-console | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/cocos2d-console b/tools/cocos2d-console index f3768083be..99ea6cb519 160000 --- a/tools/cocos2d-console +++ b/tools/cocos2d-console @@ -1 +1 @@ -Subproject commit f3768083be951e019a2983703847e05b2e284e7d +Subproject commit 99ea6cb519c1b11567985684d0d08d2205ae5607 From 6e7c3c636f9800887f752d7bf9e7e5b808b2aa9b Mon Sep 17 00:00:00 2001 From: CocosRobot Date: Tue, 28 Jul 2015 07:11:50 +0000 Subject: [PATCH 3/4] [AUTO][ci skip]: updating cocos2dx_files.json --- templates/cocos2dx_files.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/cocos2dx_files.json b/templates/cocos2dx_files.json index dbfa64bf3b..09fd4d8c70 100644 --- a/templates/cocos2dx_files.json +++ b/templates/cocos2dx_files.json @@ -6524,6 +6524,7 @@ "cocos/scripting/lua-bindings/auto/api/Blink.lua", "cocos/scripting/lua-bindings/auto/api/Bone.lua", "cocos/scripting/lua-bindings/auto/api/BoneData.lua", + "cocos/scripting/lua-bindings/auto/api/BoneNode.lua", "cocos/scripting/lua-bindings/auto/api/Bundle3D.lua", "cocos/scripting/lua-bindings/auto/api/Button.lua", "cocos/scripting/lua-bindings/auto/api/CCBAnimationManager.lua", @@ -6802,6 +6803,7 @@ "cocos/scripting/lua-bindings/auto/api/SimpleAudioEngine.lua", "cocos/scripting/lua-bindings/auto/api/Skeleton3D.lua", "cocos/scripting/lua-bindings/auto/api/SkeletonAnimation.lua", + "cocos/scripting/lua-bindings/auto/api/SkeletonNode.lua", "cocos/scripting/lua-bindings/auto/api/SkeletonRenderer.lua", "cocos/scripting/lua-bindings/auto/api/SkewBy.lua", "cocos/scripting/lua-bindings/auto/api/SkewFrame.lua", From faee3e7807492de012e01cfa07fc6ebddd5b3c20 Mon Sep 17 00:00:00 2001 From: XiaoFeng Date: Tue, 28 Jul 2015 18:11:07 +0800 Subject: [PATCH 4/4] Fix parser compatible for layer project file --- cocos/editor-support/cocostudio/FlatBuffersSerialize.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cocos/editor-support/cocostudio/FlatBuffersSerialize.cpp b/cocos/editor-support/cocostudio/FlatBuffersSerialize.cpp index d3bdc28464..699b303ac7 100644 --- a/cocos/editor-support/cocostudio/FlatBuffersSerialize.cpp +++ b/cocos/editor-support/cocostudio/FlatBuffersSerialize.cpp @@ -269,7 +269,7 @@ std::string FlatBuffersSerialize::serializeFlatBuffersWithXMLFile(const std::str else nameElem = nameElem->Next(); } - if (rootType == "GameNodeObjectData") // for adaptate old version + if (rootType == "GameNodeObjectData" || rootType == "GameLayerObjectData") // for adaptate old version rootType = "NodeObjectData"; nodeTree = createNodeTree(objectData, rootType); @@ -1318,7 +1318,7 @@ FlatBufferBuilder* FlatBuffersSerialize::createFlatBuffersWithXMLFileForSimulato else nameElem = nameElem->Next(); } - if (rootType == "GameNodeObjectData") // for adaptate old version + if (rootType == "GameNodeObjectData" || rootType == "GameLayerObjectData") // for adaptate old version rootType = "NodeObjectData"; nodeTree = createNodeTreeForSimulator(objectData, rootType); }