From ec42b7c76a70d12dc3ddce2cd7d5c0573d24af8c Mon Sep 17 00:00:00 2001 From: Tom Whittock Date: Fri, 25 Apr 2014 10:01:10 +0100 Subject: [PATCH 1/7] Use correct return codes from mac CCApplication --- cocos/2d/platform/mac/CCApplication.mm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cocos/2d/platform/mac/CCApplication.mm b/cocos/2d/platform/mac/CCApplication.mm index 08f3cc55a1..55ea168dbd 100644 --- a/cocos/2d/platform/mac/CCApplication.mm +++ b/cocos/2d/platform/mac/CCApplication.mm @@ -66,7 +66,7 @@ int Application::run() { if(!applicationDidFinishLaunching()) { - return 0; + return 1; } long lastTime = 0L; @@ -105,7 +105,7 @@ int Application::run() glview->release(); - return true; + return 0; } void Application::setAnimationInterval(double interval) From 5cc483276bb4e2224ac83ebef232160b37a9366a Mon Sep 17 00:00:00 2001 From: Jason Xu Date: Fri, 25 Apr 2014 17:15:57 +0800 Subject: [PATCH 2/7] use new ccHttpRequestCallback. --- cocos/network/SocketIO.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cocos/network/SocketIO.cpp b/cocos/network/SocketIO.cpp index 9e669f7e0a..bd340cd3a9 100644 --- a/cocos/network/SocketIO.cpp +++ b/cocos/network/SocketIO.cpp @@ -124,7 +124,7 @@ void SIOClientImpl::handshake() request->setUrl(pre.str().c_str()); request->setRequestType(HttpRequest::Type::GET); - request->setResponseCallback(this, httpresponse_selector(SIOClientImpl::handshakeResponse)); + request->setResponseCallback(std::bind(&SIOClientImpl::handshakeResponse, this, std::placeholders::_1, std::placeholders::_2)); request->setTag("handshake"); log("SIOClientImpl::handshake() waiting"); From 42c374157d02b8b25604a6ffc8535e6466ffe967 Mon Sep 17 00:00:00 2001 From: Jason Xu Date: Fri, 25 Apr 2014 17:32:21 +0800 Subject: [PATCH 3/7] CC_CALLBACK_2 not std::bind directly --- cocos/network/SocketIO.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cocos/network/SocketIO.cpp b/cocos/network/SocketIO.cpp index bd340cd3a9..628d0751f6 100644 --- a/cocos/network/SocketIO.cpp +++ b/cocos/network/SocketIO.cpp @@ -124,7 +124,7 @@ void SIOClientImpl::handshake() request->setUrl(pre.str().c_str()); request->setRequestType(HttpRequest::Type::GET); - request->setResponseCallback(std::bind(&SIOClientImpl::handshakeResponse, this, std::placeholders::_1, std::placeholders::_2)); + request->setResponseCallback(CC_CALLBACK_2(SIOClientImpl::handshakeResponse, this)); request->setTag("handshake"); log("SIOClientImpl::handshake() waiting"); From 9d7880a2a30753d9d2743e91f40a7b0d7f62fd85 Mon Sep 17 00:00:00 2001 From: James Chen Date: Fri, 25 Apr 2014 17:33:35 +0800 Subject: [PATCH 4/7] Update CHANGELOG [ci skip] --- CHANGELOG.REMOVED.git-id | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.REMOVED.git-id b/CHANGELOG.REMOVED.git-id index 80c0b256bc..a9e3a35e50 100644 --- a/CHANGELOG.REMOVED.git-id +++ b/CHANGELOG.REMOVED.git-id @@ -1 +1 @@ -02451d8f73c78341cb22b90556ab891ef136c5e1 \ No newline at end of file +486db4b893330d8f16bc8023ec809c9df138c23d \ No newline at end of file From 277766a021dea5a075c1dbb11346d1d8243cd52d Mon Sep 17 00:00:00 2001 From: James Chen Date: Fri, 25 Apr 2014 17:40:56 +0800 Subject: [PATCH 5/7] Update CHANGELOG [ci skip] --- CHANGELOG.REMOVED.git-id | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.REMOVED.git-id b/CHANGELOG.REMOVED.git-id index a9e3a35e50..4275082f44 100644 --- a/CHANGELOG.REMOVED.git-id +++ b/CHANGELOG.REMOVED.git-id @@ -1 +1 @@ -486db4b893330d8f16bc8023ec809c9df138c23d \ No newline at end of file +c55d35d7f00646adb2d6f440d385970a0868795b \ No newline at end of file From 74044b268514768afc9b4a55eb88e9c948e5d336 Mon Sep 17 00:00:00 2001 From: James Chen Date: Fri, 25 Apr 2014 17:41:03 +0800 Subject: [PATCH 6/7] Update AUTHORS [ci skip] --- AUTHORS | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index 8b0c2f0a6a..a3a2326313 100644 --- a/AUTHORS +++ b/AUTHORS @@ -63,6 +63,7 @@ Developers: Fixed potential crashes in EventDispatch while using SceneGraphPriroity listeners and added helper function to check it Fixed a protential crash in EventDispatch while unregistering listener right after it was registered Adding an extra verification in Node's destructor + Added RefPtr smart pointer support silverscania Pass correct parameter to glPixelStorei when creating a texture @@ -786,6 +787,7 @@ Developers: newnon Adds getCurrentLanguageCode() which returns iso 639-1 language code + Adds support for get response when Activity's onActivityResult is triggered youknowone Adds iOS-like elastic bounceback support for cocos2d::extension::ScrollView @@ -815,12 +817,13 @@ Developers: Mazyod Fixed a bug that HTTPClient reports 2xx status codes as errors Added missing Text Font and Placeholder feature of EditBox for Mac platform + HttpRequest uses std::function as callback iSevenDays Fixed a bug that the result of 'malloc' is incompatible with type 'unsigned char *' in Image::saveImageToPNG Fixed a potential memory leak in CCEditBoxImplIOS.mm Fixed incompatible pointer conversion in external/chipmunk/src/cpArray.c - Fix memory leak in CCImage + Fix memory leak in 'Image' ololomax Fixed a potential crash in SceneReader::createNodeWithSceneFile @@ -830,6 +833,15 @@ Developers: sachingarg05 Re-added orientation change callback in java activity + + dplusic + Fixed that cc.pGetAngle may return wrong value + + zifter + Fixed a bug that the effect of particle loaded from CocosBuilder is incorrectly + + twhittock + Fixed a bug that Application::run returns wrong value on Mac platform Retired Core Developers: WenSheng Yang From cc11ab9c733eb83ebe7e5737ad9ada10564ababc Mon Sep 17 00:00:00 2001 From: James Chen Date: Fri, 25 Apr 2014 17:42:26 +0800 Subject: [PATCH 7/7] Update AUTHORS [ci skip] --- AUTHORS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index a3a2326313..a7332fc8f9 100644 --- a/AUTHORS +++ b/AUTHORS @@ -823,7 +823,8 @@ Developers: Fixed a bug that the result of 'malloc' is incompatible with type 'unsigned char *' in Image::saveImageToPNG Fixed a potential memory leak in CCEditBoxImplIOS.mm Fixed incompatible pointer conversion in external/chipmunk/src/cpArray.c - Fix memory leak in 'Image' + Fixed memory leak in 'Image' + Fixed loosing precision when using 'recv' in 'Console' ololomax Fixed a potential crash in SceneReader::createNodeWithSceneFile