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 c8817d7f4e Merge branch 'master' into jgrpp
# Conflicts:
#	os/macosx/notarize.sh
#	src/3rdparty/CMakeLists.txt
#	src/3rdparty/squirrel/squirrel/sqcompiler.cpp
#	src/3rdparty/squirrel/squirrel/sqdebug.cpp
#	src/3rdparty/squirrel/squirrel/sqvm.cpp
#	src/console_cmds.cpp
#	src/core/span_type.hpp
#	src/crashlog.cpp
#	src/currency.h
#	src/date_gui.cpp
#	src/driver.cpp
#	src/fios.cpp
#	src/genworld_gui.cpp
#	src/hotkeys.cpp
#	src/misc_gui.cpp
#	src/music/os2_m.cpp
#	src/network/core/os_abstraction.h
#	src/network/network_server.cpp
#	src/newgrf.cpp
#	src/newgrf_config.h
#	src/newgrf_text.cpp
#	src/openttd.cpp
#	src/os/macosx/font_osx.cpp
#	src/os/macosx/misc_osx.cpp
#	src/os/os2/CMakeLists.txt
#	src/os/os2/os2.cpp
#	src/os/unix/CMakeLists.txt
#	src/os/windows/font_win32.cpp
#	src/os/windows/win32_main.cpp
#	src/saveload/saveload.cpp
#	src/script/api/script_text.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/stdafx.h
#	src/strings.cpp
#	src/timetable_gui.cpp
#	src/town_gui.cpp
#	src/train_cmd.cpp
#	src/video/dedicated_v.cpp
#	src/video/video_driver.cpp
#	src/video/win32_v.cpp
#	src/viewport.cpp
#	src/waypoint_gui.cpp
#	src/widgets/dropdown_type.h
#	src/window.cpp
#	src/window_gui.h
10 months ago
..
api Merge branch 'master' into jgrpp 10 months ago
CMakeLists.txt Merge branch 'master' into jgrpp 1 year ago
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: Only log each string parameter warning message once 1 year ago
script_gui.cpp Merge branch 'master' into jgrpp 10 months ago
script_gui.h Fix #10578: Allow to select any version of AI/GS from GUI (#10604) 1 year 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 Saveload: Remove test pass from ScriptInstance::Save 11 months ago
script_instance.hpp Saveload: Remove test pass from ScriptInstance::Save 11 months ago
script_scanner.cpp Use core/format.hpp for fmt includes 11 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 1 year ago
squirrel.hpp Merge branch 'master' into jgrpp 1 year ago
squirrel_class.hpp
squirrel_helper.hpp Merge branch 'master' into jgrpp 1 year 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 1 year ago
squirrel_std.hpp