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 42c8f50551 Merge branch 'master' into jgrpp
# Conflicts:
#	.github/workflows/ci-build.yml
#	.github/workflows/release-linux.yml
#	.github/workflows/release-macos.yml
#	.github/workflows/release-windows.yml
#	.gitignore
#	COMPILING.md
#	src/company_gui.cpp
#	src/date_gui.cpp
#	src/engine.cpp
#	src/engine_func.h
#	src/fileio.cpp
#	src/linkgraph/linkgraph_gui.h
#	src/newgrf_debug_gui.cpp
#	src/newgrf_gui.cpp
#	src/order_gui.cpp
#	src/osk_gui.cpp
#	src/rail_gui.cpp
#	src/road_gui.cpp
#	src/script/api/script_event_types.hpp
#	src/sl/oldloader_sl.cpp
#	src/smallmap_gui.cpp
#	src/station_cmd.cpp
#	src/toolbar_gui.cpp
#	src/town_gui.cpp
#	src/transparency_gui.cpp
#	src/vehicle_gui.cpp
#	src/widget.cpp
#	src/widget_type.h
#	src/widgets/dropdown.cpp
#	src/widgets/dropdown_func.h
#	src/widgets/dropdown_type.h
#	src/widgets/group_widget.h
#	src/widgets/vehicle_widget.h
#	src/window.cpp
#	src/window_gui.h
#	src/window_type.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