openttd

Files

Jonathan G Rennison 02fe4af934 Merge branch 'master' into jgrpp

# Conflicts:
#	.github/workflows/release-windows.yml
#	src/company_base.h
#	src/company_cmd.cpp
#	src/company_gui.cpp
#	src/console_cmds.cpp
#	src/economy.cpp
#	src/economy_cmd.h
#	src/fios.h
#	src/goal.cpp
#	src/group_gui.cpp
#	src/network/core/config.h
#	src/network/network_admin.cpp
#	src/newgrf_config.cpp
#	src/os/windows/win32.cpp
#	src/saveload/afterload.cpp
#	src/saveload/company_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload_error.hpp
#	src/settings_gui.cpp
#	src/ship_cmd.cpp
#	src/stdafx.h
#	src/story.cpp
#	src/story_base.h
#	src/string.cpp
#	src/table/settings/economy_settings.ini
#	src/tests/CMakeLists.txt
#	src/tests/math_func.cpp

2023-05-30 00:49:24 +01:00

ai_config.cpp

Change: replace per-AI "start_date" with a global "competitors_interval" (#10653 )

2023-04-16 20:14:22 +02:00

ai_config.hpp

Change: replace per-AI "start_date" with a global "competitors_interval" (#10653 )

2023-04-16 20:14:22 +02:00

ai_core.cpp

Merge branch 'master' into jgrpp

2023-05-26 19:36:48 +01:00

ai_gui.cpp

Merge branch 'master' into jgrpp