You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
OpenTTD-patches/media
Jonathan G Rennison d5a7a67b8c Merge branch 'master' into jgrpp
# Conflicts:
#	.github/workflows/ci-build.yml
#	src/ai/ai_gui.cpp
#	src/blitter/32bpp_optimized.cpp
#	src/blitter/32bpp_simple.cpp
#	src/blitter/32bpp_sse2.cpp
#	src/blitter/8bpp_optimized.cpp
#	src/blitter/8bpp_simple.cpp
#	src/blitter/null.cpp
#	src/blitter/null.hpp
#	src/company_gui.cpp
#	src/game/game_gui.cpp
#	src/genworld_gui.cpp
#	src/gfx.cpp
#	src/gfx_func.h
#	src/graph_gui.cpp
#	src/industry_gui.cpp
#	src/linkgraph/linkgraphjob.cpp
#	src/network/network_gui.cpp
#	src/newgrf_debug_gui.cpp
#	src/openttd.cpp
#	src/pathfinder/npf/aystar.h
#	src/road_gui.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/script/api/script_log.cpp
#	src/script/api/script_town.cpp
#	src/script/script_gui.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/settings_table.cpp
#	src/settings_type.h
#	src/smallmap_gui.cpp
#	src/sortlist_type.h
#	src/spritecache.cpp
#	src/spriteloader/grf.cpp
#	src/spriteloader/grf.hpp
#	src/spriteloader/spriteloader.hpp
#	src/station_cmd.cpp
#	src/station_cmd.h
#	src/station_gui.cpp
#	src/strings.cpp
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/town_gui.cpp
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
#	src/video/opengl.cpp
#	src/video/opengl.h
#	src/widgets/dropdown.cpp
#	src/widgets/dropdown_type.h
#	src/window_gui.h
6 months ago
..
baseset Merge branch 'master' into jgrpp 6 months ago
CMakeLists.txt Add: [CMake] Install menu and media files 3 years ago
openttd.16.png (svn r21264) -Change: compress some PNGs more efficiently 14 years ago
openttd.32.bmp (svn r5872) - Feature: Add an icon to the SDL openttd executable. 18 years ago
openttd.32.png (svn r21264) -Change: compress some PNGs more efficiently 14 years ago
openttd.32.xpm (svn r2371) - Fix: [ 1144510 ] make install tries to install scenarios in the (non-existing) personal dir when USE_HOMEDIR is specified. 19 years ago
openttd.48.png (svn r21264) -Change: compress some PNGs more efficiently 14 years ago
openttd.64.png (svn r21264) -Change: compress some PNGs more efficiently 14 years ago
openttd.64.xpm (svn r1601) Add: A brand new set of icons. 20 years ago
openttd.128.png (svn r21264) -Change: compress some PNGs more efficiently 14 years ago
openttd.256.png (svn r21264) -Change: compress some PNGs more efficiently 14 years ago
openttd.512.png Add: Larger size renderings of the logo/icon (#8961) 3 years ago
openttd.1024.png Add: Larger size renderings of the logo/icon (#8961) 3 years ago
openttd.2048.png Add: Larger size renderings of the logo/icon (#8961) 3 years ago
openttd.desktop Update openttd.desktop -> change app name 10 months ago
openttd.svg (svn r18655) -Fix: the icon that is supposed to be 256x256 pixels wasn't 256x256 pixels 15 years ago