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

Merge 3.17.2 #19755

Merged
merged 10 commits into from
May 27, 2019
Merged

Merge 3.17.2 #19755

merged 10 commits into from
May 27, 2019

Commits on May 8, 2019

  1. modify engine version (cocos2d#19677)

    @minggo
    minggo authored May 8, 2019
    Configuration menu
    Copy the full SHA
    3266a22 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2019

  1. protect empty string (cocos2d#19680)

    @PatriceJiang @minggo
    PatriceJiang authored and minggo committed May 9, 2019
    Configuration menu
    Copy the full SHA
    8e9edf6 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2019

  1. fix twice copy lua scripts error (cocos2d#19687) (cocos2d#19691)

    @drelaptop @minggo
    drelaptop authored and minggo committed May 10, 2019
    Configuration menu
    Copy the full SHA
    2a219a8 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2019

  1. rename Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.* to Cocos2dxLuaJa… 

    …vaBridge.* (cocos2d#19694)
    @PatriceJiang @minggo
    PatriceJiang authored and minggo committed May 14, 2019
    Configuration menu
    Copy the full SHA
    01a1063 View commit details
    Browse the repository at this point in the history

  2. fix get environment (cocos2d#19690)

    @PatriceJiang @minggo
    PatriceJiang authored and minggo committed May 14, 2019
    Configuration menu
    Copy the full SHA
    7ef9bb8 View commit details
    Browse the repository at this point in the history

  3. update release note and change log (cocos2d#19711)

    @minggo
    minggo authored May 14, 2019
    Configuration menu
    Copy the full SHA
    a8019eb View commit details
    Browse the repository at this point in the history

Commits on May 15, 2019

  1. [js-tests/cpp-tests] iOS: add fonts to Info.plist (cocos2d#19708) 

    * add fonts to Info.plist

* use tabs instead of spaces

* fix lua-tests
    @PatriceJiang @minggo
    PatriceJiang authored and minggo committed May 15, 2019
    Configuration menu
    Copy the full SHA
    073823f View commit details
    Browse the repository at this point in the history

  2. Update CHANGELOG

    @minggo
    minggo authored May 15, 2019
    Configuration menu
    Copy the full SHA
    ed5db3e View commit details
    Browse the repository at this point in the history

Commits on May 16, 2019

  1. setPercent after initialization (cocos2d#19718)

    @PatriceJiang @minggo
    PatriceJiang authored and minggo committed May 16, 2019
    Configuration menu
    Copy the full SHA
    1528ea0 View commit details
    Browse the repository at this point in the history

Commits on May 24, 2019

  1. fix conflict

    @minggo
    minggo committed May 24, 2019
    Configuration menu
    Copy the full SHA
    3d74674 View commit details
    Browse the repository at this point in the history