OpenTTD-patches/media/baseset
Jonathan G Rennison 3a47b421b0 Merge branch 'master' into jgrpp
# Conflicts:
#	src/company_cmd.cpp
#	src/core/overflowsafe_type.hpp
#	src/economy.cpp
#	src/engine_base.h
#	src/ground_vehicle.cpp
#	src/group_gui.cpp
#	src/industry_cmd.cpp
#	src/industry_gui.cpp
#	src/newgrf_commons.cpp
#	src/newgrf_engine.cpp
#	src/newgrf_industries.cpp
#	src/newgrf_object.cpp
#	src/newgrf_roadstop.cpp
#	src/newgrf_station.cpp
#	src/rail_gui.cpp
#	src/road_cmd.h
#	src/road_gui.cpp
#	src/saveload/afterload.cpp
#	src/script/api/script_log.cpp
#	src/script/api/script_log.hpp
#	src/settings_gui.cpp
#	src/settingsgen/settingsgen.cpp
#	src/station_cmd.cpp
#	src/station_cmd.h
#	src/station_gui.cpp
#	src/strgen/strgen.cpp
#	src/string_func.h
#	src/string_type.h
#	src/table/settings/network_private_settings.ini
#	src/tests/math_func.cpp
#	src/textfile_gui.cpp
#	src/timetable_gui.cpp
#	src/town_cmd.cpp
#	src/vehicle.cpp
#	src/waypoint_cmd.cpp
#	src/waypoint_cmd.h
#	src/widgets/dropdown.cpp
2023-06-03 19:16:57 +01: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 Add a baseset GRF for misc GUI sprites 2022-01-21 23:34:39 +00:00
openttd Fix: Incorrect y-position of monospace glyphs. (#10794) 2023-05-09 23:02:06 +02:00
orig_extra Fix: Bad alignment of button icons when using the original baseset. (#10200) 2022-12-25 18:03:39 -05:00
road_waypoints Add replacement sprites for road waypoint buildings 2022-01-26 21:46:36 +00:00
CMakeLists.txt Add replacement sprites for road waypoint buildings 2022-01-26 21:46:36 +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 Add 3 more zoning highlight colours 2020-10-28 00:27:48 +00:00
misc_gui.grf Add a baseset GRF for misc GUI sprites 2022-01-21 23:34:39 +00:00
no_music.obm Codechange: rework how grf and ob[msg] are generated 2020-06-05 19:36:05 +02:00
no_sound.obs Codechange: rework how grf and ob[msg] are generated 2020-06-05 19:36:05 +02:00
openttd.grf Fix: Incorrect y-position of monospace glyphs. (#10794) 2023-05-09 23:02:06 +02:00
opntitle.dat Codechange: rework how grf and ob[msg] are generated 2020-06-05 19:36:05 +02:00
orig_dos_de.obg Codechange: rework how grf and ob[msg] are generated 2020-06-05 19:36:05 +02:00
orig_dos.obg Codechange: rework how grf and ob[msg] are generated 2020-06-05 19:36:05 +02:00
orig_dos.obm Fix #8313: use correct capitalization for TTO / DOS base-music (#8385) 2020-12-15 22:47:57 +01:00
orig_dos.obs Codechange: rework how grf and ob[msg] are generated 2020-06-05 19:36:05 +02:00
orig_extra.grf Fix: Bad alignment of button icons when using the original baseset. (#10200) 2022-12-25 18:03:39 -05:00
orig_tto.obm Fix #8313: use correct capitalization for TTO / DOS base-music (#8385) 2020-12-15 22:47:57 +01:00
orig_win.obg Codechange: rework how grf and ob[msg] are generated 2020-06-05 19:36:05 +02:00
orig_win.obm Codechange: rework how grf and ob[msg] are generated 2020-06-05 19:36:05 +02:00
orig_win.obs Codechange: rework how grf and ob[msg] are generated 2020-06-05 19:36:05 +02:00
progsignals.grf CMake: Move built in GRfs to baseset dir 2020-06-28 21:57:02 +01:00
road_waypoints.grf Add replacement sprites for road waypoint buildings 2022-01-26 21:46:36 +00:00
route_step.grf CMake: Move built in GRfs to baseset dir 2020-06-28 21:57:02 +01:00
tracerestrict.grf CMake: Move built in GRfs to baseset dir 2020-06-28 21:57:02 +01:00