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/game
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
5 months ago
..
CMakeLists.txt Feature: [UI] Split AI/Game Script configuration windows and add them to world gen window (#10058) 2 years ago
game.hpp Codechange: use fmt::format_to to format the help message 1 year ago
game_config.cpp Codechange: use std::string for script info/library finding 1 year ago
game_config.hpp Codechange: use std::string for script info/library finding 1 year ago
game_core.cpp Merge branch 'master' into jgrpp 5 months ago
game_gui.cpp Merge branch 'master' into jgrpp 5 months ago
game_gui.hpp Feature: [UI] Split AI/Game Script configuration windows and add them to world gen window (#10058) 2 years ago
game_info.cpp Avoid std::set in script version checks 10 months ago
game_info.hpp Codechange: use std::string for script library category 1 year ago
game_instance.cpp Merge branch 'master' into jgrpp 11 months ago
game_instance.hpp Merge branch 'master' into jgrpp 11 months ago
game_scanner.cpp Merge branch 'master' into jgrpp 6 months ago
game_scanner.hpp Codechange: use std::string for script info/library finding 1 year ago
game_text.cpp Merge branch 'master' into jgrpp 6 months ago
game_text.hpp Codechange: automatic adding of _t to (u)int types, and WChar to char32_t 11 months ago