Skip to content

Commit 2e5b9ed

Browse files
committed
Automatic merge of T1.5.1-719-g89833d44e and 18 pull requests
- 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 c39984c: 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 #882 at be39fc9: Blueprint/train car operations UI window - Pull request #883 at edcc2dd: SwitchPanel disconnect/connect handling - Pull request #885 at c81447b: feat: Add notifications to Menu - Pull request #886 at cd452ee: Scene viewer extension to TrackViewer - Pull request #888 at d7daf62: docs: Document player application model - Pull request #890 at 39a9fa4: Allow depart early - Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH - Pull request #893 at bf8876b: Signal errors - Pull request #894 at 794fddf: Correct Decrease Colour - Pull request #896 at 5866028: First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains - Pull request #897 at 0a9d939: feat: Improved system information collection - Pull request #898 at e271395: Extra line with all the arguments for debugging purposes in logfile
20 parents be887f5 + 89833d4 + c59c788 + d00beb9 + c39984c + f8dbeab + 43bf33e + f92de76 + be39fc9 + edcc2dd + c81447b + cd452ee + d7daf62 + 39a9fa4 + 1f5ba4c + bf8876b + 794fddf + 5866028 + 0a9d939 + e271395 commit 2e5b9ed

File tree

14 files changed

+62
-4564
lines changed

14 files changed

+62
-4564
lines changed

Source/ORTS.Common/Input/UserCommand.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ public enum UserCommand
2424
[GetString("Game Change Cab")] GameChangeCab,
2525
[GetString("Game Request Control")] GameRequestControl,
2626
[GetString("Game Multi Player Dispatcher")] GameMultiPlayerDispatcher,
27-
[GetString("Game Multi Player Dispatcher Beta")] GameMultiPlayerDispatcherBeta,
2827
[GetString("Game Multi Player Texting")] GameMultiPlayerTexting,
2928
[GetString("Game Switch Manual Mode")] GameSwitchManualMode,
3029
[GetString("Game Reset Out Of Control Mode")] GameResetOutOfControlMode,

Source/ORTS.Settings/InputSettings.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,6 @@ static void InitializeCommands(UserCommandInput[] Commands)
523523
Commands[(int)UserCommand.GameExternalCabController] = new UserCommandKeyInput(0x29);
524524
Commands[(int)UserCommand.GameFullscreen] = new UserCommandKeyInput(0x1C, KeyModifiers.Alt);
525525
Commands[(int)UserCommand.GameMultiPlayerDispatcher] = new UserCommandKeyInput(0x0A, KeyModifiers.Control);
526-
Commands[(int)UserCommand.GameMultiPlayerDispatcherBeta] = new UserCommandKeyInput(0x0A, KeyModifiers.Control | KeyModifiers.Shift);
527526
Commands[(int)UserCommand.GameMultiPlayerTexting] = new UserCommandKeyInput(0x14, KeyModifiers.Alt);
528527
Commands[(int)UserCommand.GamePause] = new UserCommandKeyInput(Keys.Pause);
529528
Commands[(int)UserCommand.GamePauseMenu] = new UserCommandKeyInput(0x01);

Source/RunActivity/Program.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ static class Program
4141
{
4242
public static Simulator Simulator;
4343
public static Viewer Viewer;
44-
public static DispatchViewer DebugViewer;
4544
public static MapViewer MapForm;
4645
public static SoundDebugForm SoundDebugForm;
4746
public static ORTraceListener ORTraceListener;

Source/RunActivity/Viewer3D/Debugging/DebugViewerForm.Designer.cs

Lines changed: 0 additions & 920 deletions
This file was deleted.

0 commit comments

Comments
 (0)