Skip to content

Commit 95c5783

Browse files
committed
Automatic merge of T1.5.1-770-g1f196a324 and 14 pull requests
- Pull request #570 at 3539862: 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 #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 #882 at a055bca: Blueprint/train car operations UI window - Pull request #885 at d9ce84b: feat: Add notifications to Menu - Pull request #886 at 6c0785b: Scene viewer extension to TrackViewer - Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH - Pull request #893 at bf8876b: Signal errors - Pull request #894 at 5ff1e73: Correct Decrease Colour - Pull request #896 at 5866028: First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains - Pull request #897 at 0a9d939: feat: Improved system information collection - Pull request #898 at d7a19ee: Extra line with all the arguments for debugging purposes in logfile - Pull request #899 at 6b0731c: Duplex steam engines - Booster Engine addition
16 parents 490d284 + 1f196a3 + 3539862 + d00beb9 + 43bf33e + f92de76 + a055bca + d9ce84b + 6c0785b + 1f5ba4c + bf8876b + 5ff1e73 + 5866028 + 0a9d939 + d7a19ee + 6b0731c commit 95c5783

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5609,6 +5609,11 @@ protected override void UpdateTractiveForce(float elapsedClockSeconds, float loc
56095609

56105610
DisplayTractiveForceN = TractiveForceN;
56115611

5612+
if (Simulator.UseAdvancedAdhesion && !Simulator.Settings.SimpleControlPhysics)
5613+
{
5614+
UpdateAxleDriveForce();
5615+
}
5616+
56125617
MotiveForceSmoothN.Update(elapsedClockSeconds, MotiveForceN);
56135618
MotiveForceSmoothedN = MotiveForceSmoothN.SmoothedValue;
56145619
if (float.IsNaN(MotiveForceN))

0 commit comments

Comments
 (0)