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

Fix #1258: Add mixed hex and RGB(A) parsing to XMLColorToInt #1261

Merged
merged 6 commits into from
Apr 1, 2020
Merged

Fix #1258: Add mixed hex and RGB(A) parsing to XMLColorToInt #1261

merged 6 commits into from
Apr 1, 2020

Commits on Feb 22, 2020

  1. Fix #1258: Add mixed hex and RGBA parsing to XMLColorToInt 

    `XMLColorToInt` is used when parsing i.e. `color` attribute from map files on various elements such as vehicles, blips, radarareas, teams and so on. Before it only supported a single format for multi-value attributes.

So now it is possible to specify separate colors like so:
`#ff0, 255, 0, 0, #ff0000, #ffffff55`

Which corresponds:
yellow, red, red, transparent white
    @patrikjuvonen
    patrikjuvonen committed Feb 22, 2020
    Configuration menu
    Copy the full SHA
    ec5e0e5 View commit details
    Browse the repository at this point in the history

  2. Use unsigned int

    @patrikjuvonen
    patrikjuvonen committed Feb 22, 2020
    Configuration menu
    Copy the full SHA
    237dfcd View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2020

  1. Merge remote-tracking branch 'upstream/master' into feature/parse-mix… 

    …ed-colors
    @patrikjuvonen
    patrikjuvonen committed Apr 1, 2020
    Configuration menu
    Copy the full SHA
    b287100 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' into feature/parse-mix… 

    …ed-colors
    @patrikjuvonen
    patrikjuvonen committed Apr 1, 2020
    Configuration menu
    Copy the full SHA
    8cc1838 View commit details
    Browse the repository at this point in the history

  3. Handle empty strings as RGB skip

    @patrikjuvonen
    patrikjuvonen committed Apr 1, 2020
    Configuration menu
    Copy the full SHA
    a366db6 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'upstream/master' into feature/parse-mix… 

    …ed-colors
    @patrikjuvonen
    patrikjuvonen committed Apr 1, 2020
    Configuration menu
    Copy the full SHA
    3dfc8e3 View commit details
    Browse the repository at this point in the history