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

Merge branch 'v3' into develop_migrate_math_lib

This commit is contained in:
Ricardo Quesada 2014-04-25 17:56:52 -07:00
parent 85e97f246d cc11ab9c73
commit b801995bbe
4 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
AUTHORS
View File

@ -63,6 +63,7 @@ Developers:
Fixed potential crashes in EventDispatch while using SceneGraphPriroity listeners and added helper function to check it 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 Fixed a protential crash in EventDispatch while unregistering listener right after it was registered
Adding an extra verification in Node's destructor Adding an extra verification in Node's destructor
Added RefPtr<T> smart pointer support
silverscania silverscania
Pass correct parameter to glPixelStorei when creating a texture Pass correct parameter to glPixelStorei when creating a texture
@ -786,6 +787,7 @@ Developers:
newnon newnon
Adds getCurrentLanguageCode() which returns iso 639-1 language code Adds getCurrentLanguageCode() which returns iso 639-1 language code
Adds support for get response when Activity's onActivityResult is triggered
youknowone youknowone
Adds iOS-like elastic bounceback support for cocos2d::extension::ScrollView Adds iOS-like elastic bounceback support for cocos2d::extension::ScrollView
@ -815,12 +817,14 @@ Developers:
Mazyod Mazyod
Fixed a bug that HTTPClient reports 2xx status codes as errors Fixed a bug that HTTPClient reports 2xx status codes as errors
Added missing Text Font and Placeholder feature of EditBox for Mac platform Added missing Text Font and Placeholder feature of EditBox for Mac platform
HttpRequest uses std::function as callback
iSevenDays iSevenDays
Fixed a bug that the result of 'malloc' is incompatible with type 'unsigned char *' in Image::saveImageToPNG 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 a potential memory leak in CCEditBoxImplIOS.mm
Fixed incompatible pointer conversion in external/chipmunk/src/cpArray.c Fixed incompatible pointer conversion in external/chipmunk/src/cpArray.c
Fix memory leak in CCImage Fixed memory leak in 'Image'
Fixed loosing precision when using 'recv' in 'Console'
ololomax ololomax
Fixed a potential crash in SceneReader::createNodeWithSceneFile Fixed a potential crash in SceneReader::createNodeWithSceneFile
@ -831,6 +835,15 @@ Developers:
sachingarg05 sachingarg05
Re-added orientation change callback in java activity 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: Retired Core Developers:
WenSheng Yang WenSheng Yang
Author of windows port, CCTextField, Author of windows port, CCTextField,

2
CHANGELOG.REMOVED.git-id
View File

@ -1 +1 @@
02451d8f73c78341cb22b90556ab891ef136c5e1 c55d35d7f00646adb2d6f440d385970a0868795b

4
cocos/2d/platform/mac/CCApplication.mm
View File

@ -66,7 +66,7 @@ int Application::run()
{ {
if(!applicationDidFinishLaunching()) if(!applicationDidFinishLaunching())
{ {
return 0; return 1;
} }
long lastTime = 0L; long lastTime = 0L;
@ -105,7 +105,7 @@ int Application::run()
glview->release(); glview->release();
return true; return 0;
} }
void Application::setAnimationInterval(double interval) void Application::setAnimationInterval(double interval)

2
cocos/network/SocketIO.cpp
View File

@ -124,7 +124,7 @@ void SIOClientImpl::handshake()
request->setUrl(pre.str().c_str()); request->setUrl(pre.str().c_str());
request->setRequestType(HttpRequest::Type::GET); request->setRequestType(HttpRequest::Type::GET);
request->setResponseCallback(this, httpresponse_selector(SIOClientImpl::handshakeResponse)); request->setResponseCallback(CC_CALLBACK_2(SIOClientImpl::handshakeResponse, this));
request->setTag("handshake"); request->setTag("handshake");
log("SIOClientImpl::handshake() waiting"); log("SIOClientImpl::handshake() waiting");