OpenTTD-patches/media
Jonathan G Rennison fe730bce31 Merge branch 'master' into jgrpp
# Conflicts:
#	.github/workflows/ci-build.yml
#	.github/workflows/codeql.yml
#	.github/workflows/release-linux.yml
#	.github/workflows/release-macos.yml
#	.github/workflows/release-windows.yml
#	src/map.cpp
#	src/music/midifile.hpp
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/pathfinder/yapf/yapf_rail.cpp
#	src/pbs.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.h
#	src/saveload/vehicle_sl.cpp
#	src/script/api/script_text.cpp
#	src/ship_cmd.cpp
#	src/train_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/vehicle_func.h
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
#	src/viewport.cpp
#	src/waypoint_cmd.cpp
2024-03-12 17:44:28 +00:00
..
baseset Merge branch 'master' into jgrpp 2024-03-12 17:44:28 +00:00
CMakeLists.txt Add: [CMake] Install menu and media files 2021-03-09 22:42:25 +01:00
openttd.16.png (svn r21264) -Change: compress some PNGs more efficiently 2010-11-20 12:11:11 +00:00
openttd.32.bmp (svn r5872) - Feature: Add an icon to the SDL openttd executable. 2006-08-13 08:18:11 +00:00
openttd.32.png (svn r21264) -Change: compress some PNGs more efficiently 2010-11-20 12:11:11 +00:00
openttd.32.xpm (svn r2371) - Fix: [ 1144510 ] make install tries to install scenarios in the (non-existing) personal dir when USE_HOMEDIR is specified. 2005-05-28 10:32:09 +00:00
openttd.48.png (svn r21264) -Change: compress some PNGs more efficiently 2010-11-20 12:11:11 +00:00
openttd.64.png (svn r21264) -Change: compress some PNGs more efficiently 2010-11-20 12:11:11 +00:00
openttd.64.xpm (svn r1601) Add: A brand new set of icons. 2005-01-22 23:57:03 +00:00
openttd.128.png (svn r21264) -Change: compress some PNGs more efficiently 2010-11-20 12:11:11 +00:00
openttd.256.png (svn r21264) -Change: compress some PNGs more efficiently 2010-11-20 12:11:11 +00:00
openttd.512.png Add: Larger size renderings of the logo/icon (#8961) 2021-08-31 10:25:51 +02:00
openttd.1024.png Add: Larger size renderings of the logo/icon (#8961) 2021-08-31 10:25:51 +02:00
openttd.2048.png Add: Larger size renderings of the logo/icon (#8961) 2021-08-31 10:25:51 +02:00
openttd.desktop Update openttd.desktop -> change app name 2023-08-08 22:20:57 +02:00
openttd.svg (svn r18655) -Fix: the icon that is supposed to be 256x256 pixels wasn't 256x256 pixels 2009-12-28 19:26:44 +00:00