Merge branch 'master' into jgrpp

# Conflicts: # src/saveload/company_sl.cpp
2017-02-28 00:15:45 +00:00
parent 8cf0f354d9 9071d5f07f
commit a6168dd2f0
81 changed files with 331 additions and 243 deletions
--- a/src/table/settings.ini
+++ b/src/table/settings.ini
@@ -885,7 +885,7 @@ base     = GameSettings
 var      = vehicle.train_acceleration_model
 type     = SLE_UINT8
 guiflags = SGF_MULTISTRING
-def      = 0
+def      = 1
 min      = 0
 max      = 1
 interval = 1
@@ -900,7 +900,7 @@ var      = vehicle.roadveh_acceleration_model
 type     = SLE_UINT8
 from     = 139
 guiflags = SGF_MULTISTRING
-def      = 0
+def      = 1
 min      = 0
 max      = 1
 interval = 1