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 ba8ed880c1 Merge branch 'master' into jgrpp-nrt
Merge NRT feature

# Conflicts:
#	docs/landscape.html
#	docs/landscape_grid.html
#	src/bridge_map.h
#	src/build_vehicle_gui.cpp
#	src/company_base.h
#	src/company_cmd.cpp
#	src/misc_gui.cpp
#	src/newgrf.cpp
#	src/newgrf_engine.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/npf/npf.cpp
#	src/road_cmd.cpp
#	src/road_func.h
#	src/road_gui.cpp
#	src/road_map.h
#	src/road_type.h
#	src/roadveh_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/company_sl.cpp
#	src/script/api/script_bridge.cpp
#	src/table/newgrf_debug_data.h
#	src/tile_cmd.h
#	src/town_cmd.cpp
#	src/tunnel_map.h
#	src/tunnelbridge_cmd.cpp
5 years ago
..
ai.hpp Remove: ENABLE_NETWORK switch 6 years ago
ai_config.cpp Codechange: Use null pointer literal instead of the NULL macro 6 years ago
ai_config.hpp Codechange: Use override specifer for overriding member declarations 6 years ago
ai_core.cpp Merge branch 'master' into jgrpp 5 years ago
ai_gui.cpp Codechange: Remove Company/OwnerByte types 5 years ago
ai_gui.hpp (svn r24554) -Add: Hotkeys for widgets in AI Debug window 12 years ago
ai_info.cpp Codechange: Use null pointer literal instead of the NULL macro 6 years ago
ai_info.hpp Codechange: Use null pointer literal instead of the NULL macro 6 years ago
ai_instance.cpp Add: New RoadType API functions. 5 years ago
ai_instance.hpp Codechange: Use override specifer for overriding member declarations 6 years ago
ai_scanner.cpp Codechange: Use null pointer literal instead of the NULL macro 6 years ago
ai_scanner.hpp Codechange: Use null pointer literal instead of the NULL macro 6 years ago