Skip to content

Commit 172a5ac

Browse files
committed
Automatic merge of T1.5.1-770-g1f196a3249 and 14 pull requests
- Pull request #570 at 3539862: 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 #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 a055bca: Blueprint/train car operations UI window - Pull request #885 at d9ce84b: feat: Add notifications to Menu - Pull request #886 at 6c0785b: Scene viewer extension to TrackViewer - Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH - Pull request #893 at bf8876b: Signal errors - Pull request #894 at 5ff1e73: 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 d7a19ee: Extra line with all the arguments for debugging purposes in logfile - Pull request #899 at d5127b8: Duplex steam engines - Booster Engine addition
16 parents 6f5117b + 1f196a3 + 3539862 + d00beb9 + 43bf33e + f92de76 + a055bca + d9ce84b + 6c0785b + 1f5ba4c + bf8876b + 5ff1e73 + 5866028 + 0a9d939 + d7a19ee + d5127b8 commit 172a5ac

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Source/RunActivity/Viewer3D/Processes/GameStateRunActivity.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ internal override void Load()
231231
default:
232232
MessageBox.Show("To start " + Application.ProductName + ", please run 'OpenRails.exe'.\n\n"
233233
+ "If you are attempting to debug this component, please run 'OpenRails.exe' and execute the scenario you are interested in. "
234-
+ "In the log file, the command-line arguments used will be listed at the top. "
234+
+ "In the log file, a line with the command-line arguments used will be listed at the top. "
235235
+ "You should then configure your debug environment to execute this component with those command-line arguments.",
236236
Application.ProductName + " " + VersionInfo.VersionOrBuild);
237237
Game.Exit();
@@ -827,7 +827,7 @@ void InitLogging(UserSettings settings, string[] args, bool appendLog)
827827
Console.WriteLine("Executable = {0}", Path.GetFileName(Application.ExecutablePath));
828828
foreach (var arg in args)
829829
Console.WriteLine("Argument = {0}", arg);
830-
#if DEBUG
830+
831831
string debugArgline = "";
832832
foreach (var arg in args)
833833
{
@@ -839,7 +839,7 @@ void InitLogging(UserSettings settings, string[] args, bool appendLog)
839839
}
840840
}
841841
Console.WriteLine("Arguments = {0}", debugArgline.TrimEnd());
842-
#endif
842+
843843
LogSeparator();
844844
settings.Log();
845845
LogSeparator();

0 commit comments

Comments
 (0)