Skip to content

Commit 80aaee9

Browse files
committed
Automatic merge of T1.5.1-1002-g8f19fccc46 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 ae1cffb: 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 aac0de8: Oil Burning Locomotive - 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 a519452: Fix Lights Crash on Corrupt Shapes - Pull request #954 at 84c2f4b: Add Support for Multiple Track Profiles - Pull request #956 at 25193a8: Map settings saved - Pull request #957 at 24744a6: Switch panel (web based) enhancements
22 parents e920aeb + 8f19fcc + dfc715e + d00beb9 + f92de76 + ae1cffb + 56c17fb + 9a1d6b2 + 1f5ba4c + 5866028 + c27f32d + 3e390b8 + 359cfee + abe2e52 + 66f836c + aac0de8 + 486081b + b2af1f5 + a519452 + 84c2f4b + 25193a8 + 24744a6 commit 80aaee9

File tree

1 file changed

+16
-1
lines changed

1 file changed

+16
-1
lines changed

Source/RunActivity/Viewer3D/Viewer.cs

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1035,7 +1035,22 @@ void HandleUserInput(ElapsedTime elapsedTime)
10351035
}
10361036
if (UserInput.IsPressed(UserCommand.DisplaySwitchWindow)) if (UserInput.IsDown(UserCommand.DisplayNextWindowTab)) SwitchWindow.TabAction(); else SwitchWindow.Visible = !SwitchWindow.Visible;
10371037
if (UserInput.IsPressed(UserCommand.DisplayTrainOperationsWindow)) if (UserInput.IsDown(UserCommand.DisplayNextWindowTab)) TrainOperationsWindow.TabAction(); else { TrainOperationsWindow.Visible = !TrainOperationsWindow.Visible; if (!TrainOperationsWindow.Visible) CarOperationsWindow.Visible = false; }
1038-
if (UserInput.IsPressed(UserCommand.DisplayTrainCarOperationsWindow)) if (UserInput.IsDown(UserCommand.DisplayNextWindowTab)) TrainCarOperationsWindow.TabAction(); else { TrainCarOperationsWindow.Visible = !TrainCarOperationsWindow.Visible; if (!TrainCarOperationsWindow.Visible) CarOperationsWindow.Visible = false; }
1038+
1039+
if (UserInput.IsPressed(UserCommand.DisplayTrainCarOperationsWindow))
1040+
{
1041+
if (UserInput.IsDown(UserCommand.DisplayNextWindowTab))
1042+
TrainCarOperationsWindow.TabAction();
1043+
else
1044+
{
1045+
TrainCarOperationsWindow.Visible = !TrainCarOperationsWindow.Visible;
1046+
if (!TrainCarOperationsWindow.Visible)
1047+
{
1048+
TrainCarOperationsViewerWindow.Visible = false;
1049+
CarOperationsWindow.Visible = false;
1050+
}
1051+
}
1052+
}
1053+
10391054
if (UserInput.IsPressed(UserCommand.DisplayTrainDpuWindow)) if (UserInput.IsDown(UserCommand.DisplayNextWindowTab)) TrainDpuWindow.Visible = !TrainDpuWindow.Visible ; else TrainDpuWindow.TabAction();
10401055
if (UserInput.IsPressed(UserCommand.DisplayNextStationWindow)) if (UserInput.IsDown(UserCommand.DisplayNextWindowTab)) NextStationWindow.TabAction(); else NextStationWindow.Visible = !NextStationWindow.Visible;
10411056
if (UserInput.IsPressed(UserCommand.DisplayCompassWindow)) if (UserInput.IsDown(UserCommand.DisplayNextWindowTab)) CompassWindow.TabAction(); else CompassWindow.Visible = !CompassWindow.Visible;

0 commit comments

Comments
 (0)