Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
dualface 2015-07-29 09:17:53 +08:00
parent 6d16d1674d 9f39134669
commit d9c5600f41
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cocos/editor-support/cocostudio/FlatBuffersSerialize.cpp
View File

@ -269,7 +269,7 @@ std::string FlatBuffersSerialize::serializeFlatBuffersWithXMLFile(const std::str
else else
nameElem = nameElem->Next(); nameElem = nameElem->Next();
} }
if (rootType == "GameNodeObjectData") // for adaptate old version if (rootType == "GameNodeObjectData" || rootType == "GameLayerObjectData") // for adaptate old version
rootType = "NodeObjectData"; rootType = "NodeObjectData";
nodeTree = createNodeTree(objectData, rootType); nodeTree = createNodeTree(objectData, rootType);
@ -1318,7 +1318,7 @@ FlatBufferBuilder* FlatBuffersSerialize::createFlatBuffersWithXMLFileForSimulato
else else
nameElem = nameElem->Next(); nameElem = nameElem->Next();
} }
if (rootType == "GameNodeObjectData") // for adaptate old version if (rootType == "GameNodeObjectData" || rootType == "GameLayerObjectData") // for adaptate old version
rootType = "NodeObjectData"; rootType = "NodeObjectData";
nodeTree = createNodeTreeForSimulator(objectData, rootType); nodeTree = createNodeTreeForSimulator(objectData, rootType);
} }

2
templates/cocos2dx_files.json
View File

@ -6524,6 +6524,7 @@
"cocos/scripting/lua-bindings/auto/api/Blink.lua", "cocos/scripting/lua-bindings/auto/api/Blink.lua",
"cocos/scripting/lua-bindings/auto/api/Bone.lua", "cocos/scripting/lua-bindings/auto/api/Bone.lua",
"cocos/scripting/lua-bindings/auto/api/BoneData.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/Bundle3D.lua",
"cocos/scripting/lua-bindings/auto/api/Button.lua", "cocos/scripting/lua-bindings/auto/api/Button.lua",
"cocos/scripting/lua-bindings/auto/api/CCBAnimationManager.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/SimpleAudioEngine.lua",
"cocos/scripting/lua-bindings/auto/api/Skeleton3D.lua", "cocos/scripting/lua-bindings/auto/api/Skeleton3D.lua",
"cocos/scripting/lua-bindings/auto/api/SkeletonAnimation.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/SkeletonRenderer.lua",
"cocos/scripting/lua-bindings/auto/api/SkewBy.lua", "cocos/scripting/lua-bindings/auto/api/SkewBy.lua",
"cocos/scripting/lua-bindings/auto/api/SkewFrame.lua", "cocos/scripting/lua-bindings/auto/api/SkewFrame.lua",

1
templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj
View File

@ -159,7 +159,6 @@ xcopy "$(ProjectDir)..\..\..\src" "$(LocalDebuggerWorkingDirectory)\src" /D /E /
<AdditionalDependencies>libcurl_imp.lib;websockets.lib;%(AdditionalDependencies);$(_COCOS_LIB_WIN32_BEGIN);$(_COCOS_LIB_WIN32_END)</AdditionalDependencies> <AdditionalDependencies>libcurl_imp.lib;websockets.lib;%(AdditionalDependencies);$(_COCOS_LIB_WIN32_BEGIN);$(_COCOS_LIB_WIN32_END)</AdditionalDependencies>
<IgnoreSpecificDefaultLibraries>libcmt.lib</IgnoreSpecificDefaultLibraries> <IgnoreSpecificDefaultLibraries>libcmt.lib</IgnoreSpecificDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<OutputFile>$(ProjectDir)../../../simulator/win32/$(TargetName)$(TargetExt)</OutputFile>
</Link> </Link>
<ResourceCompile> <ResourceCompile>
<Culture>0x0409</Culture> <Culture>0x0409</Culture>

2
tools/cocos2d-console

@ -1 +1 @@
Subproject commit f3768083be951e019a2983703847e05b2e284e7d Subproject commit 99ea6cb519c1b11567985684d0d08d2205ae5607