Skip to content

Commit 0012032

Browse files
committed
Automatic merge of T1.5.1-1806-g5522fc5fa and 10 pull requests
- Pull request #570 at 362e4e7: glTF 2.0 support with PBR lighting - Pull request #1062 at bbc0013: Train Forces popup Window. - Pull request #1064 at 6a5b9f5: Add Train Info tab to Help window (F1) - Pull request #1067 at 13ab98b: Traction and dynamic brake retardation - Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH - Pull request #1074 at e9a66c1: Gradient - commit 2024-16-12 - Pull request #1076 at 3bbd537: Allow depart early - Pull request #1085 at 37e2817: updates key commands for Train Operations window and also Daylight Offset - Pull request #1082 at 5845a1a: Allow variable water level in glass gauge - Pull request #1081 at 689494b: Brake cuts power unification
12 parents d31463c + 5522fc5 + 362e4e7 + bbc0013 + 6a5b9f5 + 13ab98b + 1f5ba4c + e9a66c1 + 3bbd537 + 37e2817 + 5845a1a + 689494b commit 0012032

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

Source/RunActivity/RunActivity.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,8 @@
569569
</Content>
570570
<Content Include="Content\TrainInfoSprites.png">
571571
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
572-
</Content> <Content Include="Content\TrainOperationsCoupler.png">
572+
</Content>
573+
<Content Include="Content\TrainOperationsCoupler.png">
573574
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
574575
</Content>
575576
<Content Include="Content\TrainOperations\TrainOperationsMap.png">

Source/RunActivity/Viewer3D/Popups/HelpWindow.cs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,8 @@
2020
using System;
2121
using System.Collections.Generic;
2222
using System.IO;
23-
using System.Diagnostics;
2423
using System.Linq;
2524
using System.Windows.Forms;
26-
using LibGit2Sharp;
2725
using Microsoft.Xna.Framework;
2826
using Microsoft.Xna.Framework.Graphics;
2927
using Orts.Simulation;
@@ -32,11 +30,6 @@
3230
using ORTS.Common;
3331
using ORTS.Common.Input;
3432
using ORTS.Settings;
35-
using static System.Windows.Forms.VisualStyles.VisualStyleElement;
36-
using Orts.Formats.Msts;
37-
using SharpFont;
38-
using static Orts.Viewer3D.WebServices.TrainCarOperationsWebpage.OperationsSend;
39-
using SharpDX.Direct3D9;
4033
using Orts.Simulation.RollingStocks.SubSystems.Brakes.MSTS;
4134

4235
namespace Orts.Viewer3D.Popups
@@ -74,8 +67,6 @@ public class HelpWindow : Window
7467
private Train LastPlayerTrain = null;
7568
private int LastPlayerTrainCarCount = 0;
7669
private static Texture2D TrainInfoSpriteSheet = null;
77-
//private struct CarInfo { public float MassKg; public bool IsEngine; }
78-
//private CarInfo[] CarMass = null; // TODO: Does not need to persist beyond method. Use List<T>(size) instead.
7970
private class CarInfo { public readonly float MassKg; public readonly bool IsEngine; public CarInfo(float mass, bool isEng) { MassKg = mass; IsEngine = isEng; } }
8071

8172
List<TabData> Tabs = new List<TabData>();

0 commit comments

Comments
 (0)