OpenTTD-patches/media/baseset
Jonathan G Rennison b72366419b Merge branch 'master' into jgrpp
# Conflicts:
#	src/blitter/32bpp_anim.cpp
#	src/blitter/8bpp_optimized.cpp
#	src/gfx.cpp
#	src/gfx_func.h
#	src/gfxinit.cpp
#	src/network/core/os_abstraction.cpp
#	src/spritecache.cpp
2023-12-28 16:56:54 +00:00
..
extra_signals
misc_gui
openttd Change: [CMake] Use explicit list for grf source files (#11539) 2023-12-04 16:41:02 +00:00
orig_extra Feature: Toyland-specific river graphics (#11523) 2023-12-27 17:44:21 -05:00
road_waypoints
CMakeLists.txt Merge branch 'master' into jgrpp 2023-12-17 23:00:46 +00:00
extra_signals.grf
innerhighlight.grf
misc_gui.grf
no_music.obm
no_sound.obs
openttd.grf Fix: Add shading to river slopes 2023-11-26 23:54:10 +01:00
openttd.grf.hash Fix: Add shading to river slopes 2023-11-26 23:54:10 +01:00
opntitle.dat
orig_dos_de.obg
orig_dos.obg
orig_dos.obm
orig_dos.obs
orig_extra.grf Feature: Toyland-specific river graphics (#11523) 2023-12-27 17:44:21 -05:00
orig_extra.grf.hash Feature: Toyland-specific river graphics (#11523) 2023-12-27 17:44:21 -05:00
orig_tto.obm
orig_win.obg
orig_win.obm
orig_win.obs
progsignals.grf
road_waypoints.grf
route_step.grf
tracerestrict.grf Improve colouring of restricted signal posts with original TTD graphics 2023-07-08 19:12:39 +01:00