Skip to content

Commit dbe4a57

Browse files
committed
Automatic merge of T1.6-rc2-41-gacd714487 and 9 pull requests
- Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc) - Pull request #1091 at 35f0051: Automatic speed control - Pull request #1107 at f5eb3dc: Fix DPMode when last remote is moved to front. - Pull request #1108 at cd5c185: Fix Horn, Bell, and MU light conditions on AI trains - Pull request #1109 at 0190043: Fix Erroneous Detection of Departure Before Passenger Boarding Completed - Pull request #1110 at 387388e: Fix Activity Runner persists after loading exception - Pull request #1082 at 5845a1a: Allow variable water level in glass gauge - Pull request #1104 at dc2a907: Handle simple adhesion within the axle module - Pull request #1081 at 689494b: Brake cuts power unification
11 parents 120ddae + acd7144 + e10390b + 35f0051 + f5eb3dc + cd5c185 + 0190043 + 387388e + 5845a1a + dc2a907 + 689494b commit dbe4a57

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1019
-5044
lines changed

Source/3rdPartyLibs/glTFLoader/Build_Instructions.txt

Lines changed: 0 additions & 10 deletions
This file was deleted.

Source/3rdPartyLibs/glTFLoader/animation.channel.target.schema.json

Lines changed: 0 additions & 40 deletions
This file was deleted.

Source/3rdPartyLibs/glTFLoader/extras.schema.json

Lines changed: 0 additions & 13 deletions
This file was deleted.
-62.5 KB
Binary file not shown.

Source/ORTS.Common/ConsistGenerator.cs

Lines changed: 0 additions & 198 deletions
This file was deleted.

Source/Orts.Formats.Msts/ConsistFile.cs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,6 @@ public ConsistFile(string filePath)
3939
Name = Train.TrainCfg.Name;
4040
}
4141

42-
/// <summary>
43-
/// Allows to use a procedurally generated consist file.
44-
/// </summary>
45-
public ConsistFile(Stream inputStream, string filePath)
46-
{
47-
using (var stf = new STFReader(inputStream, filePath, System.Text.Encoding.UTF8, false))
48-
stf.ParseFile(new STFReader.TokenProcessor[] {
49-
new STFReader.TokenProcessor("train", ()=>{ Train = new Train_Config(stf); }),
50-
});
51-
}
52-
5342
public override string ToString()
5443
{
5544
return Name;

Source/Orts.Settings/UserSettings.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -182,10 +182,6 @@ public enum DirectXFeature
182182
public int DayAmbientLight { get; set; }
183183
[Default(AntiAliasingMethod.MSAA2x)]
184184
public int AntiAliasing { get; set; }
185-
[Default(false)]
186-
public bool GltfAnimations { get; set; }
187-
[Default(true)]
188-
public bool GltfTangentsAlwaysCalculatedPerPixel { get; set; }
189185

190186
// Simulation settings:
191187
[Default(false)]

Source/Orts.Simulation/Simulation/RollingStocks/MSTSDieselLocomotive.cs

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ public override void Parse(string lowercasetoken, STFReader stf)
178178
var transmissionType = stf.ReadString();
179179
try
180180
{
181-
DieselTransmissionType = (DieselTransmissionTypes)Enum.Parse(typeof(DieselTransmissionTypes), transmissionType.First().ToString().ToUpper() + transmissionType.Substring(1));
181+
DieselTransmissionType = (DieselTransmissionTypes)Enum.Parse(typeof(DieselTransmissionTypes), transmissionType, true);
182182
}
183183
catch
184184
{
@@ -699,27 +699,12 @@ protected override void UpdateTractionForce(float elapsedClockSeconds)
699699
{
700700
if (DieselEngines.HasGearBox && (TractiveForceCurves == null || DieselTransmissionType == MSTSDieselLocomotive.DieselTransmissionTypes.Mechanic))
701701
{
702-
TractiveForceN = TractionForceN = DieselEngines.TractiveForceN;
702+
TractionForceN = DieselEngines.TractiveForceN;
703703
return;
704704
}
705705
base.UpdateTractionForce(elapsedClockSeconds);
706706
}
707707

708-
protected override void UpdateAxleDriveForce()
709-
{
710-
/* TODO: connect different engines to different axles
711-
if (DieselEngines.HasGearBox && DieselTransmissionType == MSTSDieselLocomotive.DieselTransmissionTypes.Mechanic)
712-
{
713-
foreach (var de in DieselEngines)
714-
{
715-
}
716-
}
717-
else */
718-
{
719-
base.UpdateAxleDriveForce();
720-
}
721-
}
722-
723708
/// <summary>
724709
/// This function updates periodically the locomotive's sound variables.
725710
/// </summary>

0 commit comments

Comments
 (0)