Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 6e0232d

Browse files
openrails-botopenrails-bot
committed
Automatic merge of T1.5.1-535-g2f57132ee and 16 pull requests
- Pull request #757 at 98dd1a7: Unify RailDriver code implementations - Pull request #821 at cc3af66: Adds suppression of safety valves - Pull request #831 at 61bbf43: poor mans switch panel on tablet - Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters - Pull request #841 at 410a585: https://blueprints.launchpad.net/or/+spec/animating-trainset-windows - Pull request #853 at a9760ec: Notify out of focus - Pull request #855 at b39e5d8: Adds new route from TrainSimulations - Pull request #856 at b9742e1: Add Alternate Syntax for Confusing Tokens - Pull request #857 at cb3f1c0: Adding Air Flow Meters - Pull request #858 at bbaeeba: Fix wheel animation problems - Pull request #859 at 30d7b53: Steam adhesion bug#1 - Pull request #860 at d2b8a52: Changes in the Car Operations Menu for the lines with brake information - Pull request #861 at 2c39260: Curve friction#1 - Pull request #862 at 489f261: Fix engine leak problem - Pull request #863 at a34b857: Alternate preset 3D cabviewpoints - Pull request #865 at bc03dd8: Dispatcher window improvements
18 parents 5c9cc23 + 2f57132 + 98dd1a7 + cc3af66 + 61bbf43 + d00beb9 + 410a585 + a9760ec + b39e5d8 + b9742e1 + cb3f1c0 + bbaeeba + 30d7b53 + d2b8a52 + 2c39260 + 489f261 + a34b857 + bc03dd8 commit 6e0232d

14 files changed

+3505
-12
lines changed

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,4 +365,5 @@ ASALocalRun/
365365
healthchecksdb
366366

367367
# Backup folder for Package Reference Convert tool in Visual Studio 2017
368-
MigrationBackup/
368+
MigrationBackup/
369+
/Source/RunActivity/Properties/launchSettings.json

‎Source/ORTS.Common/Input/UserCommand.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ 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,
2728
[GetString("Game Multi Player Texting")] GameMultiPlayerTexting,
2829
[GetString("Game Switch Manual Mode")] GameSwitchManualMode,
2930
[GetString("Game Reset Out Of Control Mode")] GameResetOutOfControlMode,

‎Source/ORTS.Settings/InputSettings.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -518,6 +518,7 @@ static void InitializeCommands(UserCommandInput[] Commands)
518518
Commands[(int)UserCommand.GameExternalCabController] = new UserCommandKeyInput(0x29);
519519
Commands[(int)UserCommand.GameFullscreen] = new UserCommandKeyInput(0x1C, KeyModifiers.Alt);
520520
Commands[(int)UserCommand.GameMultiPlayerDispatcher] = new UserCommandKeyInput(0x0A, KeyModifiers.Control);
521+
Commands[(int)UserCommand.GameMultiPlayerDispatcherBeta] = new UserCommandKeyInput(0x0A, KeyModifiers.Control | KeyModifiers.Shift);
521522
Commands[(int)UserCommand.GameMultiPlayerTexting] = new UserCommandKeyInput(0x14, KeyModifiers.Alt);
522523
Commands[(int)UserCommand.GamePause] = new UserCommandKeyInput(Keys.Pause);
523524
Commands[(int)UserCommand.GamePauseMenu] = new UserCommandKeyInput(0x01);

‎Source/RunActivity/PostBuildActions.bat‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
EXIT
2+
13
CD ..\..\
24
IF EXIST "Program\Content\Web" RMDIR "Program\Content\Web" /S /Q
35
IF NOT EXIST "Program\Content\Web" MKDIR "Program\Content\Web"

‎Source/RunActivity/Program.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
using System.Linq;
2121
using System.Reflection;
2222
using System.Runtime.InteropServices;
23+
using System.Windows.Forms;
2324
using Orts.Common;
2425
using Orts.Simulation;
2526
using Orts.Viewer3D;
@@ -41,6 +42,7 @@ static class Program
4142
public static Simulator Simulator;
4243
public static Viewer Viewer;
4344
public static DispatchViewer DebugViewer;
45+
public static DispatchViewerBeta DebugViewerBeta;
4446
public static SoundDebugForm SoundDebugForm;
4547
public static ORTraceListener ORTraceListener;
4648
public static string logFileName = ""; // contains path to file
@@ -60,6 +62,9 @@ static void Main(string[] args)
6062
path = Path.Combine(path, (Environment.Is64BitProcess) ? "X64" : "X86");
6163
NativeMethods.SetDllDirectory(path);
6264

65+
Application.EnableVisualStyles();
66+
Application.SetCompatibleTextRenderingDefault(false);
67+
6368
var game = new Game(settings);
6469
game.PushState(new GameStateRunActivity(args));
6570
game.Run();

‎Source/RunActivity/Viewer3D/Debugging/DebugViewerBetaForm.Designer.cs‎

Lines changed: 941 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)