re add commented test case back
Merge branch 'v3' into fast_tmx
support for fast tmx hex
optimise tile map rendering
add hex tile map test back
update curl test url
merge upstream/v3
Merge pull request #7303 from heliclei/update-curl-test

Update curl test url
Merge pull request #7299 from dabingnn/fast_tmx

Fast tmx
fix windows compile and running error
Merge https://github.com/cocos2d/cocos2d-x into my
initialize member variable
fix indent problems
Merge pull request #7311 from andyque/fixWindowsError

fix windows compile and running error
should not include android cpp files in win/wp project
Merge pull request #7314 from joshuastray/fix_win_proj

should not include android cpp files in win/wp project
Merge https://github.com/cocos2d/cocos2d-x into my