closed #5537: add setAutoStep, isAutoStep and step method for PhysicsWorld.
closed #5537: add test case
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
fixed crash cause by incorrect font name.
init version of VertexIndexBuffer
change xcode project file
Merge branch 'v3-newaudio' of D:\github_repository\cocosNew into v3
compiles OK: raw version of vertex Index buffer, half version of vertex data
add indexData
Add Feature #5633:EventMouse should support getDelta, getDeltaX, getDeltaY functions
Merge pull request #1 from cocos2d/v3

Merge pull request #7604 from minggo/xcode-project-fix Xcode project fix
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
add

SpriteFrameCache::addSpriteFramesWithFileContent()
SpriteFrameCache::removeSpriteFramesFromFileContent()
add

SpriteFrameCache::addSpriteFramesWithFileContent()
SpriteFrameCache::removeSpriteFramesFromFileContent()
spaces
Merge branch 'v3' into v3_renderPrimitive

Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
finish index data
Merge pull request #2 from cocos2d/v3

update
Merge branch 'v3' into v3_renderPrimitive
original version of Primitive