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

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

This commit is contained in:
bmanGH 2013-10-17 16:54:56 +08:00
parent 02e02e233a 222cb93aaf
commit aa324114c1
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
AUTHORS
View File

@ -617,6 +617,9 @@ Developers:
jimmystar jimmystar
Fixed a bug that cc.Scheduler.schedule(target, func) without repeat argument couldn't repeat schedule forever on device. Fixed a bug that cc.Scheduler.schedule(target, func) without repeat argument couldn't repeat schedule forever on device.
XiaoLongHan (kpkhxlgy0)
Fixed a bug that outside of keyboard can't be responded to close keyboard when using EditBox。
Retired Core Developers: Retired Core Developers:
WenSheng Yang WenSheng Yang
Author of windows port, CCTextField, Author of windows port, CCTextField,

2
CHANGELOG
View File

@ -12,6 +12,8 @@ cocos2d-x-3.0alpha1 @??? 2013
[FIX] Fixed application will crash when pause and resume. [FIX] Fixed application will crash when pause and resume.
[Mac] [Mac]
[FIX] Removed unused CCLOG() from GL initialization [FIX] Removed unused CCLOG() from GL initialization
[iOS]
[FIX] Can't click the area that outside of keyboard to close keyboard when using EditBox.
[Javascript binding] [Javascript binding]
[FIX] Fixed a memory leak in ScriptingCore::runScript() [FIX] Fixed a memory leak in ScriptingCore::runScript()
[FIX] sys.localStorage.getItem() does not support non-ascii string. [FIX] sys.localStorage.getItem() does not support non-ascii string.

2
cocos/2d/platform/ios/EAGLView.mm
View File

@ -381,7 +381,7 @@ static CCEAGLView *view = 0;
for(UIView* view in subviews) for(UIView* view in subviews)
{ {
if([view isKindOfClass:NSClassFromString(@"CustomUITextField")]) if([view isKindOfClass:NSClassFromString(@"CCCustomUITextField")])
{ {
if ([view isFirstResponder]) if ([view isFirstResponder])
{ {