dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
e95216b59dbcf976ade8fae5b13c2e21d759de55
openttd/src/script
History
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
2021-02-19 15:38:34 +00:00
..
api
Merge branch 'master' into jgrpp
2021-02-19 15:38:34 +00:00
CMakeLists.txt
Add: [CMake] Option to only build tools/docs
2020-12-13 22:46:46 +01:00
script_config.cpp
Fix #6452: Reset only editable and visible settings from GUI (#7890)
2020-12-27 15:05:47 +01:00
script_config.hpp
Fix #6452: Reset only editable and visible settings from GUI (#7890)
2020-12-27 15:05:47 +01:00
script_fatalerror.hpp
Cleanup: Removed SVN headers
2019-11-10 17:59:20 +00:00
script_info_dummy.cpp
Cleanup: Removed SVN headers
2019-11-10 17:59:20 +00:00
script_info.cpp
Codechange: Use std::string in file scanners.
2020-12-27 13:19:25 +01:00
script_info.hpp
Codechange: Use std::string in file scanners.
2020-12-27 13:19:25 +01:00
script_instance.cpp
Merge branch 'master' into jgrpp
2021-01-31 01:08:35 +00:00
script_instance.hpp
Add third DoCommand parameter p3
2020-10-17 17:25:44 +01:00
script_scanner.cpp
Codechange: Use std::string in file scanners.
2020-12-27 13:19:25 +01:00
script_scanner.hpp
Codechange: Use std::string in file scanners.
2020-12-27 13:19:25 +01:00
script_storage.hpp
Add third DoCommand parameter p3
2020-10-17 17:25:44 +01:00
script_suspend.hpp
Cleanup: Removed SVN headers
2019-11-10 17:59:20 +00:00
squirrel_class.hpp
Cleanup: Removed SVN headers
2019-11-10 17:59:20 +00:00
squirrel_helper_type.hpp
Cleanup: Removed SVN headers
2019-11-10 17:59:20 +00:00
squirrel_helper.hpp
Cleanup: Removed SVN headers
2019-11-10 17:59:20 +00:00
squirrel_std.cpp
Codechange: Remove min/max functions in favour of STL variants (#8502)
2021-01-08 11:16:18 +01:00
squirrel_std.hpp
Cleanup: Removed SVN headers
2019-11-10 17:59:20 +00:00
squirrel.cpp
Merge branch 'master' into jgrpp
2020-12-07 17:56:44 +00:00
squirrel.hpp
Script: Allow changing ops limit and memory limit settings in game
2020-09-14 18:04:19 +01:00