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 e95216b59d Merge branch 'master' into jgrpp
# Conflicts:
#	src/company_cmd.cpp
#	src/core/geometry_func.cpp
#	src/date.cpp
#	src/genworld_gui.cpp
#	src/gfx.cpp
#	src/object_gui.cpp
#	src/openttd.cpp
#	src/settings_type.h
#	src/video/allegro_v.cpp
#	src/video/dedicated_v.cpp
#	src/video/null_v.cpp
#	src/video/sdl2_v.cpp
#	src/video/sdl_v.cpp
#	src/video/win32_v.cpp
3 years ago
..
api Merge branch 'master' into jgrpp 3 years ago
CMakeLists.txt Add: [CMake] Option to only build tools/docs 4 years ago
script_config.cpp Fix #6452: Reset only editable and visible settings from GUI (#7890) 3 years ago
script_config.hpp Fix #6452: Reset only editable and visible settings from GUI (#7890) 3 years ago
script_fatalerror.hpp Cleanup: Removed SVN headers 5 years ago
script_info.cpp Codechange: Use std::string in file scanners. 3 years ago
script_info.hpp Codechange: Use std::string in file scanners. 3 years ago
script_info_dummy.cpp Cleanup: Removed SVN headers 5 years ago
script_instance.cpp Merge branch 'master' into jgrpp 3 years ago
script_instance.hpp Add third DoCommand parameter p3 4 years ago
script_scanner.cpp Codechange: Use std::string in file scanners. 3 years ago
script_scanner.hpp Codechange: Use std::string in file scanners. 3 years ago
script_storage.hpp Add third DoCommand parameter p3 4 years ago
script_suspend.hpp Cleanup: Removed SVN headers 5 years ago
squirrel.cpp Merge branch 'master' into jgrpp 4 years ago
squirrel.hpp Script: Allow changing ops limit and memory limit settings in game 4 years ago
squirrel_class.hpp Cleanup: Removed SVN headers 5 years ago
squirrel_helper.hpp Cleanup: Removed SVN headers 5 years ago
squirrel_helper_type.hpp Cleanup: Removed SVN headers 5 years ago
squirrel_std.cpp Codechange: Remove min/max functions in favour of STL variants (#8502) 3 years ago
squirrel_std.hpp Cleanup: Removed SVN headers 5 years ago