Automatic merge of T1.5.1-1852-g24537f48e and 10 pull requests

- Pull request #570 at 362e4e7: glTF 2.0 support with PBR lighting
- Pull request #1062 at 9a76b26: Train Forces popup Window.
- Pull request #1064 at 1be1fc4: Add Train Info tab to Help window (F1)
- Pull request #1085 at 37e2817: updates key commands for Train Operations window and also Daylight Offset
- Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc)
- Pull request #1090 at 9e0bfe8: Add null check to avoid crash on corrupt signal files
- Pull request #1092 at d5816e4: Adds $gradient, $req, depart-early and passing-time to Manual
- Pull request #1082 at 5845a1a: Allow variable water level in glass gauge
- Pull request #1081 at 689494b: Brake cuts power unification
- Pull request #1091 at b0c622b: Automatic speed control

Author: openrails-bot

Source/RunActivity/Viewer3D/Processes/GameStateRunActivity.cs

@@ -52,7 +52,7 @@ public class GameStateRunActivity : GameState
 
         static Viewer Viewer { get { return Program.Viewer; } set { Program.Viewer = value; } }
         static ORTraceListener ORTraceListener { get { return Program.ORTraceListener; } set { Program.ORTraceListener = value; } }
-        static string logFilePath { get { return Program.logFileName; } set { Program.logFileName = value; } }
+        static string logFileName { get { return Program.logFileName; } set { Program.logFileName = value; } }
         static string EvaluationFilename { get { return Program.EvaluationFilename; } set { Program.EvaluationFilename = value; } }
 
         /// <summary>
@@ -811,30 +811,13 @@ void InitLogging(UserSettings settings, string[] args, bool appendLog)
                 {
                     fileName = settings.LoggingFilename;
                 }
-                logFilePath = GetFilePath(settings, fileName);
+                logFileName = GetFilePath(settings, fileName);
 
                 // Ensure we start with an empty file.
                 if (!appendLog)
-                {
-                    if (File.Exists(logFilePath))
-                    {
-                        try
-                        {
-                            var logFileExtension = Path.GetExtension(logFilePath);
-                            var prevLogPath = Path.ChangeExtension(logFilePath, ".prev" + logFileExtension);
-                            if (File.Exists(prevLogPath)) { File.Delete(prevLogPath); }
-                            File.Move(logFilePath, prevLogPath);
-                        }
-                        catch (Exception e)
-                        {
-                            Console.WriteLine("Failed to move log file: " + e.Message);
-                            File.Delete(logFilePath);
-                        }
-                    }
-                }
-
+                    File.Delete(logFileName);
                 // Make Console.Out go to the log file AND the output stream.
-                Console.SetOut(new FileTeeLogger(logFilePath, Console.Out));
+                Console.SetOut(new FileTeeLogger(logFileName, Console.Out));
                 // Make Console.Error go to the new Console.Out.
                 Console.SetError(Console.Out);
             }
@@ -853,8 +836,8 @@ void InitLogging(UserSettings settings, string[] args, bool appendLog)
                 LogSeparator();
                 Console.WriteLine("Version    = {0}", VersionInfo.Version.Length > 0 ? VersionInfo.Version : "<none>");
                 Console.WriteLine("Build      = {0}", VersionInfo.Build);
-                if (logFilePath.Length > 0)
-                    Console.WriteLine("Logfile    = {0}", logFilePath);
+                if (logFileName.Length > 0)
+                    Console.WriteLine("Logfile    = {0}", logFileName);
                 Console.WriteLine("Executable = {0}", Path.GetFileName(ApplicationInfo.ProcessFile));
                 foreach (var arg in args)
                     Console.WriteLine("Argument   = {0}", arg);
@@ -1062,8 +1045,8 @@ void UninitLoading()
 
         static void CopyLog(string toFile)
         {
-            if (logFilePath.Length == 0) return;
-            File.Copy(logFilePath, toFile, true);
+            if (logFileName.Length == 0) return;
+            File.Copy(logFileName, toFile, true);
         }
 
         void InitSimulator(UserSettings settings, string[] args, string mode)