OpenTTD-patches/src/script
Jonathan G Rennison 7960db35f2 Merge branch 'master' into jgrpp
# Conflicts:
#	config.lib
#	projects/openttd_vs140.vcxproj
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs141.vcxproj
#	projects/openttd_vs141.vcxproj.filters
#	projects/openttd_vs142.vcxproj
#	projects/openttd_vs142.vcxproj.filters
#	src/aircraft_cmd.cpp
#	src/base_station_base.h
#	src/core/pool_type.hpp
#	src/disaster_vehicle.cpp
#	src/economy.cpp
#	src/engine.cpp
#	src/group.h
#	src/group_cmd.cpp
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/lang/german.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/network/network_command.cpp
#	src/network/network_server.cpp
#	src/openttd.cpp
#	src/order_cmd.cpp
#	src/road_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/cargopacket_sl.cpp
#	src/saveload/linkgraph_sl.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/station_sl.cpp
#	src/saveload/town_sl.cpp
#	src/saveload/vehicle_sl.cpp
#	src/screenshot.cpp
#	src/screenshot.h
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/smallmap_gui.cpp
#	src/station.cpp
#	src/station_cmd.cpp
#	src/table/settings.ini
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/train.h
#	src/train_cmd.cpp
#	src/train_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/vehiclelist.cpp
#	src/window_type.h
2020-01-06 18:45:51 +00:00
..
api Merge branch 'master' into jgrpp 2020-01-06 18:45:51 +00:00
script_config.cpp Cleanup: Removed SVN headers 2019-11-10 17:59:20 +00:00
script_config.hpp Cleanup: Removed SVN headers 2019-11-10 17:59:20 +00: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 Cleanup: Removed SVN headers 2019-11-10 17:59:20 +00:00
script_info.hpp Cleanup: Removed SVN headers 2019-11-10 17:59:20 +00:00
script_instance.cpp Fix #7606: Game crash when trying to clean up a crashed script 2019-11-15 21:06:09 +01:00
script_instance.hpp Cleanup: Removed SVN headers 2019-11-10 17:59:20 +00:00
script_scanner.cpp Cleanup: Removed SVN headers 2019-11-10 17:59:20 +00:00
script_scanner.hpp Cleanup: Removed SVN headers 2019-11-10 17:59:20 +00:00
script_storage.hpp Cleanup: Removed SVN headers 2019-11-10 17:59:20 +00: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 Cleanup: Removed SVN headers 2019-11-10 17:59:20 +00:00
squirrel_std.hpp Cleanup: Removed SVN headers 2019-11-10 17:59:20 +00:00
squirrel.cpp Cleanup: Removed SVN headers 2019-11-10 17:59:20 +00:00
squirrel.hpp Cleanup: Removed SVN headers 2019-11-10 17:59:20 +00:00