OpenTTD-patches/src/game
Jonathan G Rennison 1bfd96c7f2 Merge branch 'master' into jgrpp
# Conflicts:
#	src/3rdparty/fmt/core.h
#	src/command_type.h
#	src/console_cmds.cpp
#	src/core/overflowsafe_type.hpp
#	src/landscape.cpp
#	src/network/network.cpp
#	src/newgrf_object.h
#	src/object_cmd.cpp
#	src/order_gui.cpp
#	src/saveload/vehicle_sl.cpp
#	src/script/api/script_industrytype.cpp
#	src/script/api/script_object.hpp
#	src/script/api/script_town.cpp
#	src/table/object_land.h
#	src/timetable_cmd.cpp
#	src/tree_cmd.cpp
#	src/vehicle_gui.cpp
#	src/window.cpp
2023-01-15 19:28:37 +00:00
..
CMakeLists.txt Feature: [UI] Split AI/Game Script configuration windows and add them to world gen window (#10058) 2022-11-10 21:39:09 +01:00
game_config.cpp Cleanup: Removed SVN headers 2019-11-10 17:59:20 +00:00
game_config.hpp Cleanup: Removed SVN headers 2019-11-10 17:59:20 +00:00
game_core.cpp Merge branch 'master' into jgrpp 2023-01-02 01:23:36 +00:00
game_gui.cpp Merge tag '13.0-beta2' into jgrpp 2022-12-04 20:43:11 +00:00
game_gui.hpp Feature: [UI] Split AI/Game Script configuration windows and add them to world gen window (#10058) 2022-11-10 21:39:09 +01:00
game_info.cpp Merge branch 'master' into jgrpp 2023-01-02 01:23:36 +00:00
game_info.hpp Cleanup: Removed SVN headers 2019-11-10 17:59:20 +00:00
game_instance.cpp Codechange: Add support for additional command result values. 2021-12-16 22:28:32 +01:00
game_instance.hpp Codechange: Pass unpacked command arguments to command callbacks (except Script). 2021-12-16 22:28:32 +01:00
game_scanner.cpp Codechange: use C++11 constructs for for-each loops (#8432) 2020-12-25 19:38:18 +01:00
game_scanner.hpp Cleanup: Removed SVN headers 2019-11-10 17:59:20 +00:00
game_text.cpp Merge branch 'master' into jgrpp 2023-01-15 19:28:37 +00:00
game_text.hpp Codechange: Store GS lang texts in std::strings. 2020-05-21 20:02:34 +02:00
game.hpp Fix #9720: Delay start of GS/AI to after loading of savegame (#9745) 2022-12-28 05:02:26 +01:00