Merge branch 'master' into save_ext

# Conflicts: # src/saveload/company_sl.cpp # src/saveload/saveload.cpp
2017-03-19 12:12:52 +00:00
parent 79439925c8 17b46109ad
commit fae4ac1a5d
136 changed files with 1000 additions and 858 deletions
--- a/src/table/settings.ini
+++ b/src/table/settings.ini
@@ -762,7 +762,7 @@ base     = GameSettings
 var      = vehicle.train_acceleration_model
 type     = SLE_UINT8
 guiflags = SGF_MULTISTRING
-def      = 0
+def      = 1
 min      = 0
 max      = 1
 interval = 1
@@ -777,7 +777,7 @@ var      = vehicle.roadveh_acceleration_model
 type     = SLE_UINT8
 from     = 139
 guiflags = SGF_MULTISTRING
-def      = 0
+def      = 1
 min      = 0
 max      = 1
 interval = 1