Fix video scale issue in iOS
Update CCParticleSystem.cpp

diff is base on WorldSpace, when you scale scene,you will get the wrong value.
Update CCParticleSystem.cpp
Fix Scale issue on cocos2d-x cpp-test
fix warn
Simplify Widget ContentSize cascade change algorithm
Fix void* casting
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-newaudio
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-newaudio
Fix the size of VideoPlayer is incorrect on android.
Merge pull request #7588 from Dhilan007/v3

fix warn
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-newaudio
Merge pull request #7590 from andyque/fixWidgetContentSize

Simplify Widget ContentSize cascade change algorithm
Merge pull request #7052 from gin0606/videoPlayerScaleIssue

Fix video scale issue in iOS
[ci skip]
Merge pull request #7597 from Dhilan007/v3-video-android

Fix the size of VideoPlayer is incorrect on android.
[ci skip]
Merge pull request #7585 from wagulu/patch-1

Update CCParticleSystem.cpp