android-fix-resolutions : lp:~janisozaur/openrct2/+git/openrct2-janisozaur : Git : Code : OpenRCT2

Get this branch:: git clone -b android-fix-resolutions https://git.launchpad.net/~janisozaur/openrct2/+git/openrct2-janisozaur

Branch merges

Branch information

Name:: android-fix-resolutions

Repository:: lp:~janisozaur/openrct2/+git/openrct2-janisozaur

Recent commits

57af63a... by janisozaur on 2020-09-20

Don't use empty resolutions

4030d90... by Richard Fine <email address hidden> on 2020-09-20

Fix #12974: unable to build fences on slopes (#12975)

Fix the casing of 'isAllowedOnSlope' to match the way it is cased in the JSON files, which causes the flag to be read correctly and re-enables building on slopes for the scenery pieces which have it specified.

1a81558... by OpenRCT2 git bot <email address hidden> on 2020-09-20

Merge Localisation/master into OpenRCT2/develop

124161b... by Duncan <email address hidden> on 2020-09-19

Implement copy constructors (#12970)

4a79e93... by Michael Steenbeek on 2020-09-19

Replace gfx_draw_string_right() with DrawTextBasic (#12966)

fd194d0... by Michael Steenbeek on 2020-09-18

Allow compilation with nlohmann/json < 3.9.0

According to the [API docs](https://github.com/nlohmann/json/blob/develop/single_include/nlohmann/json.hpp#L23219-L23222), the fourth argument (which allows ignoring comments) was only introduced in version 3.9.0 (released on 27 July 2020), which is not present in Ubuntu 20.04 (it only has 3.7.3-1).

Since comments are not part of the JSON spec, this option is not terribly useful anyway. I have removed it, so that it can now compile on Ubuntu 20.04, and possibly also earlier versions.

a896d23... by Michael Steenbeek on 2020-09-18