From 23960d0f2c82a634e0ca1be720c229ac22f14962 Mon Sep 17 00:00:00 2001 From: PeterN Date: Thu, 31 Jan 2019 13:57:44 +0000 Subject: Feature: Group liveries, and livery window usability enhancements. (#7108) * Change: Replace checkbox in livery selection window with Default option in drop down selection. This reduces clutter in the UI and allows for primary/secondary colours to independently follow the default scheme if desired. * Feature: Add vehicle group liveries. --- media/extra_grf/openttd.nfo | 2 ++ media/extra_grf/openttdgui.nfo | 6 +++++- media/extra_grf/openttdgui_group_livery.png | Bin 0 -> 1426 bytes 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 media/extra_grf/openttdgui_group_livery.png (limited to 'media') diff --git a/media/extra_grf/openttd.nfo b/media/extra_grf/openttd.nfo index 7ece5c714..460007d68 100644 --- a/media/extra_grf/openttd.nfo +++ b/media/extra_grf/openttd.nfo @@ -14,6 +14,8 @@ // allowing it to be used. // +//@@WARNING DISABLE 60 + // // Number of sprites, it is wrong, but GRFcodec automagically gets it right. // diff --git a/media/extra_grf/openttdgui.nfo b/media/extra_grf/openttdgui.nfo index 1b17b8651..d0fbba0e7 100644 --- a/media/extra_grf/openttdgui.nfo +++ b/media/extra_grf/openttdgui.nfo @@ -7,7 +7,7 @@ // See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . // -1 * 0 0C "OpenTTD GUI graphics" - -1 * 3 05 15 \b 175 // OPENTTD_SPRITE_COUNT + -1 * 3 05 15 \b 179 // OPENTTD_SPRITE_COUNT -1 sprites/openttdgui.png 8bpp 66 8 64 31 -31 7 normal -1 sprites/openttdgui.png 8bpp 146 8 64 31 -31 7 normal -1 sprites/openttdgui.png 8bpp 226 8 64 31 -31 7 normal @@ -183,3 +183,7 @@ -1 sprites/openttdgui.png 8bpp 440 440 20 20 0 0 normal -1 sprites/openttdgui.png 8bpp 466 440 20 20 0 0 normal -1 sprites/openttdgui.png 8bpp 490 440 20 20 0 0 normal + -1 sprites/openttdgui_group_livery.png 8bpp 0 0 20 20 0 0 normal + -1 sprites/openttdgui_group_livery.png 8bpp 21 0 20 20 0 0 normal + -1 sprites/openttdgui_group_livery.png 8bpp 42 0 20 20 0 0 normal + -1 sprites/openttdgui_group_livery.png 8bpp 63 0 20 20 0 0 normal diff --git a/media/extra_grf/openttdgui_group_livery.png b/media/extra_grf/openttdgui_group_livery.png new file mode 100644 index 000000000..f45be670c Binary files /dev/null and b/media/extra_grf/openttdgui_group_livery.png differ -- cgit v1.2.3-70-g09d2