Automatic merge of T1.5.1-684-gc6e0de1c4 and 9 pull requests

- Pull request #570 at c59c788: Experimental glTF 2.0 support with PBR lighting
- Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters
- Pull request #865 at a1318b5: Dispatcher window improvements
- Pull request #874 at f8dbeab: Dynamic brake controller refactoring
- Pull request #875 at 43bf33e: Bug fix for https://bugs.launchpad.net/or/+bug/2036346 Player train switching doesn't work with 3D cabs
- Pull request #876 at f92de76: docs: add source for documents previously on website to source Documentation folder
- Pull request #878 at 076cd04: Implement Polach Adhesion
- Pull request #883 at aac4d3f: SwitchPanel disconnect/connect handling
- Pull request #884 at 8b3d60a: build: Additional settings for dotnet build

Author: openrails-bot

.gitignore

@@ -365,4 +365,5 @@ ASALocalRun/
 healthchecksdb
 
 # Backup folder for Package Reference Convert tool in Visual Studio 2017
-MigrationBackup/
+MigrationBackup/
+/Source/RunActivity/Properties/launchSettings.json

Source/ORTS.Common/Input/UserCommand.cs

@@ -24,6 +24,7 @@ public enum UserCommand
         [GetString("Game Change Cab")] GameChangeCab,
         [GetString("Game Request Control")] GameRequestControl,
         [GetString("Game Multi Player Dispatcher")] GameMultiPlayerDispatcher,
+        [GetString("Game Multi Player Dispatcher Beta")] GameMultiPlayerDispatcherBeta,
         [GetString("Game Multi Player Texting")] GameMultiPlayerTexting,
         [GetString("Game Switch Manual Mode")] GameSwitchManualMode,
         [GetString("Game Reset Out Of Control Mode")] GameResetOutOfControlMode,
@@ -61,6 +62,8 @@ public enum UserCommand
         [GetString("Debug Precipitation Decrease")] DebugPrecipitationDecrease,
         [GetString("Debug Precipitation Liquidity Increase")] DebugPrecipitationLiquidityIncrease,
         [GetString("Debug Precipitation Liquidity Decrease")] DebugPrecipitationLiquidityDecrease,
+        [GetString("Debug Daylight Offset Increase")] DebugDaylightOffsetIncrease,
+        [GetString("Debug Daylight Offset Decrease")] DebugDaylightOffsetDecrease,
         [GetString("Debug Weather Change")] DebugWeatherChange,
         [GetString("Debug Clock Forwards")] DebugClockForwards,
         [GetString("Debug Clock Backwards")] DebugClockBackwards,

Source/ORTS.Settings/InputSettings.cs

@@ -480,6 +480,8 @@ static void InitializeCommands(UserCommandInput[] Commands)
             Commands[(int)UserCommand.DebugLockShadows] = new UserCommandKeyInput(0x1F, KeyModifiers.Control | KeyModifiers.Alt);
             Commands[(int)UserCommand.DebugLogger] = new UserCommandKeyInput(0x58);
             Commands[(int)UserCommand.DebugLogRenderFrame] = new UserCommandKeyInput(0x58, KeyModifiers.Alt);
+            Commands[(int)UserCommand.DebugDaylightOffsetDecrease] = new UserCommandKeyInput(0x0C, KeyModifiers.Shift |  KeyModifiers.Alt);
+            Commands[(int)UserCommand.DebugDaylightOffsetIncrease] = new UserCommandKeyInput(0x0D, KeyModifiers.Shift |  KeyModifiers.Alt);
             Commands[(int)UserCommand.DebugOvercastDecrease] = new UserCommandKeyInput(0x0C, KeyModifiers.Control);
             Commands[(int)UserCommand.DebugOvercastIncrease] = new UserCommandKeyInput(0x0D, KeyModifiers.Control);
             Commands[(int)UserCommand.DebugPhysicsForm] = new UserCommandKeyInput(0x3D, KeyModifiers.Alt);
@@ -520,6 +522,7 @@ static void InitializeCommands(UserCommandInput[] Commands)
             Commands[(int)UserCommand.GameExternalCabController] = new UserCommandKeyInput(0x29);
             Commands[(int)UserCommand.GameFullscreen] = new UserCommandKeyInput(0x1C, KeyModifiers.Alt);
             Commands[(int)UserCommand.GameMultiPlayerDispatcher] = new UserCommandKeyInput(0x0A, KeyModifiers.Control);
+            Commands[(int)UserCommand.GameMultiPlayerDispatcherBeta] = new UserCommandKeyInput(0x0A, KeyModifiers.Control | KeyModifiers.Shift);
             Commands[(int)UserCommand.GameMultiPlayerTexting] = new UserCommandKeyInput(0x14, KeyModifiers.Alt);
             Commands[(int)UserCommand.GamePause] = new UserCommandKeyInput(Keys.Pause);
             Commands[(int)UserCommand.GamePauseMenu] = new UserCommandKeyInput(0x01);

Source/Orts.Simulation/Simulation/Weather.cs

@@ -44,6 +44,9 @@ public class Weather
 
         // Fog/visibility distance. Ranges from 10m (can't see anything), 5km (medium), 20km (clear) to 100km (clear arctic).
         public float FogDistance;
+
+        // Daylight offset (-12h to +12h)
+        public int DaylightOffset = 0;
 
         // Precipitation liquidity; =1 for rain, =0 for snow; intermediate values possible with dynamic weather;
         public float PrecipitationLiquidity;

Source/RunActivity/Program.cs

@@ -20,6 +20,7 @@
 using System.Linq;
 using System.Reflection;
 using System.Runtime.InteropServices;
+using System.Windows.Forms;
 using Orts.Common;
 using Orts.Simulation;
 using Orts.Viewer3D;
@@ -41,6 +42,7 @@ static class Program
         public static Simulator Simulator;
         public static Viewer Viewer;
         public static DispatchViewer DebugViewer;
+        public static MapViewer DebugViewerBeta;
         public static SoundDebugForm SoundDebugForm;
         public static ORTraceListener ORTraceListener;
         public static string logFileName = "";          // contains path to file
@@ -60,6 +62,9 @@ static void Main(string[] args)
             path = Path.Combine(path, (Environment.Is64BitProcess) ? "X64" : "X86");
             NativeMethods.SetDllDirectory(path);
 
+            Application.EnableVisualStyles();
+            Application.SetCompatibleTextRenderingDefault(false);
+
             var game = new Game(settings);
             game.PushState(new GameStateRunActivity(args));
             game.Run();

Source/RunActivity/Viewer3D/Debugging/DebugViewerForm.Designer.cs

@@ -2138,6 +2138,9 @@ private void ClipDrag(int diffX, int diffY)
         #endregion
     }
 
+    
+    /* NOTE: Commented out to avoid duplication in namespace; copied to `DebugViewerBetaForm.cs` */
+    /*
     #region SignalWidget
     /// <summary>
     /// Defines a signal being drawn in a 2D view.
@@ -2448,5 +2451,5 @@ static public double DistanceSqr(dVector v1, dVector v2)
             return Math.Pow((v1.TileX - v2.TileX) * 2048 + v1.X - v2.X, 2)
                 + Math.Pow((v1.TileZ - v2.TileZ) * 2048 + v1.Z - v2.Z, 2);
         }
-    }
+    }*/
 }