Skip to content

Commit

Permalink
Automatic merge of T1.4-656-g14559529c and 14 pull requests
Browse files Browse the repository at this point in the history 
- Pull request #630 at 704731a: Sky Color Fix (Addresses Trello Roadmap Card #367 for More accurate sunrise and sunset)
- Pull request #650 at 3f8380c: Renewed Russian translation up to testing T1.4-598 version
- Pull request #652 at 918fdb1: Add button functions to Raildriver
- Pull request #675 at 9664141: Bug fix for https://bugs.launchpad.net/or/+bug/1983511 When an AI train disappears at end of run, containers remain visible
- Pull request #677 at a1dc40b: Correct double heading bug
- Pull request #678 at c19e718: Refactor TrainCar part 1
- Pull request #679 at 223aae6: Provide travelled distance to TCS scripts taking into account the running direction
- Pull request #680 at 2cae93d: build: Fix the file metadata after the .NET SDK project switch
- Pull request #681 at c5cc067: test: Fix tests when StfReader tests run before JsonReader tests
- Pull request #682 at 7fb9de6: Updated links to Deco Games
- Pull request #683 at 031b297: fix: Clean up Simulator Tester help output to match dotnet-style
- Pull request #684 at 3f4cc62: fix: Clean up Data Validator help output to match dotnet-style
- Pull request #685 at 203bbd2: fix: Clean up Data Converter help output to match dotnet-style
- Pull request #686 at 0db6d96: fix: Clean up Data Collector help output to match dotnet-style
  • Loading branch information
@openrails-bot
openrails-bot committed Aug 13, 2022
16 parents 11d6995 + 1455952 + 704731a + 3f8380c + 918fdb1 + 9664141 + a1dc40b + c19e718 + 223aae6 + 2cae93d + c5cc067 + 7fb9de6 + 031b297 + 3f4cc62 + 203bbd2 + 0db6d96 commit 052cdcb
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 13 deletions.
18 changes: 12 additions & 6 deletions Source/Contrib/DataCollector/Program.cs
View file
Expand Up @@ -19,6 +19,7 @@
using ORTS.Common;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;

Expand All @@ -38,14 +39,19 @@ static void Main(string[] args)

static void ShowHelp()
{
Console.WriteLine("Open Rails Data Collector utility");
var version = FileVersionInfo.GetVersionInfo(typeof(Program).Assembly.Location);
Console.WriteLine("{0} {1}", version.FileDescription, VersionInfo.VersionOrBuild);
Console.WriteLine();
Console.WriteLine("{0} [/system | /tile-terrtex PATH [...]]", Path.GetFileNameWithoutExtension(AppDomain.CurrentDomain.FriendlyName));
Console.WriteLine("Usage:");
Console.WriteLine(" {0} [options] [<PATH> [...]]", Path.GetFileNameWithoutExtension(version.FileName));
Console.WriteLine();
// "1234567890123456789012345678901234567890123456789012345678901234567890123456789"
Console.WriteLine(" /system Collects and reports on various system information.");
Console.WriteLine(" /tile-terrtex Scans the provided PATHs for MSTS tile files (.t) and");
Console.WriteLine(" produces a statistical summary of the terrtex used.");
Console.WriteLine("Arguments:");
Console.WriteLine(" <PATH> Directories to scan for specific options");
Console.WriteLine();
Console.WriteLine("Options:");
Console.WriteLine(" /system Collects and reports on various system information");
Console.WriteLine(" /tile-terrtex Scans the provided PATHs for MSTS tile files (.t) and");
Console.WriteLine(" produces a statistical summary of the terrtex used");
}

struct TileTerrtexDirectory
Expand Down
19 changes: 12 additions & 7 deletions Source/Contrib/DataConverter/Program.cs
View file
Expand Up @@ -17,9 +17,11 @@

using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Runtime.Serialization;
using ORTS.Common;

namespace Orts.DataConverter
{
Expand Down Expand Up @@ -85,22 +87,25 @@ static void Main(string[] args)

static void ShowHelp(List<IDataConverter> converters)
{
Console.WriteLine("Open Rails Data Converter utility");
var version = FileVersionInfo.GetVersionInfo(typeof(Program).Assembly.Location);
Console.WriteLine("{0} {1}", version.FileDescription, VersionInfo.VersionOrBuild);
Console.WriteLine();
Console.WriteLine("{0} /input INPUT [/output] [OUTPUT [...]]", Path.GetFileNameWithoutExtension(AppDomain.CurrentDomain.FriendlyName));
Console.WriteLine("Usage:");
Console.WriteLine(" {0} /input <INPUT> [/output] [<OUTPUT> [...]]", Path.GetFileNameWithoutExtension(version.FileName));
Console.WriteLine();
// "1234567890123456789012345678901234567890123456789012345678901234567890123456789"
Console.WriteLine(" INPUT Specifies the file to read.");
Console.WriteLine(" OUTPUT Specifies the file to generate.");
Console.WriteLine("Arguments:");
Console.WriteLine(" <INPUT> Specifies the file to read");
Console.WriteLine(" <OUTPUT> Specifies the file to generate");
Console.WriteLine();
Console.WriteLine(" Multiple outputs may be specified for each input.");
Console.WriteLine("Multiple outputs may be specified for each input");
Console.WriteLine();
Console.WriteLine(" Available file format conversions");
Console.WriteLine("Available file format conversions:");
Console.WriteLine(" Input Output Description");
foreach (var converter in converters)
{
converter.ShowConversions();
}
Console.WriteLine();
}

static List<DataConversion> GetConversions(string[] args)
Expand Down

0 comments on commit 052cdcb

Please sign in to comment.