update from cocos2d-x