summaryrefslogtreecommitdiff
path: root/media
diff options
context:
space:
mode:
authorPeterN <peter@fuzzle.org>2019-01-31 13:57:44 +0000
committerIngo von Borstel <github@planetmaker.de>2019-01-31 14:57:44 +0100
commit23960d0f2c82a634e0ca1be720c229ac22f14962 (patch)
tree7a7c75a5e7ae19943377756d49c477d759873d3b /media
parentba38a7ca652c00a1d0851f4d97f0b7d360df853c (diff)
downloadopenttd-23960d0f2c82a634e0ca1be720c229ac22f14962.tar.xz
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.
Diffstat (limited to 'media')
-rw-r--r--media/extra_grf/openttd.nfo2
-rw-r--r--media/extra_grf/openttdgui.nfo6
-rw-r--r--media/extra_grf/openttdgui_group_livery.pngbin0 -> 1426 bytes
3 files changed, 7 insertions, 1 deletions
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 <http://www.gnu.org/licenses/>.
//
-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
--- /dev/null
+++ b/media/extra_grf/openttdgui_group_livery.png
Binary files differ