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 3a47b421b0 Merge branch 'master' into jgrpp
# Conflicts:
#	src/company_cmd.cpp
#	src/core/overflowsafe_type.hpp
#	src/economy.cpp
#	src/engine_base.h
#	src/ground_vehicle.cpp
#	src/group_gui.cpp
#	src/industry_cmd.cpp
#	src/industry_gui.cpp
#	src/newgrf_commons.cpp
#	src/newgrf_engine.cpp
#	src/newgrf_industries.cpp
#	src/newgrf_object.cpp
#	src/newgrf_roadstop.cpp
#	src/newgrf_station.cpp
#	src/rail_gui.cpp
#	src/road_cmd.h
#	src/road_gui.cpp
#	src/saveload/afterload.cpp
#	src/script/api/script_log.cpp
#	src/script/api/script_log.hpp
#	src/settings_gui.cpp
#	src/settingsgen/settingsgen.cpp
#	src/station_cmd.cpp
#	src/station_cmd.h
#	src/station_gui.cpp
#	src/strgen/strgen.cpp
#	src/string_func.h
#	src/string_type.h
#	src/table/settings/network_private_settings.ini
#	src/tests/math_func.cpp
#	src/textfile_gui.cpp
#	src/timetable_gui.cpp
#	src/town_cmd.cpp
#	src/vehicle.cpp
#	src/waypoint_cmd.cpp
#	src/waypoint_cmd.h
#	src/widgets/dropdown.cpp
1 year ago
..
api Merge branch 'master' into jgrpp 1 year ago
CMakeLists.txt Merge branch 'master' into jgrpp 1 year ago
script_config.cpp Codechange: use std::string for text file name resolution 1 year ago
script_config.hpp Codechange: use std::string for text file name resolution 1 year ago
script_fatalerror.hpp Script: Only log each string parameter warning message once 1 year ago
script_gui.cpp Merge branch 'master' into jgrpp 1 year ago
script_gui.h Fix #10578: Allow to select any version of AI/GS from GUI (#10604) 1 year ago
script_info.cpp Codechange: replace ClampToI32/U16 with ClampTo<int32_t/uint16_t> 1 year ago
script_info.hpp Merge branch 'master' into jgrpp 1 year ago
script_info_dummy.cpp Change: Use gender-neutral pronouns 3 years ago
script_instance.cpp Merge branch 'master' into jgrpp 1 year ago
script_instance.hpp Merge branch 'master' into jgrpp 1 year ago
script_scanner.cpp Merge branch 'master' into jgrpp 1 year ago
script_scanner.hpp Fix #10073: Stop truncating output of list_ai and friends commands 2 years ago
script_storage.hpp Merge branch 'master' into jgrpp 1 year ago
script_suspend.hpp
squirrel.cpp Codechange: replace printf with PRINTF macros by fmt::format for scripts 1 year ago
squirrel.hpp Merge branch 'master' into jgrpp 1 year ago
squirrel_class.hpp
squirrel_helper.hpp Cleanup: Unused alloca definitions and includes 1 year ago
squirrel_helper_type.hpp Change: include fmt.h C++ headers in stdafx.h 1 year ago
squirrel_std.cpp Cleanup: Unused alloca definitions and includes 1 year ago
squirrel_std.hpp