Automatic merge of X1.3.1-197-g76b1d3e06 and 7 pull requests

- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #226 at 26983e9: EmbedIO web server graphical track monitor
- Pull request #227 at 6ec1539: EmbedIO web server graphical train driving monitor
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #232 at dd38ddc: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #234 at 3ac34fe: Rehabilitate unit testing suite, migrate to xUnit 2
- Pull request #237 at abd68c3: Fixed 3D cab loading with undefined cabview control in CVF file https://bugs.launchpad.net/or/+bug/1888945

Source/Orts.Simulation/MultiPlayer/Message.cs

@@ -326,16 +326,8 @@ public MSGPlayer(string m)
                 url = areas[6].Trim();
                 ParseTrainCars(areas[7].Trim());
                 leadingID = areas[1].Trim();
-                int index = path.LastIndexOf("\\PATHS\\", StringComparison.OrdinalIgnoreCase);
-                if (index > 0)
-                {
-                    path = path.Remove(0, index + 7);
-                }
-                index = con.LastIndexOf("\\CONSISTS\\", StringComparison.OrdinalIgnoreCase);
-                if (index > 0)
-                {
-                    con = con.Remove(0, index + 10);
-                }
+                path = Path.GetFileName(path);
+                con = Path.GetFileName(con);
                 if (areas.Length >= 9) { version = int.Parse(areas[8]); }
                 if (areas.Length >= 10)
                 {

Source/Orts.Simulation/MultiPlayer/OnlineTrains.cs

@@ -19,6 +19,8 @@
 using Orts.Simulation.AIs;
 using Orts.Simulation.Physics;
 using Orts.Simulation.RollingStocks;
+using Orts.Simulation.Simulation;
+using ORTS.Content;
 using ORTS.Scripting.Api;
 using System;
 using System.Collections.Generic;
@@ -140,7 +142,7 @@ public void AddPlayers(MSGPlayer player, OnlinePlayer p)
             }
             p.url = player.url;
             p.LeadingLocomotiveID = player.leadingID;
-            p.con = MPManager.Simulator.BasePath + "\\TRAINS\\CONSISTS\\" + player.con;
+            p.con = TrainFileUtilities.ResolveTrainFile(MPManager.Simulator.BasePath, player.con);
             p.path = MPManager.Simulator.RoutePath + "\\PATHS\\" + player.path;
             Train train = new Train(MPManager.Simulator);
             train.TrainType = Train.TRAINTYPE.REMOTE;
@@ -151,7 +153,7 @@ public void AddPlayers(MSGPlayer player, OnlinePlayer p)
             {
                 train.Number = player.num;
             }
-            if (player.con.Contains("tilted")) train.IsTilting = true;
+            train.IsTilting = GenericTrain.IsTilting(Path.GetFileNameWithoutExtension(player.con));
             int direction = player.dir;
             train.travelled = player.Travelled;
             train.TrainMaxSpeedMpS = player.trainmaxspeed;