Skip to content

Commit

Permalink
Automatic merge of T1.5.1-684-gc6e0de1c4 and 9 pull requests
Browse files Browse the repository at this point in the history
- Pull request #570 at c59c788: 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 #865 at 67014b7: Dispatcher window improvements
- Pull request #874 at f8dbeab: Dynamic brake controller refactoring
- 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 #878 at 43f6ee9: Implement Polach Adhesion
- Pull request #882 at e92be5a: Blueprint/train car operations UI window
- Pull request #883 at aac4d3f: SwitchPanel disconnect/connect handling
  • Loading branch information
openrails-bot committed Oct 29, 2023
11 parents 1b1fab5 + c6e0de1 + c59c788 + d00beb9 + 67014b7 + f8dbeab + 43bf33e + f92de76 + 43f6ee9 + e92be5a + aac4d3f commit 66a9235
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -2426,7 +2426,7 @@ protected virtual void UpdateAxleDriveForce()
// Simple slip control
// Motive force is reduced to the maximum adhesive force
// In wheelslip situations, motive force is set to zero
axle.DriveForceN = Math.Sign(axle.DriveForceN) * Math.Min(axle.AdhesionLimit * axle.AxleWeightN, Math.Abs(axle.DriveForceN));
axle.DriveForceN = Math.Sign(axle.DriveForceN) * Math.Min(axle.MaximumPolachWheelAdhesion * axle.AxleWeightN, Math.Abs(axle.DriveForceN));
if (axle.IsWheelSlip) axle.DriveForceN = 0;
}
}
Expand Down

0 comments on commit 66a9235

Please sign in to comment.