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 cf4cf5c08f Codechange: vendor the nlohmann-json library (#11290)
(cherry picked from commit ba67f39db6)

# Conflicts:
#	.github/workflows/ci-build.yml
#	CMakeLists.txt
#	COMPILING.md
#	src/os/macosx/survey_osx.cpp
#	src/os/windows/survey_win.cpp
#	src/script/api/script_admin.cpp
#	src/script/api/script_event_types.cpp
#	src/tests/test_script_admin.cpp
7 months ago
..
api Codechange: vendor the nlohmann-json library (#11290) 7 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 11 months ago
script_fatalerror.hpp Script: Only log each string parameter warning message once 1 year ago
script_gui.cpp Change window close/deallocation to match upstream 9 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 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 7 months ago
script_instance.hpp Saveload: Remove test pass from ScriptInstance::Save 10 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 Codechange: automatic adding of _t to (u)int types, and WChar to char32_t 11 months ago
squirrel.hpp Merge branch 'master' into jgrpp 11 months ago
squirrel_class.hpp
squirrel_helper.hpp Codechange: make no assumptions on how the internals of TileIndex work (#11183) 10 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