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/script
Jonathan G Rennison 838b166726 Merge branch 'master' into jgrpp
# Conflicts:
#	src/cheat_gui.cpp
#	src/command.cpp
#	src/command_func.h
#	src/company_base.h
#	src/debug.cpp
#	src/debug.h
#	src/economy.cpp
#	src/engine_type.h
#	src/graph_gui.cpp
#	src/misc_cmd.cpp
#	src/misc_cmd.h
#	src/network/core/os_abstraction.cpp
#	src/openttd.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/settings_type.h
#	src/ship_cmd.cpp
#	src/stdafx.h
#	src/tests/bitmath_func.cpp
#	src/town_cmd.cpp
#	src/town_gui.cpp
3 months ago
..
api Merge branch 'master' into jgrpp 3 months ago
CMakeLists.txt
script_config.cpp Merge branch 'master' into jgrpp 3 months ago
script_config.hpp Merge branch 'master' into jgrpp 3 months ago
script_fatalerror.hpp
script_gui.cpp Merge branch 'master' into jgrpp 3 months ago
script_gui.h Change: Allow opening multiple script debug windows by holding Ctrl. 5 months ago
script_info.cpp Merge branch 'master' into jgrpp 3 months ago
script_info.hpp Merge branch 'master' into jgrpp 11 months ago
script_info_dummy.cpp Use core/format.hpp for fmt includes 11 months ago
script_instance.cpp Adding of _t to (u)int types, and WChar to char32_t 5 months ago
script_instance.hpp Adding of _t to (u)int types, and WChar to char32_t 5 months ago
script_scanner.cpp Adding of _t to (u)int types, and WChar to char32_t 5 months ago
script_scanner.hpp
script_storage.hpp Add: AI/GS Time Mode to choose between economy (default) and calendar time (#11603) 4 months ago
script_suspend.hpp
squirrel.cpp Adding of _t to (u)int types, and WChar to char32_t 5 months ago
squirrel.hpp Merge branch 'master' into jgrpp 11 months ago
squirrel_class.hpp
squirrel_helper.hpp Adding of _t to (u)int types, and WChar to char32_t 5 months ago
squirrel_helper_type.hpp Adding of _t to (u)int types, and WChar to char32_t 5 months ago
squirrel_std.cpp Merge branch 'master' into jgrpp 11 months ago
squirrel_std.hpp