Merge branch 'master' into enhanced_viewport_overlay

# Conflicts: # src/industry_cmd.cpp # src/saveload/saveload.cpp # src/stdafx.h # src/vehicle.cpp
2018-03-11 22:10:21 +00:00
parent 5abd7ad788 a537fd5d0e
commit 16c67ea484
122 changed files with 1061 additions and 893 deletions
--- a/src/table/settings.ini
+++ b/src/table/settings.ini
@@ -2198,7 +2198,7 @@ cat      = SC_BASIC
 base     = GameSettings
 var      = game_creation.variety
 type     = SLE_UINT8
-flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
+from     = 197
 guiflags = SGF_MULTISTRING | SGF_NEWGAME_ONLY
 def      = 0
 min      = 0