You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
OpenTTD-patches/src/ai
Jonathan G Rennison c929f7075e Merge branch 'master' into jgrpp
# Conflicts:
#	cmake/SourceList.cmake
#	src/build_vehicle_gui.cpp
#	src/company_gui.cpp
#	src/console_cmds.cpp
#	src/depot_base.h
#	src/elrail.cpp
#	src/network/core/udp.cpp
#	src/network/network_admin.cpp
#	src/network/network_chat_gui.cpp
#	src/network/network_gui.cpp
#	src/network/network_server.cpp
#	src/newgrf.cpp
#	src/newgrf_engine.cpp
#	src/newgrf_railtype.cpp
#	src/newgrf_railtype.h
#	src/newgrf_storage.h
#	src/os/unix/crashlog_unix.cpp
#	src/rail.h
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/road_cmd.cpp
#	src/road_map.h
#	src/saveload/labelmaps_sl.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/sl/oldloader_sl.cpp
#	src/station_cmd.cpp
#	src/station_gui.cpp
#	src/table/settings/world_settings.ini
#	src/tests/test_script_admin.cpp
#	src/textfile_gui.cpp
#	src/toolbar_gui.cpp
#	src/train_cmd.cpp
#	src/tunnelbridge_cmd.cpp
#	src/vehicle_gui.cpp
#	src/widget.cpp
#	src/window.cpp
#	src/window_gui.h
#	src/window_type.h
7 months ago
..
CMakeLists.txt Add: introduce CMake for project management 4 years ago
ai.hpp Codechange: use fmt::format_to to format the help message 1 year ago
ai_config.cpp Codechange: use std::string for script info/library finding 1 year ago
ai_config.hpp Codechange: use std::string for script info/library finding 1 year ago
ai_core.cpp Rename close window functions to match upstream 9 months ago
ai_gui.cpp Merge branch 'master' into jgrpp 7 months ago
ai_gui.hpp Codechange: move windows common to AI and GS out of ai_gui 1 year ago
ai_info.cpp Avoid std::set in script version checks 10 months ago
ai_info.hpp Codechange: use std::string for script library category 1 year ago
ai_instance.cpp Merge branch 'master' into jgrpp 12 months ago
ai_instance.hpp Merge branch 'master' into jgrpp 12 months ago
ai_scanner.cpp Use core/format.hpp for fmt includes 11 months ago
ai_scanner.hpp Codechange: use std::string for script info/library finding 1 year ago