openttd

Files

Jonathan G Rennison ae9b416684 Merge branch 'master' into jgrpp

# Conflicts:
#	src/ai/ai_core.cpp
#	src/ai/ai_gui.cpp
#	src/ai/ai_instance.cpp
#	src/console_cmds.cpp
#	src/engine_type.h
#	src/game/game_gui.cpp
#	src/game/game_instance.cpp
#	src/goal.cpp
#	src/goal_cmd.h
#	src/lang/english.txt
#	src/lang/estonian.txt
#	src/network/network_client.cpp
#	src/newgrf.cpp
#	src/newgrf_generic.h
#	src/openttd.cpp
#	src/saveload/saveload.h
#	src/script/api/script_log.cpp
#	src/script/api/script_town.cpp
#	src/settings_table.cpp
#	src/station_cmd.cpp
#	src/station_cmd.h
#	src/station_map.h
#	src/strings.cpp
#	src/table/settings/difficulty_settings.ini
#	src/table/settings/gui_settings.ini
#	src/tbtr_template_gui_main.h
#	src/timetable_cmd.cpp
#	src/timetable_cmd.h
#	src/timetable_gui.cpp
#	src/town_gui.cpp
#	src/train_gui.cpp
#	src/water_cmd.cpp

2023-02-11 23:05:22 +00:00

Baseset.cmake

Codechange: [CMake] Add checks for baseset script parameters

2021-03-09 22:42:25 +01:00

CreateGRF.cmake

Fix: [CMake] Check nforenum and grfcodec return value

2021-04-24 21:16:06 +02:00

Desktop.cmake

Add: [CMake] Install menu and media files

2021-03-09 22:42:25 +01:00

FindVersion.cmake

cmake: Don't try to write rev.cpp/etc if no path specified