OpenTTD-patches/media/baseset
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
..
extra_signals Fix direction of semaphore no-entry signal sprites for W-E track 2022-12-30 00:14:40 +00:00
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 2024-01-15 17:42:26 +00:00
extra_signals.grf Fix direction of semaphore no-entry signal sprites for W-E track 2022-12-30 00:14:40 +00:00
innerhighlight.grf
misc_gui.grf
no_music.obm
no_sound.obs
OpenTTD-font.md Change: Update OpenTTD TTF fonts to v0.6 2024-03-11 22:36:37 +01:00
OpenTTD-Mono.ttf Change: Update OpenTTD TTF fonts to v0.6 2024-03-11 22:36:37 +01:00
OpenTTD-Sans.ttf Change: Update OpenTTD TTF fonts to v0.6 2024-03-11 22:36:37 +01:00
OpenTTD-Serif.ttf Change: Update OpenTTD TTF fonts to v0.6 2024-03-11 22:36:37 +01:00
OpenTTD-Small.ttf Change: Update OpenTTD TTF fonts to v0.6 2024-03-11 22:36:37 +01:00
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