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 5404be172c Merge branch 'master' into jgrpp
# Conflicts:
#	src/core/bitmath_func.cpp
#	src/core/bitmath_func.hpp
#	src/core/geometry_type.hpp
#	src/game/game_text.hpp
#	src/graph_gui.cpp
#	src/pathfinder/npf/npf.cpp
#	src/script/api/script_text.cpp
#	src/spritecache.cpp
#	src/track_func.h
5 months ago
..
api Merge branch 'master' into jgrpp 5 months ago
CMakeLists.txt
script_config.cpp Use core/format.hpp for fmt includes 11 months ago
script_config.hpp Merge branch 'master' into jgrpp 12 months ago
script_fatalerror.hpp
script_gui.cpp Merge branch 'master' into jgrpp 5 months ago
script_gui.h Change: Allow opening multiple script debug windows by holding Ctrl. 6 months ago
script_info.cpp Merge branch 'master' into jgrpp 9 months ago
script_info.hpp Merge branch 'master' into jgrpp 12 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 Adding of _t to (u)int types, and WChar to char32_t 5 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 12 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 12 months ago
squirrel_std.hpp