merged cocos2dx v3.2