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 ead18b2af2 Merge branch 'master' into jgrpp
# Conflicts:
#	CMakeLists.txt
#	src/3rdparty/md5/md5.h
#	src/3rdparty/squirrel/squirrel/squtils.h
#	src/animated_tile.cpp
#	src/console_func.h
#	src/core/CMakeLists.txt
#	src/core/container_func.hpp
#	src/core/smallstack_type.hpp
#	src/crashlog.cpp
#	src/crashlog.h
#	src/debug.h
#	src/economy.cpp
#	src/gamelog.cpp
#	src/industry_gui.cpp
#	src/lang/catalan.txt
#	src/misc_gui.cpp
#	src/network/network_content.h
#	src/newgrf.cpp
#	src/newgrf.h
#	src/newgrf_config.cpp
#	src/newgrf_config.h
#	src/newgrf_gui.cpp
#	src/os/unix/font_unix.cpp
#	src/os/windows/crashlog_win.cpp
#	src/rail_cmd.cpp
#	src/saveload/animated_tile_sl.cpp
#	src/script/api/script_tilelist.cpp
#	src/settings.cpp
#	src/settingsgen/settingsgen.cpp
#	src/sl/oldloader_sl.cpp
#	src/station.cpp
#	src/station_cmd.cpp
#	src/stdafx.h
#	src/strgen/strgen.cpp
#	src/strgen/strgen_base.cpp
#	src/table/settings/gui_settings.ini
#	src/train_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/vehicle_cmd.cpp
#	src/vehicle_gui_base.h
#	src/viewport_sprite_sorter.h
12 months ago
..
api Merge branch 'master' into jgrpp 12 months ago
CMakeLists.txt Merge branch 'master' into jgrpp 1 year ago
script_config.cpp Merge branch 'master' into jgrpp 12 months ago
script_config.hpp Merge branch 'master' into jgrpp 12 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 12 months ago
script_gui.h Fix #10578: Allow to select any version of AI/GS from GUI (#10604) 1 year ago
script_info.cpp Codechange: remove manual allocation/free for SQ_instance 1 year ago
script_info.hpp Merge branch 'master' into jgrpp 12 months ago
script_info_dummy.cpp Codechange: use fmt::format to create dummy scripts 1 year ago
script_instance.cpp Merge branch 'master' into jgrpp 12 months ago
script_instance.hpp Merge branch 'master' into jgrpp 12 months ago
script_scanner.cpp Merge branch 'master' into jgrpp 12 months ago
script_scanner.hpp Codechange: use fmt::format_to to format the help message 1 year ago
script_storage.hpp Merge branch 'master' into jgrpp 1 year ago
script_suspend.hpp
squirrel.cpp Merge branch 'master' into jgrpp 12 months ago
squirrel.hpp Merge branch 'master' into jgrpp 12 months ago
squirrel_class.hpp Change: Use gender-neutral pronouns in console command messages (and comments) (#9203) 3 years ago
squirrel_helper.hpp Merge branch 'master' into jgrpp 12 months ago
squirrel_helper_type.hpp Change: include fmt.h C++ headers in stdafx.h 1 year ago
squirrel_std.cpp Merge branch 'master' into jgrpp 12 months ago
squirrel_std.hpp