move player.lua
Merge pull request #133 from htlxyz/v3quick

add ccsloader comment
Merge pull request #134 from htlxyz/v3quick

modify ccsloader document
disable High DPI support for win32
Merge branch 'v3quick' of https://github.com/dualface/cocos2d-x into v3quick
add Google NotoSansHans font
Merge pull request #1 from dualface/v3quick

update from dual face
增加ui.newTTFLabel 对自定义ttf字体的支持
Merge pull request #136 from bigHandYT/v3quick

增加ui.newTTFLabel 对自定义ttf字体的支持
supported encrypted image files; fixed #137
move ui to cc.ui
proj.mac: CC_USE_TIFF=1
removed debug log in HelplerFunc::getFileData()
modify welcome for uilabel
added macros CC_USE_JPEG; added macros for image use into ccConfig.h
removed cc.FileUtils:getInstance():getFileData() from framework; used cc.HelperFunc:getFileData()
disable High DPI support for mac
modify uilabel related code
Merge branch 'v3quick' of github.com:dualface/cocos2d-x into v3quick
move ui to deprecated