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 a98a56669b Merge branch 'master' into jgrpp
# Conflicts:
#	regression/regression/result.txt
#	src/autoreplace_cmd.cpp
#	src/industry_gui.cpp
#	src/landscape.cpp
#	src/network/network_content.cpp
#	src/newgrf_roadstop.cpp
#	src/pathfinder/yapf/yapf_ship.cpp
#	src/road_gui.cpp
#	src/saveload/ai_sl.cpp
#	src/saveload/saveload.h
#	src/saveload/vehicle_sl.cpp
#	src/station.cpp
#	src/station_gui.cpp
#	src/video/cocoa/cocoa_ogl.h
#	src/video/sdl2_opengl_v.h
#	src/video/video_driver.hpp
#	src/video/win32_v.h
#	src/widget_type.h
#	src/widgets/dropdown.cpp
#	src/widgets/dropdown_type.h
#	src/window.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. 6 months ago
script_info.cpp Merge tag '14.0-beta1' into jgrpp 4 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 Codechange: use fmt::format_to to format the help message 1 year ago
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