Skip to content

Commit 91ec7c3

Browse files
CsantucciCsantucci
committed
Merge branch 'master' into MP-turntable-official to remove conflict
2 parents 3399d4b + 1070759 commit 91ec7c3

File tree

91 files changed

+14218
-14329
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+14218
-14329
lines changed

‎.appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: AV1.4-{build}
1+
version: AV1.5-{build}
22
skip_branch_with_pr: true
33
image: Visual Studio 2019
44
cache:

‎Source/ContentChecker/ContentChecker.csproj

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
<UseWindowsForms>true</UseWindowsForms>
66
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
77
<IsPublishable>False</IsPublishable>
8-
<Copyright>© Open Rails project</Copyright>
9-
<Authors>Open Rails project</Authors>
10-
<Description>Open Rails content checker</Description>
8+
<AssemblyTitle>Open Rails Content Checker</AssemblyTitle>
9+
<Description>Open Rails Transport Simulator</Description>
10+
<Company>Open Rails</Company>
11+
<Product>Open Rails</Product>
12+
<Copyright>Copyright © 2009 - 2022</Copyright>
1113
<PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>
1214
</PropertyGroup>
1315
<ItemGroup>

‎Source/ContentChecker/Program.cs

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
using System.IO;
2222
using System.Linq;
2323
using Orts.Common;
24-
using Orts.Parsers.Msts;
24+
using ORTS.Common;
2525

2626
namespace ContentChecker
2727
{
@@ -77,21 +77,25 @@ static bool OptionsContain(string[] args, IEnumerable<string> optionNames) {
7777
/// </summary>
7878
static void ShowHelp()
7979
{
80-
Console.WriteLine("Open Rails File Loader and Cross-check utility");
80+
var version = FileVersionInfo.GetVersionInfo(typeof(Program).Assembly.Location);
81+
Console.WriteLine("{0} {1}", version.FileDescription, VersionInfo.VersionOrBuild);
8182
Console.WriteLine();
82-
Console.WriteLine("{0} [<option> ...] FILE [...]", Path.GetFileNameWithoutExtension(AppDomain.CurrentDomain.FriendlyName));
83+
Console.WriteLine("Usage:");
84+
Console.WriteLine(" {0} [options] <FILE> [...]", Path.GetFileNameWithoutExtension(version.FileName));
85+
Console.WriteLine();
86+
Console.WriteLine("Arguments:");
87+
Console.WriteLine(" <FILE> Data files to check; may contain wildcards");
8388
Console.WriteLine();
84-
// "1234567890123456789012345678901234567890123456789012345678901234567890123456789"
8589
Console.WriteLine("Options:");
86-
Console.WriteLine(" /h, /help Show help.");
87-
Console.WriteLine(" /v, /verbose Displays all expected/valid values in addition to any errors");
88-
Console.WriteLine(" /d, /dependent Also load dependent files.");
90+
Console.WriteLine(" /h, /help Show help.");
91+
Console.WriteLine(" /v, /verbose Displays all expected/valid values in addition to any errors");
92+
Console.WriteLine(" /d, /dependent Also load dependent files");
8993
Console.WriteLine("");
9094
Console.WriteLine("Partially implemented options:");
91-
Console.WriteLine(" /r, /referenced Also load files that are directly referenced");
92-
Console.WriteLine(" This implies /d");
93-
Console.WriteLine(" /a, /all Load all related files");
94-
Console.WriteLine(" This implies /d and /r");
95+
Console.WriteLine(" /r, /referenced Also load files that are directly referenced");
96+
Console.WriteLine(" This implies /d");
97+
Console.WriteLine(" /a, /all Load all related files");
98+
Console.WriteLine(" This implies /d and /r");
9599
Console.WriteLine("");
96100
Console.WriteLine("This utility needs as input one or more files.");
97101
Console.WriteLine("You can either give a file with a full path or with a relative path.");

‎Source/ContentChecker/SignalScriptLoader.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public override void TryLoading(string file)
6969
// we want to load the signal scripts one by one, not as a group
7070
var scriptFiles = new List<string>() { Path.GetFileName(file) };
7171
var scrfile = new SIGSCRfile(new SignalScripts(_sigcfg.ScriptPath, scriptFiles,
72-
_sigcfg.SignalTypes, _sigcfg.ORTSFunctionTypes, _sigcfg.ORTSNormalSubtypes));
72+
_sigcfg.SignalTypes, _sigcfg.SignalFunctions, _sigcfg.ORTSNormalSubtypes));
7373
}
7474
}
7575
}

‎Source/Contrib/ActivityEditor/ActivityEditor/ActivityEditor.csproj

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@
77
<UseWindowsForms>true</UseWindowsForms>
88
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
99
<IsPublishable>False</IsPublishable>
10-
<Copyright>© Open Rails project</Copyright>
11-
<Authors>Open Rails project</Authors>
12-
<Description>Open Rails activity editor (contributed)</Description>
10+
<AssemblyTitle>Open Rails Activity Editor (Contributed)</AssemblyTitle>
11+
<Description>Open Rails Transport Simulator</Description>
12+
<Company>Open Rails</Company>
13+
<Product>Open Rails (disabled)</Product>
14+
<Copyright>Copyright © 2009 - 2022</Copyright>
1315
<PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>
1416
<DefineConstants>TRACE;WINDOWS;ACTIVITY_EDITOR</DefineConstants>
1517
</PropertyGroup>

‎Source/Contrib/ActivityEditor/LibAE/LibAE.csproj

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@
44
<OutputType>Library</OutputType>
55
<AssemblyName>Contrib.LibAE</AssemblyName>
66
<IsPublishable>False</IsPublishable>
7-
<Copyright>© Open Rails project</Copyright>
8-
<Authors>Open Rails project</Authors>
9-
<Description>Open Rails activity editor library (contributed)</Description>
7+
<AssemblyTitle>Open Rails LibAE Library (Contributed)</AssemblyTitle>
8+
<Description>Open Rails Transport Simulator</Description>
9+
<Company>Open Rails</Company>
10+
<Product>Open Rails</Product>
11+
<Copyright>Copyright © 2009 - 2022</Copyright>
1012
<PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>
1113
<DefineConstants>TRACE;WINDOWS;ACTIVITY_EDITOR;JSON_OR_XML</DefineConstants>
1214
</PropertyGroup>

‎Source/Contrib/ContentManager/ContentManager.csproj

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@
88
<UseWindowsForms>true</UseWindowsForms>
99
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
1010
<IsPublishable>False</IsPublishable>
11-
<Copyright>© Open Rails project</Copyright>
12-
<Authors>Open Rails project</Authors>
13-
<Description>Open Rails content manager (contributed)</Description>
11+
<AssemblyTitle>Open Rails Content Manager (Contributed)</AssemblyTitle>
12+
<Description>Open Rails Transport Simulator</Description>
13+
<Company>Open Rails</Company>
14+
<Product>Open Rails</Product>
15+
<Copyright>Copyright © 2009 - 2022</Copyright>
1416
<PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>
1517
</PropertyGroup>
1618
<ItemGroup>

‎Source/Contrib/DataCollector/DataCollector.csproj

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@
66
<AssemblyName>Contrib.DataCollector</AssemblyName>
77
<ApplicationIcon>..\..\ORTS.ico</ApplicationIcon>
88
<IsPublishable>False</IsPublishable>
9-
<Copyright>© Open Rails project</Copyright>
10-
<Authors>Open Rails project</Authors>
11-
<Description>Open Rails data collector (contributed)</Description>
9+
<AssemblyTitle>Open Rails Data Collector (Contributed)</AssemblyTitle>
10+
<Description>Open Rails Transport Simulator</Description>
11+
<Company>Open Rails</Company>
12+
<Product>Open Rails</Product>
13+
<Copyright>Copyright © 2009 - 2022</Copyright>
1214
<PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>
1315
</PropertyGroup>
1416
<ItemGroup>

‎Source/Contrib/DataCollector/Program.cs

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
using ORTS.Common;
2020
using System;
2121
using System.Collections.Generic;
22+
using System.Diagnostics;
2223
using System.IO;
2324
using System.Linq;
2425

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

3940
static void ShowHelp()
4041
{
41-
Console.WriteLine("Open Rails Data Collector utility");
42+
var version = FileVersionInfo.GetVersionInfo(typeof(Program).Assembly.Location);
43+
Console.WriteLine("{0} {1}", version.FileDescription, VersionInfo.VersionOrBuild);
4244
Console.WriteLine();
43-
Console.WriteLine("{0} [/system | /tile-terrtex PATH [...]]", Path.GetFileNameWithoutExtension(AppDomain.CurrentDomain.FriendlyName));
45+
Console.WriteLine("Usage:");
46+
Console.WriteLine(" {0} [options] [<PATH> [...]]", Path.GetFileNameWithoutExtension(version.FileName));
4447
Console.WriteLine();
45-
// "1234567890123456789012345678901234567890123456789012345678901234567890123456789"
46-
Console.WriteLine(" /system Collects and reports on various system information.");
47-
Console.WriteLine(" /tile-terrtex Scans the provided PATHs for MSTS tile files (.t) and");
48-
Console.WriteLine(" produces a statistical summary of the terrtex used.");
48+
Console.WriteLine("Arguments:");
49+
Console.WriteLine(" <PATH> Directories to scan for specific options");
50+
Console.WriteLine();
51+
Console.WriteLine("Options:");
52+
Console.WriteLine(" /system Collects and reports on various system information");
53+
Console.WriteLine(" /tile-terrtex Scans the provided PATHs for MSTS tile files (.t) and");
54+
Console.WriteLine(" produces a statistical summary of the terrtex used");
4955
}
5056

5157
struct TileTerrtexDirectory

‎Source/Contrib/DataConverter/DataConverter.csproj

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@
66
<AssemblyName>Contrib.DataConverter</AssemblyName>
77
<ApplicationIcon>..\..\ORTS.ico</ApplicationIcon>
88
<IsPublishable>False</IsPublishable>
9-
<Copyright>© Open Rails project</Copyright>
10-
<Authors>Open Rails project</Authors>
11-
<Description>Open Rails data converter (contributed)</Description>
9+
<AssemblyTitle>Open Rails Data Converter (Contributed)</AssemblyTitle>
10+
<Description>Open Rails Transport Simulator</Description>
11+
<Company>Open Rails</Company>
12+
<Product>Open Rails</Product>
13+
<Copyright>Copyright © 2009 - 2022</Copyright>
1214
<PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>
1315
</PropertyGroup>
1416
<ItemGroup>

0 commit comments

Comments
 (0)