Skip to content

Commit 6074669

Browse files
committed
Automatic merge of T1.5.1-997-gb5992851e1 and 20 pull requests
- Pull request #799 at dfc715e: Consolidated wind simulation - Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters - Pull request #876 at f92de76: docs: add source for documents previously on website to source Documentation folder - Pull request #882 at b3f83ed: Blueprint/train car operations UI window - Pull request #885 at 56c17fb: feat: Add notifications to Menu - Pull request #891 at 9a1d6b2: Auto save - Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH - Pull request #896 at 5866028: First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains - Pull request #900 at c27f32d: DMI updates - Pull request #903 at 3e390b8: Downloading route content (Github, zip) - Pull request #912 at 359cfee: New Triple Valve Features Vol. 2 - Pull request #922 at abe2e52: Autopilot for timetable mode - Pull request #946 at 66f836c: Advanced track sounds - Pull request #949 at 1985cbe: Oil Burning Locomotive - Pull request #950 at a98ff62: Ctrl-F5 showing yellow rectangles where mouse left button is active - Pull request #951 at 486081b: fix: Fix watchdog process state name - Pull request #952 at b2af1f5: Investigation - Pulsing graphics part 1 - Pull request #953 at 9b0ec01: Fix Lights Crash on Corrupt Shapes - Pull request #954 at 376e7af: Add Support for Multiple Track Profiles - Pull request #955 at 4208cf4: Copy dynamic brake speeds from other vehicles
22 parents 792b950 + b599285 + dfc715e + d00beb9 + f92de76 + b3f83ed + 56c17fb + 9a1d6b2 + 1f5ba4c + 5866028 + c27f32d + 3e390b8 + 359cfee + abe2e52 + 66f836c + 1985cbe + a98ff62 + 486081b + b2af1f5 + 9b0ec01 + 376e7af + 4208cf4 commit 6074669

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1248,6 +1248,10 @@ public override void Copy(MSTSWagon copy)
12481248
DynamicBrakeAutoBailOff = locoCopy.DynamicBrakeAutoBailOff;
12491249
DynamicBrakePartialBailOff = locoCopy.DynamicBrakePartialBailOff;
12501250
DynamicBrakeMaxCurrentA = locoCopy.DynamicBrakeMaxCurrentA;
1251+
DynamicBrakeSpeed1MpS = locoCopy.DynamicBrakeSpeed1MpS;
1252+
DynamicBrakeSpeed2MpS = locoCopy.DynamicBrakeSpeed2MpS;
1253+
DynamicBrakeSpeed3MpS = locoCopy.DynamicBrakeSpeed3MpS;
1254+
DynamicBrakeSpeed4MpS = locoCopy.DynamicBrakeSpeed4MpS;
12511255
CombinedControlType = locoCopy.CombinedControlType;
12521256
CombinedControlSplitPosition = locoCopy.CombinedControlSplitPosition;
12531257
DynamicBrakeDelayS = locoCopy.DynamicBrakeDelayS;

0 commit comments

Comments
 (0)