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 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
..
api Merge branch 'master' into jgrpp 5 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 11 months ago
script_fatalerror.hpp Script: Only log each string parameter warning message once 1 year ago
script_gui.cpp Merge branch 'master' into jgrpp 5 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 9 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 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 6 months ago
squirrel.hpp Merge branch 'master' into jgrpp 11 months 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 11 months ago
squirrel_std.hpp