openttd

Files

Jonathan G Rennison 02549c5224 Merge branch 'master' into jgrpp

# Conflicts:
#	cmake/CompileFlags.cmake
#	src/cargomonitor.cpp
#	src/core/CMakeLists.txt
#	src/economy.cpp
#	src/landscape.cpp
#	src/linkgraph/flowmapper.cpp
#	src/linkgraph/linkgraph_gui.cpp
#	src/linkgraph/linkgraphschedule.cpp
#	src/misc_gui.cpp
#	src/newgrf_generic.cpp
#	src/newgrf_storage.cpp
#	src/rail_gui.cpp
#	src/saveload/afterload.cpp
#	src/saveload/station_sl.cpp
#	src/script/script_gui.cpp
#	src/station_cmd.cpp
#	src/station_gui.cpp
#	src/string_func.h
#	src/terraform_cmd.cpp

2023-06-08 00:01:38 +01:00

CMakeLists.txt

Feature: [UI] Split AI/Game Script configuration windows and add them to world gen window (#10058 )

2022-11-10 21:39:09 +01:00

game_config.cpp

Cleanup: Removed SVN headers

2019-11-10 17:59:20 +00:00

game_config.hpp

Cleanup: Removed SVN headers

2019-11-10 17:59:20 +00:00

game_core.cpp

Merge branch 'master' into jgrpp