Automatic merge of T1.5.1-1885-g12b1a74d5 and 8 pull requests

- Pull request #570 at 362e4e7: glTF 2.0 support with PBR lighting
- 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 #1094 at e6e95f1: Blended Braking Compatibility and Effectiveness Improvements
- Pull request #1095 at 55111e9: Make Control Confirmations Fade Out in Real Time
- 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/Popups/MessagesWindow.cs

@@ -139,7 +139,8 @@ public override void PrepareFrame(ElapsedTime elapsedTime, bool updateFull)
             }
 
             foreach (var message in Messages)
-                message.LabelShadow.Color.A = message.LabelText.Color.A = (byte)MathHelper.Lerp(255, 0, MathHelper.Clamp((float)((Owner.Viewer.Simulator.GameTime - message.EndTime) / FadeTime), 0, 1));
+                if (message.LabelShadow != null && message.LabelText != null) // It seems LabelShadow and LabelText aren't guaranteed to be initialized, causing rare crashes
+                    message.LabelShadow.Color.A = message.LabelText.Color.A = (byte)MathHelper.Lerp(255, 0, MathHelper.Clamp((float)((Owner.Viewer.RealTime - message.EndTime) / FadeTime), 0, 1));
         }
 
         class Message
@@ -184,7 +185,7 @@ public void AddMessage(string text, double duration)
         public void AddMessage(string key, string text, double duration)
         {
             var clockTime = Owner.Viewer.Simulator.ClockTime;
-            var gameTime = Owner.Viewer.Simulator.GameTime;
+            var realTime = Owner.Viewer.RealTime;
             while (true)
             {
                 // Store the original list and make a clone for replacing it thread-safely.
@@ -196,18 +197,18 @@ public void AddMessage(string key, string text, double duration)
 
                 // Clean out any existing duplicate key and expired messages.
                 newMessages = (from m in newMessages
-                               where (String.IsNullOrEmpty(key) || m.Key != key) && m.EndTime + FadeTime > Owner.Viewer.Simulator.GameTime
+                               where (String.IsNullOrEmpty(key) || m.Key != key) && m.EndTime + FadeTime > realTime
                                select m).ToList();
 
                 // Add the new message.
-                newMessages.Add(new Message(key, String.Format("{0} {1}", FormatStrings.FormatTime(clockTime), text), existingMessage != null ? existingMessage.StartTime : gameTime, gameTime + duration));
+                newMessages.Add(new Message(key, String.Format("{0} {1}", FormatStrings.FormatTime(clockTime), text), existingMessage != null ? existingMessage.StartTime : realTime, realTime + duration));
 
                 // Sort the messages.
                 newMessages = (from m in newMessages
                                orderby m.StartTime descending
                                select m).ToList();
 
-                // Thread-safely switch from the old list to the new list; we've only suceeded if the previous (return) value is the old list.
+                // Thread-safely switch from the old list to the new list; we've only succeeded if the previous (return) value is the old list.
                 if (Interlocked.CompareExchange(ref Messages, newMessages, oldMessages) == oldMessages)
                     break;
             }