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 7f6b1d6b94 Merge branch 'master' into jgrpp
# Conflicts:
#	src/company_cmd.cpp
#	src/company_func.h
#	src/core/overflowsafe_type.hpp
#	src/engine.cpp
#	src/music/midifile.cpp
#	src/network/network_command.cpp
#	src/newgrf_debug_gui.cpp
#	src/newgrf_roadstop.h
#	src/newgrf_spritegroup.cpp
#	src/os/macosx/crashlog_osx.cpp
#	src/os/unix/crashlog_unix.cpp
#	src/pathfinder/yapf/yapf_common.hpp
#	src/road_gui.cpp
#	src/saveload/engine_sl.cpp
#	src/script/api/script_depotlist.cpp
#	src/script/api/script_roadtypelist.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/strings.cpp
#	src/table/settings/game_settings.ini
6 months ago
..
api Merge branch 'master' into jgrpp 6 months ago
CMakeLists.txt
script_config.cpp Use core/format.hpp for fmt includes 11 months ago
script_config.hpp Merge branch 'master' into jgrpp 1 year ago
script_fatalerror.hpp
script_gui.cpp Merge branch 'master' into jgrpp 6 months ago
script_gui.h Change: Allow opening multiple script debug windows by holding Ctrl. 6 months ago
script_info.cpp Merge branch 'master' into jgrpp 10 months ago
script_info.hpp Merge branch 'master' into jgrpp 1 year ago
script_info_dummy.cpp Use core/format.hpp for fmt includes 11 months ago
script_instance.cpp Merge branch 'master' into jgrpp 6 months ago
script_instance.hpp Merge branch 'master' into jgrpp 6 months ago
script_scanner.cpp Merge branch 'master' into jgrpp 7 months ago
script_scanner.hpp Codechange: use fmt::format_to to format the help message 1 year ago
script_storage.hpp Add: [Script] GSAsyncMode to set async mode of gamescript commands (#10913) 1 year ago
script_suspend.hpp
squirrel.cpp Merge branch 'master' into jgrpp 7 months ago
squirrel.hpp Merge branch 'master' into jgrpp 1 year ago
squirrel_class.hpp
squirrel_helper.hpp Merge branch 'master' into jgrpp 6 months ago
squirrel_helper_type.hpp Codechange: automatic adding of _t to (u)int types, and WChar to char32_t 11 months ago
squirrel_std.cpp Merge branch 'master' into jgrpp 1 year ago
squirrel_std.hpp