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

Sync with master #21

Merged
merged 15 commits into from
May 14, 2020
Merged

Sync with master #21

merged 15 commits into from
May 14, 2020

Commits on Jan 6, 2020

  1. [bugfix] set CFBundleExectuable in template info.plist (#20425) 

    fix #20414
    @PatriceJiang @minggo
    PatriceJiang authored and minggo committed Jan 6, 2020
    Configuration menu
    Copy the full SHA
    bc800ef View commit details
    Browse the repository at this point in the history

  2. fix memory leak (#20423)

    @minggo
    coulsonwang authored and minggo committed Jan 6, 2020
    Configuration menu
    Copy the full SHA
    cfad5de View commit details
    Browse the repository at this point in the history

  3. set attribute (#20417)

    @PatriceJiang @minggo
    PatriceJiang authored and minggo committed Jan 6, 2020
    Configuration menu
    Copy the full SHA
    e628a78 View commit details
    Browse the repository at this point in the history

  4. V4 uilayout scissorclipping fix (#20415) 

    * Fix for issue #19890

* Updated with better fix from the V3 PR #18651

* Formatting fix

* Fixed issue with incorrect type (double instead of float) when compiling on certain platforms.

* Another attempt to fix compilation issue
    @rh101 @minggo
    rh101 authored and minggo committed Jan 6, 2020
    Configuration menu
    Copy the full SHA
    1959c79 View commit details
    Browse the repository at this point in the history

  5. V4 bmfont improved api (#20406) 

    * Merged improved BM font API from Cocos2d-x V3.  Code based on #20309 and #20300

* Added missing test resources.
    @rh101 @minggo
    rh101 authored and minggo committed Jan 6, 2020
    Configuration menu
    Copy the full SHA
    8d2646b View commit details
    Browse the repository at this point in the history

  6. set xcode installation path to (#20402)

    @minggo
    minggo committed Jan 6, 2020
    Configuration menu
    Copy the full SHA
    41ed468 View commit details
    Browse the repository at this point in the history

  7. [ci skip][AUTO]: updating luabinding & cocos_file.json automatically (#… 

    …20438)
    @CocosRobot @minggo
    CocosRobot authored and minggo committed Jan 6, 2020
    Configuration menu
    Copy the full SHA
    4c17a75 View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2020

  1. fix memory leak issue (#20440)

    @minggo
    coulsonwang authored and minggo committed Jan 8, 2020
    Configuration menu
    Copy the full SHA
    c98f105 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2020

  1. fix drawnode line width issue (#20442)

    @minggo
    coulsonwang authored and minggo committed Jan 9, 2020
    Configuration menu
    Copy the full SHA
    06367eb View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2020

  1. remove experimental (#20463)

    coulsonwang committed Feb 18, 2020
    Configuration menu
    Copy the full SHA
    38ce692 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2020

  1. Update README.md (#20477)

    @jareguo
    jareguo committed Mar 13, 2020
    Configuration menu
    Copy the full SHA
    63d3408 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2020

  1. Fix incorrect rendering with tilemaps with csv data on windows (#20483) 

    Each tilemap row would be shifted to the right a certain number of
tiles.
This is caused by the carriage return in windows being '\r\n' and
the way each csv line is parsed.
The '\r' at the beginning of each line would be parsed as a tile id.
On windows we must remove all 'r' from the csv string.
    @bolino
    bolino committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    2656646 View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2020

  1. fix cocos command usage for windows

    @minggo
    minggo committed Apr 7, 2020
    Configuration menu
    Copy the full SHA
    f888277 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2020

  1. Setup precompiled header for all platforms (#20510) 

    * Update CMakeLists.txt

* Update CMakeLists.txt

* Update CMakeLists.txt
    @crazyhappygame
    crazyhappygame committed May 8, 2020
    Configuration menu
    Copy the full SHA
    7157fad View commit details
    Browse the repository at this point in the history

Commits on May 11, 2020

  1. Update AudioMacros.h (#20514) 

    Fix to compile with Visual Studio 2019.
Ricardo.
    @makiolo
    makiolo committed May 11, 2020
    Configuration menu
    Copy the full SHA
    674bb71 View commit details
    Browse the repository at this point in the history