Skip to content

Commit 96fb883

Browse files
committed
Automatic merge of T1.5.1-1891-g8228f3523 and 11 pull requests
- Pull request #1072 at 52d5886: Content Creation Shortcuts & Advanced Wagon Shape Interactions - 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 #1096 at 7a4f055: When the OR main form does not have the focus, hovering above the main OR form makes the mouse cursor disappear. - Pull request #1097 at 24ff66b: Fix For Delayed Particle Emitter Spawning - Pull request #1098 at 6bbd2c6: Correct Use of Wheel Speed vs Ground Speed in Locomotive Physics - Pull request #1099 at 5e8b056: Fix TCS orders not being sent to pantographs - Pull request #1100 at cccb40a: Updates to German translations - Pull request #1101 at 6813c06: Added help buttons on Simulations options in Menu - Pull request #1082 at 5845a1a: Allow variable water level in glass gauge - Pull request #1081 at 689494b: Brake cuts power unification
13 parents 899681a + 8228f35 + 52d5886 + 37e2817 + e10390b + 7a4f055 + 24ff66b + 6bbd2c6 + 5e8b056 + cccb40a + 6813c06 + 5845a1a + 689494b commit 96fb883

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2071,7 +2071,7 @@ public void DynamicBrakeBlending(float elapsedClockSeconds)
20712071
{
20722072
if (DynamicBrake)
20732073
{
2074-
float diff = target * FrictionBrakeBlendingMaxForceN - DynamicBrakeForceN;
2074+
float diff = target * FrictionBrakeBlendingMaxForceN - DynamicBrakeForceN;
20752075
float normDiff = diff / MaxDynamicBrakeForceN;
20762076

20772077
if (Math.Abs(diff) > 100.0f)

0 commit comments

Comments
 (0)