Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI

Conflicts: tools/project-creator/module/cocos_files.json
2014-01-06 20:07:39 +08:00 · 2014-01-06 20:07:39 +08:00 · ac46932c06
parent f36d4a9236 1ad6064c30
commit ac46932c06
28 changed files with 140 additions and 40 deletions
--- a/README.md
+++ b/README.md
@ -30,7 +30,7 @@ How to start a new game
 Example:

    $ cd cocos2d-x/tools/project-creator
-    $ ./project-creator.pyw -n mygame -k com.your_company.mygame -l cpp -p /home/mygame
+    $ ./project-creator.py -n mygame -k com.your_company.mygame -l cpp -p /home/mygame
    $ cd /home/mygame


--- a/cocos/2d/CCSpriteBatchNode.cpp
+++ b/cocos/2d/CCSpriteBatchNode.cpp
@ -97,8 +97,8 @@ bool SpriteBatchNode::initWithTexture(Texture2D *tex, ssize_t capacity)
    _children.reserve(capacity);

    _descendants.reserve(capacity);
-
-    setShaderProgram(ShaderCache::getInstance()->getProgram(GLProgram::SHADER_NAME_POSITION_TEXTURE_COLOR));
+    
+    setShaderProgram(ShaderCache::getInstance()->getProgram(GLProgram::SHADER_NAME_POSITION_TEXTURE_COLOR_NO_MVP));
    return true;
 }

@ -355,15 +355,13 @@ void SpriteBatchNode::draw()
    for(const auto &child: _children)
        child->updateTransform();

-    auto shader = ShaderCache::getInstance()->getProgram(GLProgram::SHADER_NAME_POSITION_TEXTURE_COLOR_NO_MVP);
-
    kmMat4 mv;
    kmGLGetMatrix(KM_GL_MODELVIEW, &mv);

    _quadCommand.init(0,
              _vertexZ,
              _textureAtlas->getTexture()->getName(),
-              shader,
+              _shaderProgram,
              _blendFunc,
              _textureAtlas->getQuads(),
              _textureAtlas->getTotalQuads(),
--- a/cocos/base/CCValue.cpp
+++ b/cocos/base/CCValue.cpp
@ -594,6 +594,51 @@ std::string Value::asString() const
    return ret.str();
 }

+ValueVector& Value::asValueVector()
+{
+	if (nullptr == _vectorData)
+		_vectorData = new ValueVector();
+	return *_vectorData;
+}
+
+const ValueVector& Value::asValueVector() const
+{
+	static const ValueVector EMPTY_VALUEVECTOR;
+	if (nullptr == _vectorData)
+		return EMPTY_VALUEVECTOR;
+	return *_vectorData; 
+}
+
+ValueMap& Value::asValueMap()
+{
+	if (nullptr == _mapData)
+		_mapData = new ValueMap();
+	return *_mapData;
+}
+
+const ValueMap& Value::asValueMap() const
+{
+	static const ValueMap EMPTY_VALUEMAP;
+	if (nullptr == _mapData)
+		return EMPTY_VALUEMAP;
+	return *_mapData;
+}
+
+ValueMapIntKey& Value::asIntKeyMap()
+{
+	if (nullptr == _intKeyMapData)
+		_intKeyMapData = new ValueMapIntKey();
+	return *_intKeyMapData;
+}
+
+const ValueMapIntKey& Value::asIntKeyMap() const
+{
+	static const ValueMapIntKey EMPTY_VALUEMAP_INT_KEY;
+	if (nullptr == _intKeyMapData)
+		return EMPTY_VALUEMAP_INT_KEY;
+	return *_intKeyMapData;
+}
+
 static std::string getTabs(int depth)
 {
    std::string tabWidth;
--- a/cocos/base/CCValue.h
+++ b/cocos/base/CCValue.h
@ -94,14 +94,14 @@ public:
    bool asBool() const;
    std::string asString() const;
    
-    inline ValueVector& asValueVector() { return *_vectorData; }
-    inline const ValueVector& asValueVector() const { return *_vectorData; }
+    ValueVector& asValueVector();
+    const ValueVector& asValueVector() const;
    
-    inline ValueMap& asValueMap() { return *_mapData; }
-    inline const ValueMap& asValueMap() const { return *_mapData; }
+    ValueMap& asValueMap();
+    const ValueMap& asValueMap() const;
    
-    inline ValueMapIntKey& asIntKeyMap() { return *_intKeyMapData; }
-    inline const ValueMapIntKey& asIntKeyMap() const { return *_intKeyMapData; }
+    ValueMapIntKey& asIntKeyMap();
+    const ValueMapIntKey& asIntKeyMap() const;

    inline bool isNull() const { return _type == Type::NONE; }
    
--- a/cocos/editor-support/cocostudio/CCSSceneReader.cpp
+++ b/cocos/editor-support/cocostudio/CCSSceneReader.cpp
@ -146,7 +146,7 @@ Node* SceneReader::createObject(const rapidjson::Value &dict, cocos2d::Node* par
 				}
 				else
 				{
-					CC_SAFE_RELEASE(com);
+					CC_SAFE_RELEASE_NULL(com);
 				}
 			}
            if(_fnSelector != nullptr)
--- a/cocos/gui/UILayout.cpp
+++ b/cocos/gui/UILayout.cpp
@ -85,6 +85,7 @@ _currentAlphaTestRef(1)

 Layout::~Layout()
 {
+    CC_SAFE_RELEASE(_clippingStencil);
 }
    
 void Layout::onEnter()
--- a/cocos/gui/UIText.cpp
+++ b/cocos/gui/UIText.cpp
@ -140,13 +140,11 @@ void Text::setScale(float fScale)
 void Text::setScaleX(float fScaleX)
 {
    Widget::setScaleX(fScaleX);
-    _normalScaleValueX = fScaleX;
 }
    
 void Text::setScaleY(float fScaleY)
 {
    Widget::setScaleY(fScaleY);
-    _normalScaleValueY = fScaleY;
 }

 bool Text::isTouchScaleChangeEnabled()
@ -169,6 +167,8 @@ void Text::onPressStateChangedToPressed()
    {
        return;
    }
+    _normalScaleValueX = getScaleX();
+    _normalScaleValueY = getScaleY();
    clickScale(_normalScaleValueX + _onSelectedScaleOffset, _normalScaleValueY + _onSelectedScaleOffset);
 }

--- a/samples/Cpp/TestCpp/Classes/AppDelegate.cpp
+++ b/samples/Cpp/TestCpp/Classes/AppDelegate.cpp
@ -49,7 +49,7 @@ bool AppDelegate::applicationDidFinishLaunching()
 		searchPaths.push_back("hd/scenetest/AttributeComponentTest");
 		searchPaths.push_back("hd/scenetest/BackgroundComponentTest");
 		searchPaths.push_back("hd/scenetest/EffectComponentTest");
-		searchPaths.push_back("hd/scenetest/loadSceneEdtiorFileTest");
+		searchPaths.push_back("hd/scenetest/LoadSceneEdtiorFileTest");
 		searchPaths.push_back("hd/scenetest/ParticleComponentTest");
 		searchPaths.push_back("hd/scenetest/SpriteComponentTest");
 		searchPaths.push_back("hd/scenetest/TmxMapComponentTest");
@ -63,7 +63,7 @@ bool AppDelegate::applicationDidFinishLaunching()
 		searchPaths.push_back("scenetest/AttributeComponentTest");
 		searchPaths.push_back("scenetest/BackgroundComponentTest");
 		searchPaths.push_back("scenetest/EffectComponentTest");
-		searchPaths.push_back("scenetest/loadSceneEdtiorFileTest");
+		searchPaths.push_back("scenetest/LoadSceneEdtiorFileTest");
 		searchPaths.push_back("scenetest/ParticleComponentTest");
 		searchPaths.push_back("scenetest/SpriteComponentTest");
 		searchPaths.push_back("scenetest/TmxMapComponentTest");
--- a/samples/Cpp/TestCpp/Classes/Box2DTestBed/TestEntries.cpp
+++ b/samples/Cpp/TestCpp/Classes/Box2DTestBed/TestEntries.cpp
@ -120,7 +120,6 @@ TestEntry g_testEntries[] =
 	{"Slider Crank", SliderCrank::Create},
 	{"Varying Friction", VaryingFriction::Create},
 	{"Add Pair Stress Test", AddPair::Create},
-	{NULL, NULL}
 };

 int g_totalEntries = sizeof(g_testEntries) / sizeof(g_testEntries[0]);
--- a/samples/Cpp/TestCpp/Classes/NewEventDispatcherTest/NewEventDispatcherTest.cpp
+++ b/samples/Cpp/TestCpp/Classes/NewEventDispatcherTest/NewEventDispatcherTest.cpp
@ -749,6 +749,15 @@ std::string RemoveListenerAfterAddingTest::subtitle() const
 //
 //DirectorEventTest
 //
+DirectorEventTest::DirectorEventTest()
+:_count1(0)
+,_count2(0)
+,_count3(0)
+,_count4(0)
+{
+
+}
+
 void DirectorEventTest::onEnter()
 {
    EventDispatcherTestDemo::onEnter();
--- a/samples/Cpp/TestCpp/Classes/NewEventDispatcherTest/NewEventDispatcherTest.h
+++ b/samples/Cpp/TestCpp/Classes/NewEventDispatcherTest/NewEventDispatcherTest.h
@ -117,6 +117,7 @@ class DirectorEventTest : public EventDispatcherTestDemo
 {
 public:
    CREATE_FUNC(DirectorEventTest);
+    DirectorEventTest();
    virtual void onEnter() override;
    virtual void onExit() override;

--- a/samples/Cpp/TestCpp/Classes/ParticleTest/ParticleTest.cpp
+++ b/samples/Cpp/TestCpp/Classes/ParticleTest/ParticleTest.cpp
@ -1568,8 +1568,6 @@ void MultipleParticleSystemsBatched::onEnter()
        batchNode->addChild(particleSystem);
    }

-    batchNode->release();
-
    _emitter = NULL;
 }

--- a/samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceAllocTest.cpp
+++ b/samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceAllocTest.cpp
@ -477,5 +477,4 @@ void runAllocPerformanceTest()
    scene->initWithQuantityOfNodes(kNodesIncrease);
    
    Director::getInstance()->replaceScene(scene);
-    scene->release();
 }
--- a/samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceNodeChildrenTest.cpp
+++ b/samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceNodeChildrenTest.cpp
@ -978,5 +978,4 @@ void runNodeChildrenTest()
    scene->initWithQuantityOfNodes(kNodesIncrease);

    Director::getInstance()->replaceScene(scene);
-    scene->release();
 }
--- a/samples/Cpp/TestCpp/Classes/TouchesTest/TouchesTest.cpp
+++ b/samples/Cpp/TestCpp/Classes/TouchesTest/TouchesTest.cpp
@ -43,7 +43,6 @@ PongLayer::PongLayer()
    _ball->setPosition( VisibleRect::center() );
    _ball->setVelocity( _ballStartingVelocity );
    addChild( _ball );
-    _ball->retain();
    
    auto paddleTexture = Director::getInstance()->getTextureCache()->addImage(s_Paddle);
    
@ -77,7 +76,6 @@ PongLayer::PongLayer()

 PongLayer::~PongLayer()
 {
-    _ball->release();
 }

 void PongLayer::resetAndScoreBallForPlayer(int player)
@ -102,7 +100,6 @@ void PongLayer::doStep(float delta)
        resetAndScoreBallForPlayer( kLowPlayer );
    else if (_ball->getPosition().y < VisibleRect::bottom().y-_ball->radius())
        resetAndScoreBallForPlayer( kHighPlayer );
-    _ball->draw();
 } 

 void PongScene::runThisTest()
--- a/samples/Cpp/TestCpp/Classes/UnitTest/UnitTest.cpp
+++ b/samples/Cpp/TestCpp/Classes/UnitTest/UnitTest.cpp
@ -343,7 +343,6 @@ void TemplateMapTest::onEnter()
    Map<std::string, Node*> map1;
    CCASSERT(map1.empty(), "");
    CCASSERT(map1.size() == 0, "");
-    CCASSERT(map1.bucketCount() == 0, "");
    CCASSERT(map1.keys().empty(), "");
    CCASSERT(map1.keys(Node::create()).empty(), "");

--- a/samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj
+++ b/samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj
@ -168,6 +168,8 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$
    <ClCompile Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UITextFieldTest\UITextFieldTest.cpp" />
    <ClCompile Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UIWidgetAddNodeTest\UIWidgetAddNodeTest.cpp" />
    <ClCompile Include="..\Classes\ExtensionsTest\CocoStudioSceneTest\SceneEditorTest.cpp" />
+    <ClCompile Include="..\Classes\ExtensionsTest\CocoStudioSceneTest\TriggerCode\acts.cpp" />
+    <ClCompile Include="..\Classes\ExtensionsTest\CocoStudioSceneTest\TriggerCode\cons.cpp" />
    <ClCompile Include="..\Classes\ExtensionsTest\ControlExtensionTest\CCControlPotentiometerTest\CCControlPotentiometerTest.cpp" />
    <ClCompile Include="..\Classes\ExtensionsTest\ControlExtensionTest\CCControlStepperTest\CCControlStepperTest.cpp" />
    <ClCompile Include="..\Classes\ExtensionsTest\EditBoxTest\EditBoxTest.cpp" />
@ -311,6 +313,9 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$
    <ClInclude Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UITextFieldTest\UITextFieldTest.h" />
    <ClInclude Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UIWidgetAddNodeTest\UIWidgetAddNodeTest.h" />
    <ClInclude Include="..\Classes\ExtensionsTest\CocoStudioSceneTest\SceneEditorTest.h" />
+    <ClInclude Include="..\Classes\ExtensionsTest\CocoStudioSceneTest\TriggerCode\acts.h" />
+    <ClInclude Include="..\Classes\ExtensionsTest\CocoStudioSceneTest\TriggerCode\cons.h" />
+    <ClInclude Include="..\Classes\ExtensionsTest\CocoStudioSceneTest\TriggerCode\EventDef.h" />
    <ClInclude Include="..\Classes\ExtensionsTest\ControlExtensionTest\CCControlPotentiometerTest\CCControlPotentiometerTest.h" />
    <ClInclude Include="..\Classes\ExtensionsTest\ControlExtensionTest\CCControlStepperTest\CCControlStepperTest.h" />
    <ClInclude Include="..\Classes\ExtensionsTest\EditBoxTest\EditBoxTest.h" />
--- a/samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj.filters
+++ b/samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj.filters
@ -304,6 +304,9 @@
    <Filter Include="Classes\UnitTest">
      <UniqueIdentifier>{1821914f-c088-4946-8c1e-19ab57b5eabc}</UniqueIdentifier>
    </Filter>
+    <Filter Include="Classes\ExtensionsTest\CocoStudioSceneTest\TriggerCode">
+      <UniqueIdentifier>{5ff3af4e-0610-480b-b297-8f407e12f369}</UniqueIdentifier>
+    </Filter>
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="main.cpp">
@ -627,9 +630,6 @@
    <ClCompile Include="..\Classes\ExtensionsTest\CocoStudioComponentsTest\SceneController.cpp">
      <Filter>Classes\ExtensionsTest\CocoStudioComponentsTest</Filter>
    </ClCompile>
-    <ClCompile Include="..\Classes\ExtensionsTest\CocoStudioSceneTest\SceneEditorTest.cpp">
-      <Filter>Classes\ExtensionsTest\CocoStudioSceneTest</Filter>
-    </ClCompile>
    <ClCompile Include="..\Classes\ShaderTest\ShaderTest2.cpp" />
    <ClCompile Include="..\Classes\NewEventDispatcherTest\NewEventDispatcherTest.cpp">
      <Filter>Classes\NewEventDispatcherTest</Filter>
@ -706,6 +706,15 @@
    <ClCompile Include="..\Classes\UnitTest\UnitTest.cpp">
      <Filter>Classes\UnitTest</Filter>
    </ClCompile>
+    <ClCompile Include="..\Classes\ExtensionsTest\CocoStudioSceneTest\SceneEditorTest.cpp">
+      <Filter>Classes\ExtensionsTest\CocoStudioSceneTest</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Classes\ExtensionsTest\CocoStudioSceneTest\TriggerCode\acts.cpp">
+      <Filter>Classes\ExtensionsTest\CocoStudioSceneTest\TriggerCode</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Classes\ExtensionsTest\CocoStudioSceneTest\TriggerCode\cons.cpp">
+      <Filter>Classes\ExtensionsTest\CocoStudioSceneTest\TriggerCode</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="main.h">
@ -1206,9 +1215,6 @@
    <ClInclude Include="..\Classes\ExtensionsTest\CocoStudioComponentsTest\SceneController.h">
      <Filter>Classes\ExtensionsTest\CocoStudioComponentsTest</Filter>
    </ClInclude>
-    <ClInclude Include="..\Classes\ExtensionsTest\CocoStudioSceneTest\SceneEditorTest.h">
-      <Filter>Classes\ExtensionsTest\CocoStudioSceneTest</Filter>
-    </ClInclude>
    <ClInclude Include="..\Classes\ShaderTest\ShaderTest2.h" />
    <ClInclude Include="..\Classes\NewEventDispatcherTest\NewEventDispatcherTest.h">
      <Filter>Classes\NewEventDispatcherTest</Filter>
@ -1300,5 +1306,17 @@
    <ClInclude Include="..\Classes\UnitTest\UnitTest.h">
      <Filter>Classes\UnitTest</Filter>
    </ClInclude>
+    <ClInclude Include="..\Classes\ExtensionsTest\CocoStudioSceneTest\SceneEditorTest.h">
+      <Filter>Classes\ExtensionsTest\CocoStudioSceneTest</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Classes\ExtensionsTest\CocoStudioSceneTest\TriggerCode\acts.h">
+      <Filter>Classes\ExtensionsTest\CocoStudioSceneTest\TriggerCode</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Classes\ExtensionsTest\CocoStudioSceneTest\TriggerCode\cons.h">
+      <Filter>Classes\ExtensionsTest\CocoStudioSceneTest\TriggerCode</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Classes\ExtensionsTest\CocoStudioSceneTest\TriggerCode\EventDef.h">
+      <Filter>Classes\ExtensionsTest\CocoStudioSceneTest\TriggerCode</Filter>
+    </ClInclude>
  </ItemGroup>
 </Project>
--- a/samples/Javascript/TestJavascript/Classes/AppDelegate.cpp
+++ b/samples/Javascript/TestJavascript/Classes/AppDelegate.cpp
@ -59,7 +59,7 @@ bool AppDelegate::applicationDidFinishLaunching()
        "res/scenetest/AttributeComponentTest",
        "res/scenetest/BackgroundComponentTest",
        "res/scenetest/EffectComponentTest",
-        "res/scenetest/loadSceneEdtiorFileTest",
+        "res/scenetest/LoadSceneEdtiorFileTest",
        "res/scenetest/ParticleComponentTest",
        "res/scenetest/SpriteComponentTest",
        "res/scenetest/TmxMapComponentTest",
--- a/samples/Lua/HelloLua/proj.win32/HelloLua.vcxproj
+++ b/samples/Lua/HelloLua/proj.win32/HelloLua.vcxproj
@ -168,6 +168,9 @@
    <ProjectReference Include="..\..\..\..\cocos\editor-support\cocostudio\proj.win32\libCocosStudio.vcxproj">
      <Project>{b57cf53f-2e49-4031-9822-047cc0e6bde2}</Project>
    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\cocos\editor-support\spine\proj.win32\libSpine.vcxproj">
+      <Project>{b7c2a162-dec9-4418-972e-240ab3cbfcae}</Project>
+    </ProjectReference>
    <ProjectReference Include="..\..\..\..\cocos\gui\proj.win32\libGUI.vcxproj">
      <Project>{7e06e92c-537a-442b-9e4a-4761c84f8a1a}</Project>
    </ProjectReference>
--- a/template/multi-platform-lua/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
+++ b/template/multi-platform-lua/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
@ -7,6 +7,12 @@
 	objects = {

 /* Begin PBXBuildFile section */
+		01A8D331187A504A001CC002 /* CocoStudio.lua in Resources */ = {isa = PBXBuildFile; fileRef = 01A8D32E187A5049001CC002 /* CocoStudio.lua */; };
+		01A8D332187A504A001CC002 /* CocoStudio.lua in Resources */ = {isa = PBXBuildFile; fileRef = 01A8D32E187A5049001CC002 /* CocoStudio.lua */; };
+		01A8D333187A504A001CC002 /* extern.lua in Resources */ = {isa = PBXBuildFile; fileRef = 01A8D32F187A504A001CC002 /* extern.lua */; };
+		01A8D334187A504A001CC002 /* extern.lua in Resources */ = {isa = PBXBuildFile; fileRef = 01A8D32F187A504A001CC002 /* extern.lua */; };
+		01A8D335187A504A001CC002 /* GuiConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 01A8D330187A504A001CC002 /* GuiConstants.lua */; };
+		01A8D336187A504A001CC002 /* GuiConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 01A8D330187A504A001CC002 /* GuiConstants.lua */; };
 		15A8A4441834C43700142BE0 /* libchipmunk iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A4291834BDA200142BE0 /* libchipmunk iOS.a */; };
 		15A8A4451834C43700142BE0 /* libcocos2dx iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A4251834BDA200142BE0 /* libcocos2dx iOS.a */; };
 		15A8A4461834C43700142BE0 /* libcocos2dx-extensions iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A4271834BDA200142BE0 /* libcocos2dx-extensions iOS.a */; };
@ -219,6 +225,9 @@
 /* End PBXContainerItemProxy section */

 /* Begin PBXFileReference section */
+		01A8D32E187A5049001CC002 /* CocoStudio.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CocoStudio.lua; path = ../cocos2d/cocos/scripting/lua/script/CocoStudio.lua; sourceTree = "<group>"; };
+		01A8D32F187A504A001CC002 /* extern.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = extern.lua; path = ../cocos2d/cocos/scripting/lua/script/extern.lua; sourceTree = "<group>"; };
+		01A8D330187A504A001CC002 /* GuiConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = GuiConstants.lua; path = ../cocos2d/cocos/scripting/lua/script/GuiConstants.lua; sourceTree = "<group>"; };
 		15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = cocos2d_libs.xcodeproj; path = ../cocos2d/build/cocos2d_libs.xcodeproj; sourceTree = "<group>"; };
 		15A8A4551834C6AD00142BE0 /* AudioEngine.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = AudioEngine.lua; path = ../cocos2d/cocos/scripting/lua/script/AudioEngine.lua; sourceTree = "<group>"; };
 		15A8A4561834C6AD00142BE0 /* CCBReaderLoad.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CCBReaderLoad.lua; path = ../cocos2d/cocos/scripting/lua/script/CCBReaderLoad.lua; sourceTree = "<group>"; };
@ -370,6 +379,9 @@
 		1A0227A417A3AA1A00B867AD /* Lua Common */ = {
 			isa = PBXGroup;
 			children = (
+				01A8D32E187A5049001CC002 /* CocoStudio.lua */,
+				01A8D32F187A504A001CC002 /* extern.lua */,
+				01A8D330187A504A001CC002 /* GuiConstants.lua */,
 				15A8A4551834C6AD00142BE0 /* AudioEngine.lua */,
 				15A8A4561834C6AD00142BE0 /* CCBReaderLoad.lua */,
 				15A8A4571834C6AD00142BE0 /* Cocos2d.lua */,
@ -722,6 +734,9 @@
 				5023815717EBBCE400990C9B /* menu2.png in Resources */,
 				5023817617EBBE3400990C9B /* Icon.icns in Resources */,
 				15A8A4651834C6AD00142BE0 /* AudioEngine.lua in Resources */,
+				01A8D332187A504A001CC002 /* CocoStudio.lua in Resources */,
+				01A8D334187A504A001CC002 /* extern.lua in Resources */,
+				01A8D336187A504A001CC002 /* GuiConstants.lua in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@ -772,6 +787,9 @@
 				5023811A17EBBCAC00990C9B /* Default.png in Resources */,
 				5091733817ECE17A00D62437 /* Icon-50.png in Resources */,
 				5023812117EBBCAC00990C9B /* Icon-72.png in Resources */,
+				01A8D331187A504A001CC002 /* CocoStudio.lua in Resources */,
+				01A8D333187A504A001CC002 /* extern.lua in Resources */,
+				01A8D335187A504A001CC002 /* GuiConstants.lua in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
--- a/template/multi-platform-lua/proj.linux/build.sh
+++ b/template/multi-platform-lua/proj.linux/build.sh
@ -12,7 +12,7 @@ cd ../cocos2d
 sudo ./build/install-deps-linux.sh
 mkdir -p linux-build
 cd linux-build
-cmake .. -DBUILD_LIBS_LUA=OFF -DBUILD_HelloCpp=OFF -DBUILD_TestCpp=OFF -DBUILD_HelloLua=OFF -DBUILD_TestLua=OFF
+cmake .. -DBUILD_HelloCpp=OFF -DBUILD_TestCpp=OFF -DBUILD_HelloLua=OFF -DBUILD_TestLua=OFF
 make -j4

 #make bin
@ -24,3 +24,4 @@ cmake  ../..
 make -j4
 cd ..
 mv ../bin bin
+cp ../cocos2d/cocos/scripting/lua/script/* bin/Resources
--- a/template/multi-platform-lua/proj.win32/HelloLua.sln
+++ b/template/multi-platform-lua/proj.win32/HelloLua.sln
@ -4,6 +4,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloLua", "HelloLua.vcxproj", "{4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}"
 	ProjectSection(ProjectDependencies) = postProject
 		{21B2C324-891F-48EA-AD1A-5AE13DE12E28} = {21B2C324-891F-48EA-AD1A-5AE13DE12E28}
+		{B7C2A162-DEC9-4418-972E-240AB3CBFCAE} = {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}
 		{DDC3E27F-004D-4DD4-9DD3-931A013D2159} = {DDC3E27F-004D-4DD4-9DD3-931A013D2159}
 		{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} = {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}
 		{207BC7A9-CCF1-4F2F-A04D-45F72242AE25} = {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}
@ -33,6 +34,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCocosStudio", "..\cocos2
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGUI", "..\cocos2d\cocos\gui\proj.win32\libGUI.vcxproj", "{7E06E92C-537A-442B-9E4A-4761C84F8A1A}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine", "..\cocos2d\cocos\editor-support\spine\proj.win32\libSpine.vcxproj", "{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@ -79,6 +82,10 @@ Global
 		{7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Debug|Win32.Build.0 = Debug|Win32
 		{7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Release|Win32.ActiveCfg = Release|Win32
 		{7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Release|Win32.Build.0 = Release|Win32
+		{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|Win32.Build.0 = Debug|Win32
+		{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Release|Win32.ActiveCfg = Release|Win32
+		{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/template/multi-platform-lua/proj.win32/HelloLua.vcxproj
+++ b/template/multi-platform-lua/proj.win32/HelloLua.vcxproj
@ -186,6 +186,9 @@ xcopy /Y /Q "$(ProjectDir)..\cocos2d\external\websockets\prebuilt\win32\*.*" "$(
    </ProjectReference>
    <ProjectReference Include="..\cocos2d\cocos\editor-support\cocostudio\proj.win32\libCocosStudio.vcxproj">
      <Project>{b57cf53f-2e49-4031-9822-047cc0e6bde2}</Project>
+    </ProjectReference>
+	<ProjectReference Include="..\cocos2d\cocos\editor-support\spine\proj.win32\libSpine.vcxproj">
+      <Project>{b7c2a162-dec9-4418-972e-240ab3cbfcae}</Project>
    </ProjectReference>
    <ProjectReference Include="..\cocos2d\cocos\gui\proj.win32\libGUI.vcxproj">
      <Project>{7e06e92c-537a-442b-9e4a-4761c84f8a1a}</Project>
--- a/tools/project-creator/README.md
+++ b/tools/project-creator/README.md
@ -5,11 +5,11 @@ First you need install python environment.
 There have double ways create new cocos project.
 Notice:The best of generate path is english path.
 ##1.UI
-* Windows: double click "create_project.pyw" file
-* Mac: ./create_project.pyw
+* Windows: double click "create_project.py" file
+* Mac: ./create_project.py
 * Linux: The tkinter was not installed in the linux's default python,therefore, in order to use the gui operate, you have to install the tkinter libaray manually. There is another way to create project by command line.  see below for details
 ##2.console
 	$ cd cocos2d-x/tools/project-creator
-	$ ./project-creator.pyw --help
-	$ ./project-creator.pyw -n mygame -k com.your_company.mygame -l cpp -p /home/mygame
+	$ ./project-creator.py --help
+	$ ./project-creator.py -n mygame -k com.your_company.mygame -l cpp -p /home/mygame
 	$ cd /home/mygame
--- a/tools/project-creator/config-create/create_config.py
+++ b/tools/project-creator/config-create/create_config.py
--- a/tools/project-creator/module/cocos_files.json.REMOVED.git-id
+++ b/tools/project-creator/module/cocos_files.json.REMOVED.git-id
@ -1 +1 @@
-83d4ef65b31281ef8759505d8f90b3172b99992b
+38cec06f1800d6da4cd716605c71efaac195bae5
--- a/tools/project-creator/module/core.py
+++ b/tools/project-creator/module/core.py
@ -197,7 +197,7 @@ class CocosProject:
                else:
                    if os.path.exists(dstfile):
                        os.remove(dstfile)
-                    shutil.copyfile(srcfile, dstfile)
+                    shutil.copy(srcfile, dstfile)
            self.step = self.step + 1
            if self.callbackfun and self.step%int(self.totalStep/50) == 0:
                self.callbackfun(self.step,self.totalStep,fileList[index])