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 88670a230f Merge branch 'master' into jgrpp
# Conflicts:
#	src/articulated_vehicles.cpp
#	src/articulated_vehicles.h
#	src/base_media_base.h
#	src/base_media_func.h
#	src/build_vehicle_gui.cpp
#	src/dock_gui.cpp
#	src/main_gui.cpp
#	src/music_gui.cpp
#	src/network/network_chat_gui.cpp
#	src/network/network_content.cpp
#	src/newgrf.cpp
#	src/newgrf_roadstop.cpp
#	src/os/windows/string_uniscribe.h
#	src/os/windows/win32.cpp
#	src/rail_gui.cpp
#	src/road.cpp
#	src/road_gui.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/smallmap_gui.cpp
#	src/strings.cpp
#	src/terraform_gui.cpp
#	src/tests/test_script_admin.cpp
#	src/tests/test_window_desc.cpp
#	src/timer/timer_game_calendar.h
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/viewport.cpp
#	src/widget_type.h
#	src/window.cpp
#	src/window_gui.h
6 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 11 months ago
game_gui.cpp Merge branch 'master' into jgrpp 6 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