Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update 3rd party lib references #19959

Merged
merged 8 commits into from
Jul 23, 2019
Merged

Update 3rd party lib references #19959

merged 8 commits into from
Jul 23, 2019

Commits on May 29, 2019

  1. Merge pull request #4 from cocos2d/v3 

    Sync with master branch
    @rh101
    rh101 authored May 29, 2019
    Configuration menu
    Copy the full SHA
    30fb96e View commit details
    Browse the repository at this point in the history

Commits on May 30, 2019

  1. Added RenderTexture::saveToFileAsNonPMA() to save images without PMA. 

    Set the PMA parameter to true when calling initWithRawData() inside RenderTexture::newImage(), since textures are PMA.
Renamed Image::premultipliedAlpha() to Image::premultiplyAlpha() to better reflect it's action, and made it public.
Added Image::reversePremultipliedAlpha() to allow the reversing of the PMA.
Updated CCImage-ios.mm to set the correct bitmapInfo for PMA and non-PMA images before saving a file.
Updated RenderTextureTest::RenderTextureSave() to cater for non-PMA file saving.
    @rh101
    rh101 committed May 30, 2019
    Configuration menu
    Copy the full SHA
    67d2f79 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2019

  1. [CCImage-ios.mm] Fixed indentation.

    @rh101
    rh101 committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    b5bdada View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2019

  1. Merge pull request #5 from cocos2d/v3 

    Sync with master branch
    @rh101
    rh101 authored Jun 16, 2019
    Configuration menu
    Copy the full SHA
    7065335 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2019

  1. Merge pull request #7 from cocos2d/v3 

    Synced with master branch
    @rh101
    rh101 authored Jun 22, 2019
    Configuration menu
    Copy the full SHA
    94ec877 View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2019

  1. Merge pull request #8 from cocos2d/v3 

    Sync with master
    @rh101
    rh101 authored Jun 30, 2019
    Configuration menu
    Copy the full SHA
    92dd2e5 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2019

  1. Merge pull request #9 from cocos2d/v3 

    Sync with master
    @rh101
    rh101 authored Jul 20, 2019
    Configuration menu
    Copy the full SHA
    628c758 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2019

  1. Update to v3-deps-159

    @rh101
    rh101 committed Jul 22, 2019
    Configuration menu
    Copy the full SHA
    72b6484 View commit details
    Browse the repository at this point in the history