diff --git a/AUTHORS b/AUTHORS
index 13b5fa312a..2d5dfb7e5e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -14,6 +14,7 @@ Developers:
carlomorgantinizynga
CCLabelTTF supports for shadow and stroke
+ Adding CCLabelTTF::createWithFontDefinition.
James Gregory (j4m3z0r, Zynga)
Maintainer of Emscripten port.
@@ -447,6 +448,9 @@ Developers:
sunxiaoyu
Refactoring CCEditBox to add UITextField only when keyboard was opened, remove it when keyboard was closed.
+
+ edwardzhou (Edward Zhou)
+ Correcting the type detecting order for Lua CCBProxy::getNodeTypeName.
Retired Core Developers:
WenSheng Yang
diff --git a/cocos2dx/label_nodes/CCLabelTTF.cpp b/cocos2dx/label_nodes/CCLabelTTF.cpp
index dd375118b1..436094bef6 100644
--- a/cocos2dx/label_nodes/CCLabelTTF.cpp
+++ b/cocos2dx/label_nodes/CCLabelTTF.cpp
@@ -96,6 +96,18 @@ CCLabelTTF* CCLabelTTF::create(const char *string, const char *fontName, float f
return NULL;
}
+CCLabelTTF * CCLabelTTF::createWithFontDefinition(const char *string, ccFontDefinition &textDefinition)
+{
+ CCLabelTTF *pRet = new CCLabelTTF();
+ if(pRet && pRet->initWithStringAndTextDefinition(string, textDefinition))
+ {
+ pRet->autorelease();
+ return pRet;
+ }
+ CC_SAFE_DELETE(pRet);
+ return NULL;
+}
+
bool CCLabelTTF::init()
{
return this->initWithString("", "Helvetica", 12);
diff --git a/cocos2dx/label_nodes/CCLabelTTF.h b/cocos2dx/label_nodes/CCLabelTTF.h
index a5f950d5c3..487a89b0c2 100644
--- a/cocos2dx/label_nodes/CCLabelTTF.h
+++ b/cocos2dx/label_nodes/CCLabelTTF.h
@@ -70,6 +70,10 @@ public:
const CCSize& dimensions, CCTextAlignment hAlignment,
CCVerticalTextAlignment vAlignment);
+
+ /** Create a lable with string and a font definition*/
+ static CCLabelTTF * createWithFontDefinition(const char *string, ccFontDefinition &textDefinition);
+
/** initializes the CCLabelTTF with a font name and font size */
bool initWithString(const char *string, const char *fontName, float fontSize);
diff --git a/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxETCLoader.java b/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxETCLoader.java
index a21cd23af2..c9dbf435e0 100644
--- a/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxETCLoader.java
+++ b/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxETCLoader.java
@@ -65,7 +65,6 @@ public class Cocos2dxETCLoader {
texture = ETC1Util.createTexture(inputStream);
inputStream.close();
- assetManager.close();
} catch (Exception e) {
Log.d("Cocos2dx", "Unable to create texture for " + filePath);
@@ -73,6 +72,8 @@ public class Cocos2dxETCLoader {
}
if (texture != null) {
+ boolean ret = true;
+
try {
int width = texture.getWidth();
int height = texture.getHeight();
@@ -88,9 +89,10 @@ public class Cocos2dxETCLoader {
} catch (Exception e)
{
Log.d("invoke native function error", e.toString());
+ ret = false;
}
- return true;
+ return ret;
} else {
return false;
}
diff --git a/cocos2dx/proj.blackberry/.project b/cocos2dx/proj.blackberry/.project
index 8e6504b691..96e8967027 100644
--- a/cocos2dx/proj.blackberry/.project
+++ b/cocos2dx/proj.blackberry/.project
@@ -110,6 +110,16 @@
2
PARENT-1-PROJECT_LOC/base_nodes
+
+ ccFPSImages.c
+ 1
+ PARENT-1-PROJECT_LOC/ccFPSImages.c
+
+
+ ccFPSImages.h
+ 1
+ PARENT-1-PROJECT_LOC/ccFPSImages.h
+
cocoa
2
diff --git a/extensions/network/WebSocket.cpp b/extensions/network/WebSocket.cpp
index 3a76a39eb9..6a56127cea 100644
--- a/extensions/network/WebSocket.cpp
+++ b/extensions/network/WebSocket.cpp
@@ -28,6 +28,7 @@
****************************************************************************/
#include "WebSocket.h"
+#include
#include
#include
#include
@@ -465,7 +466,6 @@ void WebSocket::onSubThreadEnded()
}
-
int WebSocket::onSocketCallback(struct libwebsocket_context *ctx,
struct libwebsocket *wsi,
enum libwebsocket_callback_reasons reason,
@@ -658,4 +658,5 @@ void WebSocket::onUIThreadReceiveMessage(WsMessage* msg)
break;
}
}
+
NS_CC_EXT_END
diff --git a/extensions/network/WebSocket.h b/extensions/network/WebSocket.h
index 5d9d626cdc..1dc262077b 100644
--- a/extensions/network/WebSocket.h
+++ b/extensions/network/WebSocket.h
@@ -31,7 +31,6 @@
#define __CC_WEBSOCKET_H__
#include "ExtensionMacros.h"
-#include
#include "cocos2d.h"
#include "libwebsockets.h"
#include
@@ -149,7 +148,7 @@ private:
struct libwebsocket_context* _wsContext;
Delegate* _delegate;
int _SSLConnection;
- libwebsocket_protocols* _wsProtocols;
+ struct libwebsocket_protocols* _wsProtocols;
};
NS_CC_EXT_END
diff --git a/extensions/proj.blackberry/.cproject b/extensions/proj.blackberry/.cproject
index 76b2e61c04..3d402259ee 100644
--- a/extensions/proj.blackberry/.cproject
+++ b/extensions/proj.blackberry/.cproject
@@ -83,9 +83,10 @@
-
+
+
@@ -162,6 +163,8 @@
+
+
@@ -238,6 +241,8 @@
+
+
@@ -314,6 +319,8 @@
+
+
@@ -388,6 +395,8 @@
+
+
@@ -463,6 +472,8 @@
+
+
@@ -538,6 +549,8 @@
+
+
diff --git a/extensions/proj.blackberry/.project b/extensions/proj.blackberry/.project
index 6643bd180c..57e212a23f 100644
--- a/extensions/proj.blackberry/.project
+++ b/extensions/proj.blackberry/.project
@@ -84,6 +84,11 @@
2
PARENT-1-PROJECT_LOC/CCBReader
+
+ Components
+ 2
+ PARENT-1-PROJECT_LOC/Components
+
GUI
2
@@ -107,12 +112,12 @@
- 1345434795222
- GUI
- 10
+ 1370598150734
+ network
+ 6
org.eclipse.ui.ide.multiFilter
- 1.0-name-matches-true-false-CCEditBox
+ 1.0-name-matches-false-false-WebSocket*
diff --git a/samples/Cpp/HelloCpp/proj.blackberry/.cproject b/samples/Cpp/HelloCpp/proj.blackberry/.cproject
index f9fc3cc7ce..ae46d6efa7 100644
--- a/samples/Cpp/HelloCpp/proj.blackberry/.cproject
+++ b/samples/Cpp/HelloCpp/proj.blackberry/.cproject
@@ -22,7 +22,7 @@
-
+
@@ -123,7 +123,7 @@
-
+
@@ -210,7 +210,7 @@
-
+
@@ -298,7 +298,7 @@
-
+
@@ -471,7 +471,7 @@
-
+
@@ -558,7 +558,7 @@
-
+
@@ -630,33 +630,33 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/Cpp/SimpleGame/proj.blackberry/.cproject b/samples/Cpp/SimpleGame/proj.blackberry/.cproject
index bb35fdd0fd..779721d636 100644
--- a/samples/Cpp/SimpleGame/proj.blackberry/.cproject
+++ b/samples/Cpp/SimpleGame/proj.blackberry/.cproject
@@ -136,7 +136,6 @@
@@ -58,6 +59,8 @@
-
+
@@ -141,7 +143,6 @@
@@ -164,6 +166,8 @@
-
+
@@ -239,7 +242,6 @@
@@ -265,6 +268,8 @@
-
+
@@ -339,7 +343,6 @@
@@ -365,6 +369,8 @@
-
+
@@ -437,7 +442,6 @@
@@ -462,6 +467,8 @@
-
+
@@ -536,7 +542,6 @@
@@ -562,6 +568,8 @@
-
+
@@ -635,7 +642,6 @@
@@ -661,6 +668,8 @@
-
+
diff --git a/samples/Lua/HelloLua/proj.blackberry/.project b/samples/Lua/HelloLua/proj.blackberry/.project
index a8cce84734..c0ae6fcb23 100644
--- a/samples/Lua/HelloLua/proj.blackberry/.project
+++ b/samples/Lua/HelloLua/proj.blackberry/.project
@@ -1,97 +1,93 @@
-
-
- HelloLua
-
-
- cocos2dx
- CocosDenshion
- lua
-
-
-
- org.eclipse.cdt.managedbuilder.core.genmakebuilder
- clean,full,incremental,
-
-
- ?name?
-
-
-
- org.eclipse.cdt.make.core.append_environment
- true
-
-
- org.eclipse.cdt.make.core.buildArguments
-
-
-
- org.eclipse.cdt.make.core.buildCommand
- make
-
-
- org.eclipse.cdt.make.core.buildLocation
- ${workspace_loc:/HelloLua/Device-Debug}
-
-
- org.eclipse.cdt.make.core.contents
- org.eclipse.cdt.make.core.activeConfigSettings
-
-
- org.eclipse.cdt.make.core.enableAutoBuild
- false
-
-
- org.eclipse.cdt.make.core.enableCleanBuild
- true
-
-
- org.eclipse.cdt.make.core.enableFullBuild
- true
-
-
- org.eclipse.cdt.make.core.stopOnError
- true
-
-
- org.eclipse.cdt.make.core.useDefaultBuildCmd
- true
-
-
-
-
- org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder
- full,incremental,
-
-
-
-
- com.qnx.tools.bbt.xml.core.bbtXMLValidationBuilder
-
-
-
-
-
- org.eclipse.cdt.core.cnature
- org.eclipse.cdt.managedbuilder.core.managedBuildNature
- org.eclipse.cdt.managedbuilder.core.ScannerConfigNature
- com.qnx.tools.ide.bbt.core.bbtnature
- org.eclipse.cdt.core.ccnature
-
-
-
- Classes
- 2
- PARENT-1-PROJECT_LOC/Classes
-
-
- Resources
- 2
- PARENT-1-PROJECT_LOC/Resources
-
-
- cocos2dx_support
- 2
- PARENT-4-PROJECT_LOC/scripting/lua/cocos2dx_support
-
-
-
+
+
+ HelloLua
+
+
+ cocos2dx
+ CocosDenshion
+ extensions
+ lua
+
+
+
+ org.eclipse.cdt.managedbuilder.core.genmakebuilder
+ clean,full,incremental,
+
+
+ ?name?
+
+
+
+ org.eclipse.cdt.make.core.append_environment
+ true
+
+
+ org.eclipse.cdt.make.core.buildArguments
+
+
+
+ org.eclipse.cdt.make.core.buildCommand
+ make
+
+
+ org.eclipse.cdt.make.core.buildLocation
+ ${workspace_loc:/HelloLua/Device-Debug}
+
+
+ org.eclipse.cdt.make.core.contents
+ org.eclipse.cdt.make.core.activeConfigSettings
+
+
+ org.eclipse.cdt.make.core.enableAutoBuild
+ false
+
+
+ org.eclipse.cdt.make.core.enableCleanBuild
+ true
+
+
+ org.eclipse.cdt.make.core.enableFullBuild
+ true
+
+
+ org.eclipse.cdt.make.core.stopOnError
+ true
+
+
+ org.eclipse.cdt.make.core.useDefaultBuildCmd
+ true
+
+
+
+
+ org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder
+ full,incremental,
+
+
+
+
+ com.qnx.tools.bbt.xml.core.bbtXMLValidationBuilder
+
+
+
+
+
+ org.eclipse.cdt.core.cnature
+ org.eclipse.cdt.managedbuilder.core.managedBuildNature
+ org.eclipse.cdt.managedbuilder.core.ScannerConfigNature
+ com.qnx.tools.ide.bbt.core.bbtnature
+ org.eclipse.cdt.core.ccnature
+
+
+
+ Classes
+ 2
+ PARENT-1-PROJECT_LOC/Classes
+
+
+ Resources
+ 2
+ PARENT-1-PROJECT_LOC/Resources
+
+
+
diff --git a/samples/Lua/TestLua/Classes/AppDelegate.cpp b/samples/Lua/TestLua/Classes/AppDelegate.cpp
index 40121abc25..bd74b111a9 100644
--- a/samples/Lua/TestLua/Classes/AppDelegate.cpp
+++ b/samples/Lua/TestLua/Classes/AppDelegate.cpp
@@ -51,6 +51,7 @@ bool AppDelegate::applicationDidFinishLaunching()
#if CC_TARGET_PLATFORM == CC_PLATFORM_BLACKBERRY
searchPaths.push_back("TestCppResources");
+ searchPaths.push_back("script");
#endif
CCFileUtils::sharedFileUtils()->setSearchPaths(searchPaths);
diff --git a/samples/Lua/TestLua/Resources/luaScript/ExtensionTest/ExtensionTest.lua b/samples/Lua/TestLua/Resources/luaScript/ExtensionTest/ExtensionTest.lua
index 7e0c8fede0..41cb4a8ff8 100644
--- a/samples/Lua/TestLua/Resources/luaScript/ExtensionTest/ExtensionTest.lua
+++ b/samples/Lua/TestLua/Resources/luaScript/ExtensionTest/ExtensionTest.lua
@@ -10,7 +10,6 @@ local ExtensionTestEnum =
TEST_CCCONTROLBUTTON = 1,
TEST_COCOSBUILDER = 2,
TEST_WEBSOCKET = 3,
- --TRAGET_PLATFORM
TEST_EDITBOX = 4,
TEST_TABLEVIEW = 5,
TEST_MAX_COUNT = 6,
@@ -1030,16 +1029,23 @@ local function ExtensionsMainLayer()
CCMenuItemFont:setFontName("Arial")
CCMenuItemFont:setFontSize(24)
local targetPlatform = CCApplication:sharedApplication():getTargetPlatform()
- local bSupportWebSocket = true
- if (kTargetIphone ~= targetPlatform) and (kTargetIpad ~= targetPlatform) and (kTargetAndroid ~= targetPlatform) and (kTargetWindows ~= targetPlatform) then
- bSupportWebSocket = false
+ local bSupportWebSocket = false
+ if (kTargetIphone == targetPlatform) or (kTargetIpad == targetPlatform) or (kTargetAndroid == targetPlatform) or (kTargetWindows == targetPlatform) then
+ bSupportWebSocket = true
+ end
+ local bSupportEdit = false
+ if (kTargetIphone == targetPlatform) or (kTargetIpad == targetPlatform) or
+ (kTargetAndroid == targetPlatform) or (kTargetWindows == targetPlatform) or
+ (kTargetMacOS == targetPlatform) or (kTargetTizen == targetPlatform) then
+ bSupportEdit = true
end
for i = 1, ExtensionTestEnum.TEST_MAX_COUNT do
local item = CCMenuItemFont:create(testsName[i])
item:registerScriptTapHandler(menuCallback)
item:setPosition(s.width / 2, s.height - i * LINE_SPACE)
menu:addChild(item, kItemTagBasic + i)
- if (i == ExtensionTestEnum.TEST_WEBSOCKET + 1) and false == bSupportWebSocket then
+ if ((i == ExtensionTestEnum.TEST_WEBSOCKET + 1) and (false == bSupportWebSocket))
+ or ((i == ExtensionTestEnum.TEST_EDITBOX + 1) and (false == bSupportEdit)) then
item:setEnabled(false)
end
end
diff --git a/samples/Lua/TestLua/proj.blackberry/.cproject b/samples/Lua/TestLua/proj.blackberry/.cproject
index 46edf48864..f8bf9dc2b5 100644
--- a/samples/Lua/TestLua/proj.blackberry/.cproject
+++ b/samples/Lua/TestLua/proj.blackberry/.cproject
@@ -58,6 +58,8 @@
-
+
@@ -156,7 +157,6 @@
-
+
@@ -354,7 +355,6 @@
-
+
@@ -452,7 +453,6 @@
-
+
@@ -551,7 +552,6 @@
-
+
@@ -650,7 +651,6 @@
-
+
diff --git a/samples/Lua/TestLua/proj.blackberry/.project b/samples/Lua/TestLua/proj.blackberry/.project
index a16330a040..dbb0948569 100644
--- a/samples/Lua/TestLua/proj.blackberry/.project
+++ b/samples/Lua/TestLua/proj.blackberry/.project
@@ -1,97 +1,92 @@
-
-
- TestLua
-
-
- cocos2dx
- CocosDenshion
- lua
-
-
-
- org.eclipse.cdt.managedbuilder.core.genmakebuilder
- clean,full,incremental,
-
-
- ?name?
-
-
-
- org.eclipse.cdt.make.core.append_environment
- true
-
-
- org.eclipse.cdt.make.core.buildArguments
-
-
-
- org.eclipse.cdt.make.core.buildCommand
- make
-
-
- org.eclipse.cdt.make.core.buildLocation
- ${workspace_loc:/TestLua/Device-Debug}
-
-
- org.eclipse.cdt.make.core.contents
- org.eclipse.cdt.make.core.activeConfigSettings
-
-
- org.eclipse.cdt.make.core.enableAutoBuild
- false
-
-
- org.eclipse.cdt.make.core.enableCleanBuild
- true
-
-
- org.eclipse.cdt.make.core.enableFullBuild
- true
-
-
- org.eclipse.cdt.make.core.stopOnError
- true
-
-
- org.eclipse.cdt.make.core.useDefaultBuildCmd
- true
-
-
-
-
- org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder
- full,incremental,
-
-
-
-
- com.qnx.tools.bbt.xml.core.bbtXMLValidationBuilder
-
-
-
-
-
- org.eclipse.cdt.core.cnature
- org.eclipse.cdt.managedbuilder.core.managedBuildNature
- org.eclipse.cdt.managedbuilder.core.ScannerConfigNature
- com.qnx.tools.ide.bbt.core.bbtnature
- org.eclipse.cdt.core.ccnature
-
-
-
- Classes
- 2
- PARENT-1-PROJECT_LOC/Classes
-
-
- Resources
- 2
- PARENT-1-PROJECT_LOC/Resources
-
-
- cocos2dx_support
- 2
- PARENT-4-PROJECT_LOC/scripting/lua/cocos2dx_support
-
-
-
+
+
+ TestLua
+
+
+ cocos2dx
+ CocosDenshion
+ lua
+
+
+
+ org.eclipse.cdt.managedbuilder.core.genmakebuilder
+ clean,full,incremental,
+
+
+ ?name?
+
+
+
+ org.eclipse.cdt.make.core.append_environment
+ true
+
+
+ org.eclipse.cdt.make.core.buildArguments
+
+
+
+ org.eclipse.cdt.make.core.buildCommand
+ make
+
+
+ org.eclipse.cdt.make.core.buildLocation
+ ${workspace_loc:/TestLua/Device-Debug}
+
+
+ org.eclipse.cdt.make.core.contents
+ org.eclipse.cdt.make.core.activeConfigSettings
+
+
+ org.eclipse.cdt.make.core.enableAutoBuild
+ false
+
+
+ org.eclipse.cdt.make.core.enableCleanBuild
+ true
+
+
+ org.eclipse.cdt.make.core.enableFullBuild
+ true
+
+
+ org.eclipse.cdt.make.core.stopOnError
+ true
+
+
+ org.eclipse.cdt.make.core.useDefaultBuildCmd
+ true
+
+
+
+
+ org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder
+ full,incremental,
+
+
+
+
+ com.qnx.tools.bbt.xml.core.bbtXMLValidationBuilder
+
+
+
+
+
+ org.eclipse.cdt.core.cnature
+ org.eclipse.cdt.managedbuilder.core.managedBuildNature
+ org.eclipse.cdt.managedbuilder.core.ScannerConfigNature
+ com.qnx.tools.ide.bbt.core.bbtnature
+ org.eclipse.cdt.core.ccnature
+
+
+
+ Classes
+ 2
+ PARENT-1-PROJECT_LOC/Classes
+
+
+ Resources
+ 2
+ PARENT-1-PROJECT_LOC/Resources
+
+
+
diff --git a/samples/Lua/TestLua/proj.blackberry/bar-descriptor.xml b/samples/Lua/TestLua/proj.blackberry/bar-descriptor.xml
index 9ccda33c3c..eb8e52e319 100644
--- a/samples/Lua/TestLua/proj.blackberry/bar-descriptor.xml
+++ b/samples/Lua/TestLua/proj.blackberry/bar-descriptor.xml
@@ -55,6 +55,7 @@
Resources
Resources/TestCppResources
+ Resources/script
diff --git a/samples/Lua/TestLua/proj.win32/TestLua.win32.vcxproj b/samples/Lua/TestLua/proj.win32/TestLua.win32.vcxproj
index eb70716f67..b4ea8e2963 100644
--- a/samples/Lua/TestLua/proj.win32/TestLua.win32.vcxproj
+++ b/samples/Lua/TestLua/proj.win32/TestLua.win32.vcxproj
@@ -62,7 +62,7 @@
- $(ProjectDir)..\Classes;$(ProjectDir)..\..\..\..\scripting\lua\cocos2dx_support;$(ProjectDir)..\..\..\..\scripting\lua\lua;$(ProjectDir)..\..\..\..\scripting\lua\tolua;$(ProjectDir)..\..\..\..\scripting\lua\src;$(ProjectDir)..\..\..\..\cocos2dx;$(ProjectDir)..\..\..\..\cocos2dx\include;$(ProjectDir)..\..\..\..\cocos2dx\kazmath\include;$(ProjectDir)..\..\..\..\cocos2dx\platform\win32;$(ProjectDir)..\..\..\..\cocos2dx\platform\third_party\win32;$(ProjectDir)..\..\..\..\cocos2dx\platform\third_party\win32\OGLES;$(ProjectDir)..\..\..\..\external;$(ProjectDir)..\..\..\..\external\chipmunk\include\chipmunk;$(ProjectDir)..\..\..\..\CocosDenshion\include;$(ProjectDir)..\..\..\..\scripting\lua\cocos2dx_support;$(ProjectDir)..\..\..\..\scripting\lua\tolua;$(ProjectDir)..\..\..\..\scripting\lua\lua;%(AdditionalIncludeDirectories)
+ $(ProjectDir)..\Classes;$(ProjectDir)..\..\..\..\scripting\lua\cocos2dx_support;$(ProjectDir)..\..\..\..\scripting\lua\lua;$(ProjectDir)..\..\..\..\scripting\lua\tolua;$(ProjectDir)..\..\..\..\scripting\lua\src;$(ProjectDir)..\..\..\..\cocos2dx;$(ProjectDir)..\..\..\..\cocos2dx\include;$(ProjectDir)..\..\..\..\cocos2dx\kazmath\include;$(ProjectDir)..\..\..\..\cocos2dx\platform\win32;$(ProjectDir)..\..\..\..\cocos2dx\platform\third_party\win32;$(ProjectDir)..\..\..\..\cocos2dx\platform\third_party\win32\OGLES;$(ProjectDir)..\..\..\..\external;$(ProjectDir)..\..\..\..\external\libwebsockets\win32\include;$(ProjectDir)..\..\..\..\external\chipmunk\include\chipmunk;$(ProjectDir)..\..\..\..\CocosDenshion\include;%(AdditionalIncludeDirectories)
Level3
@@ -79,7 +79,7 @@
MachineX86
true
$(OutDir);%(AdditionalLibraryDirectories)
- libcocos2d.lib;libExtensions.lib;opengl32.lib;glew32.lib;libBox2d.lib;libchipmunk.lib;libCocosDenshion.lib;liblua.lib;lua51.lib;%(AdditionalDependencies)
+ libcocos2d.lib;libExtensions.lib;opengl32.lib;glew32.lib;libBox2d.lib;libchipmunk.lib;libCocosDenshion.lib;liblua.lib;lua51.lib;pthreadVCE2.lib;websockets.lib;%(AdditionalDependencies)
0x0409
@@ -100,13 +100,13 @@
xcopy "$(ProjectDir)..\..\..\Cpp\TestCpp\Resources" "$(ProjectDir)..\..\TestLua\Resources" /e /Y
-xcopy "$(ProjectDir)..\..\..\..\scripting\Lua\script" "$(ProjectDir)..\..\TestLua\Resources" /e /Y
+xcopy "$(ProjectDir)..\..\..\..\scripting\lua\script" "$(ProjectDir)..\..\TestLua\Resources" /e /Y
copy files from TestCpp to TestLua
- $(ProjectDir)..\Classes;$(ProjectDir)..\..\..\..\scripting\lua\cocos2dx_support;$(ProjectDir)..\..\..\..\scripting\lua\lua;$(ProjectDir)..\..\..\..\scripting\lua\tolua;$(ProjectDir)..\..\..\..\scripting\lua\src;$(ProjectDir)..\..\..\..\cocos2dx;$(ProjectDir)..\..\..\..\cocos2dx\include;$(ProjectDir)..\..\..\..\cocos2dx\kazmath\include;$(ProjectDir)..\..\..\..\cocos2dx\platform\win32;$(ProjectDir)..\..\..\..\cocos2dx\platform\third_party\win32;$(ProjectDir)..\..\..\..\cocos2dx\platform\third_party\win32\OGLES;$(ProjectDir)..\..\..\..\external;$(ProjectDir)..\..\..\..\external\chipmunk\include\chipmunk;$(ProjectDir)..\..\..\..\CocosDenshion\include;$(ProjectDir)..\..\..\..\scripting\lua\cocos2dx_support;$(ProjectDir)..\..\..\..\scripting\lua\tolua;$(ProjectDir)..\..\..\..\scripting\lua\lua;%(AdditionalIncludeDirectories)
+ $(ProjectDir)..\Classes;$(ProjectDir)..\..\..\..\scripting\lua\cocos2dx_support;$(ProjectDir)..\..\..\..\scripting\lua\lua;$(ProjectDir)..\..\..\..\scripting\lua\tolua;$(ProjectDir)..\..\..\..\scripting\lua\src;$(ProjectDir)..\..\..\..\cocos2dx;$(ProjectDir)..\..\..\..\cocos2dx\include;$(ProjectDir)..\..\..\..\cocos2dx\kazmath\include;$(ProjectDir)..\..\..\..\cocos2dx\platform\win32;$(ProjectDir)..\..\..\..\cocos2dx\platform\third_party\win32;$(ProjectDir)..\..\..\..\cocos2dx\platform\third_party\win32\OGLES;$(ProjectDir)..\..\..\..\external;$(ProjectDir)..\..\..\..\external\libwebsockets\win32\include;$(ProjectDir)..\..\..\..\external\chipmunk\include\chipmunk;$(ProjectDir)..\..\..\..\CocosDenshion\include;%(AdditionalIncludeDirectories)
Level3
@@ -122,7 +122,7 @@ xcopy "$(ProjectDir)..\..\..\..\scripting\Lua\script" "$(ProjectDir)..\..\TestLu
Windows
MachineX86
$(OutDir);%(AdditionalLibraryDirectories)
- libcocos2d.lib;libExtensions.lib;opengl32.lib;glew32.lib;libBox2d.lib;libchipmunk.lib;libCocosDenshion.lib;liblua.lib;lua51.lib;%(AdditionalDependencies)
+ libcocos2d.lib;libExtensions.lib;opengl32.lib;glew32.lib;libBox2d.lib;libchipmunk.lib;libCocosDenshion.lib;liblua.lib;lua51.lib;pthreadVCE2.lib;websockets.lib;%(AdditionalDependencies)
0x0409
@@ -142,7 +142,8 @@ xcopy "$(ProjectDir)..\..\..\..\scripting\Lua\script" "$(ProjectDir)..\..\TestLu
- xcopy "$(ProjectDir)..\..\..\Cpp\TestCpp\Resources" "$(ProjectDir)..\..\TestLua\Resources" /e /Y
+ xcopy "$(ProjectDir)..\..\..\Cpp\TestCpp\Resources" "$(ProjectDir)..\..\TestLua\Resources" /e /Y
+xcopy "$(ProjectDir)..\..\..\..\scripting\lua\script" "$(ProjectDir)..\..\TestLua\Resources" /e /Y
copy files from TestCpp to TestLua
diff --git a/scripting/javascript/bindings/generated b/scripting/javascript/bindings/generated
index 871631edc5..b95d4cd6f0 160000
--- a/scripting/javascript/bindings/generated
+++ b/scripting/javascript/bindings/generated
@@ -1 +1 @@
-Subproject commit 871631edc5df8489cb3e781deda7f7c77dd5b7c6
+Subproject commit b95d4cd6f0d8533a7b310a5470473025799a8f30
diff --git a/scripting/lua/cocos2dx_support/CCBProxy.cpp b/scripting/lua/cocos2dx_support/CCBProxy.cpp
index e53dd0bcec..69af6ffd88 100644
--- a/scripting/lua/cocos2dx_support/CCBProxy.cpp
+++ b/scripting/lua/cocos2dx_support/CCBProxy.cpp
@@ -59,6 +59,14 @@ const char* CCBProxy::getNodeTypeName(CCNode* pNode)
return NULL;
}
+ if (NULL != dynamic_cast(pNode)) {
+ return "CCLabelTTF";
+ }
+
+ if (NULL != dynamic_cast(pNode)) {
+ return "CCLabelBMFont";
+ }
+
if (NULL != dynamic_cast(pNode)) {
return "CCSprite";
}
@@ -67,42 +75,22 @@ const char* CCBProxy::getNodeTypeName(CCNode* pNode)
return "CCControlButton";
}
- if (NULL != dynamic_cast(pNode)) {
- return "CCLayer";
+ if (NULL != dynamic_cast(pNode)) {
+ return "CCLayerGradient";
}
if (NULL != dynamic_cast(pNode)) {
return "CCLayerColor";
}
- if (NULL != dynamic_cast(pNode)) {
- return "CCLayerGradient";
- }
-
if (NULL != dynamic_cast(pNode)) {
return "CCLayerGradient";
}
- if (NULL != dynamic_cast(pNode)) {
- return "CCLabelTTF";
- }
-
- if (NULL != dynamic_cast(pNode)) {
- return "CCLabelBMFont";
- }
-
if (NULL != dynamic_cast(pNode)) {
return "CCMenu";
}
- if (NULL != dynamic_cast(pNode)) {
- return "CCMenuItem";
- }
-
- if (NULL != dynamic_cast(pNode)) {
- return "CCMenuItemLabel";
- }
-
if (NULL != dynamic_cast(pNode)) {
return "CCMenuItemAtlasFont";
}
@@ -111,8 +99,8 @@ const char* CCBProxy::getNodeTypeName(CCNode* pNode)
return "CCMenuItemFont";
}
- if (NULL != dynamic_cast(pNode)) {
- return "CCMenuItemSprite";
+ if (NULL != dynamic_cast(pNode)) {
+ return "CCMenuItemLabel";
}
if (NULL != dynamic_cast(pNode)) {
@@ -123,6 +111,18 @@ const char* CCBProxy::getNodeTypeName(CCNode* pNode)
return "CCMenuItemToggle";
}
+ if (NULL != dynamic_cast(pNode)) {
+ return "CCMenuItemSprite";
+ }
+
+ if (NULL != dynamic_cast(pNode)) {
+ return "CCMenuItem";
+ }
+
+ if (NULL != dynamic_cast(pNode)) {
+ return "CCLayer";
+ }
+
if (NULL != dynamic_cast(pNode)) {
return "CCString";
}
@@ -140,14 +140,14 @@ void CCBProxy::setCallback(CCNode* pNode,int nHandle)
return;
}
- if (strcmp(this->getNodeTypeName(pNode), "CCMenuItem") == 0)
+ if (NULL != dynamic_cast(pNode))
{
CCMenuItem *pMenuItem = dynamic_cast(pNode);
if (NULL != pMenuItem) {
pMenuItem->registerScriptTapHandler(nHandle);
}
}
- else if (strcmp(this->getNodeTypeName(pNode), "CCControlButton") == 0)
+ else if (NULL != dynamic_cast(pNode))
{
CCControlButton *pBtnItem = dynamic_cast(pNode);
if (NULL != pBtnItem) {
diff --git a/scripting/lua/cocos2dx_support/Lua_web_socket.cpp b/scripting/lua/cocos2dx_support/Lua_web_socket.cpp
index c59ce38f6f..e12403f1ac 100644
--- a/scripting/lua/cocos2dx_support/Lua_web_socket.cpp
+++ b/scripting/lua/cocos2dx_support/Lua_web_socket.cpp
@@ -148,7 +148,6 @@ public:
int nHandler = luaWs->getScriptHandler(LuaWebSocket::kWebSocketScriptHandlerClose);
if (-1 != nHandler) {
CCScriptEngineManager::sharedManager()->getScriptEngine()->executeEvent(nHandler,"");
- CC_SAFE_DELETE(ws);
}
}
}
diff --git a/scripting/lua/proj.blackberry/.cproject b/scripting/lua/proj.blackberry/.cproject
index 93f4db3d12..f3cdc2b462 100644
--- a/scripting/lua/proj.blackberry/.cproject
+++ b/scripting/lua/proj.blackberry/.cproject
@@ -46,7 +46,15 @@
+
+
+
+
+
+
+
+
@@ -87,6 +95,7 @@
+
@@ -124,7 +133,15 @@
+
+
+
+
+
+
+
+
@@ -154,6 +171,7 @@
+
@@ -192,7 +210,15 @@
+
+
+
+
+
+
+
+
@@ -226,6 +252,7 @@
+
@@ -264,7 +291,15 @@
+
+
+
+
+
+
+
+
@@ -298,6 +333,7 @@
+
@@ -334,7 +370,15 @@
+
+
+
+
+
+
+
+
@@ -367,6 +411,7 @@
+
@@ -406,7 +451,15 @@
+
+
+
+
+
+
+
+
@@ -440,6 +493,7 @@
+
@@ -477,7 +531,15 @@
+
+
+
+
+
+
+
+
@@ -511,6 +573,7 @@
+
diff --git a/scripting/lua/proj.blackberry/.project b/scripting/lua/proj.blackberry/.project
index d605f2fdd0..3157678c3f 100644
--- a/scripting/lua/proj.blackberry/.project
+++ b/scripting/lua/proj.blackberry/.project
@@ -1,93 +1,109 @@
-
-
- lua
-
-
-
-
-
- org.eclipse.cdt.managedbuilder.core.genmakebuilder
- clean,full,incremental,
-
-
- ?children?
- ?name?=outputEntries\|?children?=?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|\||
-
-
- ?name?
-
-
-
- org.eclipse.cdt.make.core.append_environment
- true
-
-
- org.eclipse.cdt.make.core.buildArguments
-
-
-
- org.eclipse.cdt.make.core.buildCommand
- make
-
-
- org.eclipse.cdt.make.core.buildLocation
- ${workspace_loc:/lua/Device-Debug}
-
-
- org.eclipse.cdt.make.core.contents
- org.eclipse.cdt.make.core.activeConfigSettings
-
-
- org.eclipse.cdt.make.core.enableAutoBuild
- false
-
-
- org.eclipse.cdt.make.core.enableCleanBuild
- true
-
-
- org.eclipse.cdt.make.core.enableFullBuild
- true
-
-
- org.eclipse.cdt.make.core.stopOnError
- true
-
-
- org.eclipse.cdt.make.core.useDefaultBuildCmd
- true
-
-
-
-
- org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder
- full,incremental,
-
-
-
-
- com.qnx.tools.bbt.xml.core.bbtXMLValidationBuilder
-
-
-
-
-
- org.eclipse.cdt.core.cnature
- org.eclipse.cdt.managedbuilder.core.managedBuildNature
- org.eclipse.cdt.managedbuilder.core.ScannerConfigNature
- com.qnx.tools.ide.bbt.core.bbtnature
- org.eclipse.cdt.core.ccnature
-
-
-
- lua
- 2
- PARENT-1-PROJECT_LOC/lua
-
-
- tolua
- 2
- PARENT-1-PROJECT_LOC/tolua
-
-
-
+
+
+ lua
+
+
+
+
+
+ org.eclipse.cdt.managedbuilder.core.genmakebuilder
+ clean,full,incremental,
+
+
+ ?children?
+ ?name?=outputEntries\|?children?=?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|\||
+
+
+ ?name?
+
+
+
+ org.eclipse.cdt.make.core.append_environment
+ true
+
+
+ org.eclipse.cdt.make.core.buildArguments
+
+
+
+ org.eclipse.cdt.make.core.buildCommand
+ make
+
+
+ org.eclipse.cdt.make.core.buildLocation
+ ${workspace_loc:/lua/Device-Debug}
+
+
+ org.eclipse.cdt.make.core.contents
+ org.eclipse.cdt.make.core.activeConfigSettings
+
+
+ org.eclipse.cdt.make.core.enableAutoBuild
+ false
+
+
+ org.eclipse.cdt.make.core.enableCleanBuild
+ true
+
+
+ org.eclipse.cdt.make.core.enableFullBuild
+ true
+
+
+ org.eclipse.cdt.make.core.stopOnError
+ true
+
+
+ org.eclipse.cdt.make.core.useDefaultBuildCmd
+ true
+
+
+
+
+ org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder
+ full,incremental,
+
+
+
+
+ com.qnx.tools.bbt.xml.core.bbtXMLValidationBuilder
+
+
+
+
+
+ org.eclipse.cdt.core.cnature
+ org.eclipse.cdt.managedbuilder.core.managedBuildNature
+ org.eclipse.cdt.managedbuilder.core.ScannerConfigNature
+ com.qnx.tools.ide.bbt.core.bbtnature
+ org.eclipse.cdt.core.ccnature
+
+
+
+ cocos2dx_support
+ 2
+ PARENT-1-PROJECT_LOC/cocos2dx_support
+
+
+ lua
+ 2
+ PARENT-1-PROJECT_LOC/lua
+
+
+ tolua
+ 2
+ PARENT-1-PROJECT_LOC/tolua
+
+
+
+
+ 1370598666794
+ cocos2dx_support
+ 10
+
+ org.eclipse.ui.ide.multiFilter
+ 1.0-name-matches-false-false-platform
+
+
+
+
diff --git a/scripting/lua/proj.win32/liblua.vcxproj b/scripting/lua/proj.win32/liblua.vcxproj
index 799920e355..c2de236053 100644
--- a/scripting/lua/proj.win32/liblua.vcxproj
+++ b/scripting/lua/proj.win32/liblua.vcxproj
@@ -63,7 +63,7 @@
Disabled
- $(ProjectDir)..\..\..\cocos2dx;$(ProjectDir)..\..\..\cocos2dx\include;$(ProjectDir)..\..\..\cocos2dx\kazmath\include;$(ProjectDir)..\..\..\cocos2dx\platform\win32;$(ProjectDir)..\..\..\cocos2dx\platform\third_party\win32\OGLES;$(ProjectDir)..\..\..\CocosDenshion\include;$(ProjectDir)..\..\..\extensions;$(ProjectDir)..\tolua;$(ProjectDir)..\luajit\include;$(ProjectDir)..\..\..\extensions;%(AdditionalIncludeDirectories)
+ $(ProjectDir)..\..\..\cocos2dx;$(ProjectDir)..\..\..\cocos2dx\include;$(ProjectDir)..\..\..\cocos2dx\kazmath\include;$(ProjectDir)..\..\..\cocos2dx\platform\win32;$(ProjectDir)..\..\..\cocos2dx\platform\third_party\win32\OGLES;$(ProjectDir)..\..\..\cocos2dx\platform\third_party\win32\pthread;$(ProjectDir)..\..\..\CocosDenshion\include;$(ProjectDir)..\..\..\extensions;$(ProjectDir)..\..\..\extensions\network;$(ProjectDir)..\..\..\external\libwebsockets\win32\include;$(ProjectDir)..\tolua;$(ProjectDir)..\luajit\include;%(AdditionalIncludeDirectories)
WIN32;_WINDOWS;%(PreprocessorDefinitions)
true
EnableFastChecks
@@ -94,7 +94,7 @@ xcopy /Y /Q "$(ProjectDir)..\luajit\win32\*.*" "$(OutDir)"
MaxSpeed
true
- $(ProjectDir)..\..\..\cocos2dx;$(ProjectDir)..\..\..\cocos2dx\include;$(ProjectDir)..\..\..\cocos2dx\kazmath\include;$(ProjectDir)..\..\..\cocos2dx\platform\win32;$(ProjectDir)..\..\..\cocos2dx\platform\third_party\win32\OGLES;$(ProjectDir)..\..\..\CocosDenshion\include;$(ProjectDir)..\..\..\extensions;$(ProjectDir)..\tolua;$(ProjectDir)..\luajit\include;%(AdditionalIncludeDirectories)
+ $(ProjectDir)..\..\..\cocos2dx;$(ProjectDir)..\..\..\cocos2dx\include;$(ProjectDir)..\..\..\cocos2dx\kazmath\include;$(ProjectDir)..\..\..\cocos2dx\platform\win32;$(ProjectDir)..\..\..\cocos2dx\platform\third_party\win32\OGLES;$(ProjectDir)..\..\..\cocos2dx\platform\third_party\win32\pthread;$(ProjectDir)..\..\..\CocosDenshion\include;$(ProjectDir)..\..\..\extensions;$(ProjectDir)..\..\..\extensions\network;$(ProjectDir)..\..\..\external\libwebsockets\win32\include;$(ProjectDir)..\tolua;$(ProjectDir)..\luajit\include;%(AdditionalIncludeDirectories)
WIN32;NDEBUG;_WINDOWS;LIBLUA_EXPORTS;%(PreprocessorDefinitions)
MultiThreadedDLL
true
@@ -129,6 +129,7 @@ xcopy /Y /Q "$(ProjectDir)..\luajit\win32\*.*" "$(OutDir)"
+
@@ -145,6 +146,7 @@ xcopy /Y /Q "$(ProjectDir)..\luajit\win32\*.*" "$(OutDir)"
+
diff --git a/scripting/lua/proj.win32/liblua.vcxproj.filters b/scripting/lua/proj.win32/liblua.vcxproj.filters
index 5d1a37e74c..01b1c9ce1e 100644
--- a/scripting/lua/proj.win32/liblua.vcxproj.filters
+++ b/scripting/lua/proj.win32/liblua.vcxproj.filters
@@ -57,6 +57,9 @@
cocos2dx_support
+
+ cocos2dx_support
+
@@ -104,5 +107,8 @@
cocos2dx_support
+
+ cocos2dx_support
+
\ No newline at end of file
diff --git a/template/multi-platform-lua/proj.blackberry/.cproject b/template/multi-platform-lua/proj.blackberry/.cproject
index 5beb88b765..a01501bb2e 100644
--- a/template/multi-platform-lua/proj.blackberry/.cproject
+++ b/template/multi-platform-lua/proj.blackberry/.cproject
@@ -28,7 +28,6 @@
-
+
@@ -156,7 +156,6 @@
-
+
@@ -354,7 +354,6 @@
-
+
@@ -453,7 +453,6 @@
-
+
@@ -552,7 +552,6 @@
-
+
@@ -651,7 +651,6 @@
-
+
diff --git a/template/multi-platform-lua/proj.blackberry/.project b/template/multi-platform-lua/proj.blackberry/.project
index 1832c89159..c0ae6fcb23 100644
--- a/template/multi-platform-lua/proj.blackberry/.project
+++ b/template/multi-platform-lua/proj.blackberry/.project
@@ -1,97 +1,93 @@
-
-
- HelloLua
-
-
- cocos2dx
- CocosDenshion
- lua
-
-
-
- org.eclipse.cdt.managedbuilder.core.genmakebuilder
- clean,full,incremental,
-
-
- ?name?
-
-
-
- org.eclipse.cdt.make.core.append_environment
- true
-
-
- org.eclipse.cdt.make.core.buildArguments
-
-
-
- org.eclipse.cdt.make.core.buildCommand
- make
-
-
- org.eclipse.cdt.make.core.buildLocation
- ${workspace_loc:/HelloLua/Device-Debug}
-
-
- org.eclipse.cdt.make.core.contents
- org.eclipse.cdt.make.core.activeConfigSettings
-
-
- org.eclipse.cdt.make.core.enableAutoBuild
- false
-
-
- org.eclipse.cdt.make.core.enableCleanBuild
- true
-
-
- org.eclipse.cdt.make.core.enableFullBuild
- true
-
-
- org.eclipse.cdt.make.core.stopOnError
- true
-
-
- org.eclipse.cdt.make.core.useDefaultBuildCmd
- true
-
-
-
-
- org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder
- full,incremental,
-
-
-
-
- com.qnx.tools.bbt.xml.core.bbtXMLValidationBuilder
-
-
-
-
-
- org.eclipse.cdt.core.cnature
- org.eclipse.cdt.managedbuilder.core.managedBuildNature
- org.eclipse.cdt.managedbuilder.core.ScannerConfigNature
- com.qnx.tools.ide.bbt.core.bbtnature
- org.eclipse.cdt.core.ccnature
-
-
-
- Classes
- 2
- PARENT-1-PROJECT_LOC/Classes
-
-
- Resources
- 2
- PARENT-1-PROJECT_LOC/Resources
-
-
- cocos2dx_support
- 2
- PARENT-3-PROJECT_LOC/scripting/lua/cocos2dx_support
-
-
-
+
+
+ HelloLua
+
+
+ cocos2dx
+ CocosDenshion
+ extensions
+ lua
+
+
+
+ org.eclipse.cdt.managedbuilder.core.genmakebuilder
+ clean,full,incremental,
+
+
+ ?name?
+
+
+
+ org.eclipse.cdt.make.core.append_environment
+ true
+
+
+ org.eclipse.cdt.make.core.buildArguments
+
+
+
+ org.eclipse.cdt.make.core.buildCommand
+ make
+
+
+ org.eclipse.cdt.make.core.buildLocation
+ ${workspace_loc:/HelloLua/Device-Debug}
+
+
+ org.eclipse.cdt.make.core.contents
+ org.eclipse.cdt.make.core.activeConfigSettings
+
+
+ org.eclipse.cdt.make.core.enableAutoBuild
+ false
+
+
+ org.eclipse.cdt.make.core.enableCleanBuild
+ true
+
+
+ org.eclipse.cdt.make.core.enableFullBuild
+ true
+
+
+ org.eclipse.cdt.make.core.stopOnError
+ true
+
+
+ org.eclipse.cdt.make.core.useDefaultBuildCmd
+ true
+
+
+
+
+ org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder
+ full,incremental,
+
+
+
+
+ com.qnx.tools.bbt.xml.core.bbtXMLValidationBuilder
+
+
+
+
+
+ org.eclipse.cdt.core.cnature
+ org.eclipse.cdt.managedbuilder.core.managedBuildNature
+ org.eclipse.cdt.managedbuilder.core.ScannerConfigNature
+ com.qnx.tools.ide.bbt.core.bbtnature
+ org.eclipse.cdt.core.ccnature
+
+
+
+ Classes
+ 2
+ PARENT-1-PROJECT_LOC/Classes
+
+
+ Resources
+ 2
+ PARENT-1-PROJECT_LOC/Resources
+
+
+