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 d5a7a67b8c Merge branch 'master' into jgrpp
# Conflicts:
#	.github/workflows/ci-build.yml
#	src/ai/ai_gui.cpp
#	src/blitter/32bpp_optimized.cpp
#	src/blitter/32bpp_simple.cpp
#	src/blitter/32bpp_sse2.cpp
#	src/blitter/8bpp_optimized.cpp
#	src/blitter/8bpp_simple.cpp
#	src/blitter/null.cpp
#	src/blitter/null.hpp
#	src/company_gui.cpp
#	src/game/game_gui.cpp
#	src/genworld_gui.cpp
#	src/gfx.cpp
#	src/gfx_func.h
#	src/graph_gui.cpp
#	src/industry_gui.cpp
#	src/linkgraph/linkgraphjob.cpp
#	src/network/network_gui.cpp
#	src/newgrf_debug_gui.cpp
#	src/openttd.cpp
#	src/pathfinder/npf/aystar.h
#	src/road_gui.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/script/api/script_log.cpp
#	src/script/api/script_town.cpp
#	src/script/script_gui.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/settings_table.cpp
#	src/settings_type.h
#	src/smallmap_gui.cpp
#	src/sortlist_type.h
#	src/spritecache.cpp
#	src/spriteloader/grf.cpp
#	src/spriteloader/grf.hpp
#	src/spriteloader/spriteloader.hpp
#	src/station_cmd.cpp
#	src/station_cmd.h
#	src/station_gui.cpp
#	src/strings.cpp
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/town_gui.cpp
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
#	src/video/opengl.cpp
#	src/video/opengl.h
#	src/widgets/dropdown.cpp
#	src/widgets/dropdown_type.h
#	src/window_gui.h
6 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 Merge branch 'master' into jgrpp 6 months ago
ai_gui.cpp Merge branch 'master' into jgrpp 6 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 Merge branch 'master' into jgrpp 7 months ago
ai_scanner.hpp Codechange: use std::string for script info/library finding 1 year ago