Skip to content

Commit

Permalink
Automatic merge of T1.5.1-376-g885592329 and 12 pull requests
Browse files Browse the repository at this point in the history
- Pull request #570 at de7a14f: Experimental glTF 2.0 support with PBR lighting
- Pull request #732 at 36b4b6d: Improvements for air brakes
- Pull request #751 at 00981a2: Web interface to control cab controls with external hardware
- Pull request #799 at dc03850: Consolidated wind simulation
- Pull request #802 at 4d198e4: Added support for activity location events to the TrackViewer
- Pull request #803 at 7157e08: Various adjustments to steam adhesion
- Pull request #813 at ff454eb: Refactored garbage generators
- Pull request #815 at a5cc165: chore: Add GitHub automatic release notes configuration
- Pull request #818 at 745d101: Allow independent drive axles for locomotives
- Pull request #820 at 6e7a5b6: delay option for masterkey does not delay switch off
- Pull request #821 at e0fa5a8: Adds suppression of safety valves
- Pull request #822 at 82ef736: battery switch two buttons option in combination with a delay
  • Loading branch information
openrails-bot committed Apr 28, 2023
14 parents 96b57d9 + 8855923 + de7a14f + 36b4b6d + 00981a2 + dc03850 + 4d198e4 + 7157e08 + ff454eb + a5cc165 + 745d101 + 6e7a5b6 + e0fa5a8 + 82ef736 commit 6c53b43
Showing 1 changed file with 1 addition and 9 deletions.
Expand Up @@ -2801,17 +2801,9 @@ public virtual void AdvancedAdhesion(float elapsedClockSeconds)
// This enables steam locomotives to have different speeds for driven and non-driven wheels.
if (EngineType == EngineTypes.Steam && SteamEngineType != MSTSSteamLocomotive.SteamEngineTypes.Geared)
{
if (AbsSpeedMpS <= 0.15 && !WheelSlip)
{
WheelSpeedSlipMpS = SpeedMpS;
WheelSpeedMpS = SpeedMpS;
}
else
{
WheelSpeedSlipMpS = LocomotiveAxles[0].AxleSpeedMpS;
WheelSpeedSlipMpS = LocomotiveAxles[0].AxleSpeedMpS;
WheelSpeedMpS = SpeedMpS;
}
}
else WheelSpeedMpS = LocomotiveAxles[0].AxleSpeedMpS;

}
Expand Down

0 comments on commit 6c53b43

Please sign in to comment.