dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
fa2f3ed1049f1f171ecc2f40b5d27c9d481bf0d5
openttd/src/script
History
Jonathan G Rennison f4e29071be Merge tag '1.11.0-beta2' into jgrpp 
# Conflicts:
#	.github/workflows/ci-build.yml
#	.github/workflows/release.yml
#	CMakeLists.txt
#	src/blitter/32bpp_optimized.cpp
#	src/debug.cpp
#	src/gfx.cpp
#	src/gfx_func.h
#	src/lang/czech.txt
#	src/lang/english.txt
#	src/lang/italian.txt
#	src/lang/swedish.txt
#	src/lang/ukrainian.txt
#	src/network/network_server.cpp
#	src/os/windows/crashlog_win.cpp
#	src/os/windows/win32.cpp
#	src/pathfinder/follow_track.hpp
#	src/screenshot.cpp
#	src/settings_type.h
#	src/spritecache.cpp
#	src/vehicle_gui.cpp
#	src/video/sdl2_v.cpp
#	src/video/video_driver.cpp
#	src/video/video_driver.hpp
#	src/video/win32_v.cpp
2021-03-02 11:59:03 +00:00
..
api
Merge tag '1.11.0-beta2' into jgrpp
2021-03-02 11:59:03 +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