Skip to content

Commit e88e09c

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 310d2a4: 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 33a3e1c: 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 0c8e659: Copy dynamic brake speeds from other vehicles
22 parents 6286583 + b599285 + dfc715e + d00beb9 + f92de76 + 310d2a4 + 56c17fb + 9a1d6b2 + 1f5ba4c + 5866028 + c27f32d + 3e390b8 + 359cfee + abe2e52 + 66f836c + 33a3e1c + a98ff62 + 486081b + b2af1f5 + 9b0ec01 + 376e7af + 0c8e659 commit e88e09c

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Source/RunActivity/Viewer3D/WebServices/SwitchPanel/SwitchOnPanelDefinition.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ private string determineDescription(UserCommand userCommand)
199199
case ORTS.Common.Input.UserCommand.DisplaySwitchWindow:
200200
description = Viewer.Catalog.GetParticularString("SwitchPanel", "Switch");
201201
break;
202-
case ORTS.Common.Input.UserCommand.DisplayTrainOperationsWindow:
202+
case ORTS.Common.Input.UserCommand.DisplayTrainCarOperationsWindow:
203203
description = Viewer.Catalog.GetParticularString("SwitchPanel", "Train Operations");
204204
break;
205205
case ORTS.Common.Input.UserCommand.DisplayTrainDpuWindow:

Source/RunActivity/Viewer3D/WebServices/SwitchPanel/SwitchesOnPanel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ public void SetDefinitions(SwitchOnPanel[,] SwitchesOnPanelArray)
140140
SwitchesOnPanelArray[3, 2].InitDefinition(UserCommand.DisplayTrainDrivingWindow);
141141
SwitchesOnPanelArray[3, 3].InitDefinition(UserCommand.DisplayNextStationWindow);
142142
SwitchesOnPanelArray[3, 4].InitDefinition(UserCommand.DisplaySwitchWindow);
143-
SwitchesOnPanelArray[3, 5].InitDefinition(UserCommand.DisplayTrainOperationsWindow);
143+
SwitchesOnPanelArray[3, 5].InitDefinition(UserCommand.DisplayTrainCarOperationsWindow);
144144
SwitchesOnPanelArray[3, 6].InitDefinition(UserCommand.DisplayTrainDpuWindow);
145145
SwitchesOnPanelArray[3, 7].InitDefinition(UserCommand.DisplayTrainListWindow);
146146
SwitchesOnPanelArray[3, 8].InitDefinition(UserCommand.DisplayEOTListWindow);

0 commit comments

Comments
 (0)