Skip to content

Commit c46eb0d

Browse files
cjakemancjakeman
authored
Merge branch 'master' into manual-news
2 parents f7ba507 + 2319f7f commit c46eb0d

File tree

79 files changed

+3398
-861
lines changed

Some content is hidden

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

79 files changed

+3398
-861
lines changed

‎Docs/Contributing.md

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ If you've got a feature suggestion for Open Rails, please report it in [our road
1818

1919
You are free to make any modifications to the Open Rails code that you like; that's how open source works. However, if you'd like your feature to be included in the official version, there is a process to ensure that the community agrees and to review the code for potential issues prior to inclusion.
2020

21-
In most cases, you can get started immediately with making the changes and creating a pull request. We do ask for some additional steps to be taken for some bugs and all new features, but they can come before or after the pull request. Please feel free to share ideas and proposals as pull requests!
21+
In most cases, you can get started immediately with making the changes and creating a pull request. We have _additional requirements_ for some bugs and all new features, but they can come before or after the pull request is created. Please feel free to share ideas and proposals as pull requests!
2222

2323
**Note:** You must fork the Open Rails repository before you start working on it. We do not allow you to push branches to the official repository.
2424

@@ -28,19 +28,25 @@ In most cases, you can get started immediately with making the changes and creat
2828

2929
If you'd like to improve the [documentation](./), [manual](../Source/Documentation/Manual), or [translations](../Source/Locales) you can get started immediately.
3030

31-
There are no requirements for the pull request.
31+
There are no additional requirements for the pull request.
3232

3333
### Contributed projects
3434

3535
If you'd like to improve the [contributed projects](../Source/Contrib) you can get started immediately.
3636

37-
There are no requirements for the pull request.
37+
There are no additional requirements for the pull request.
38+
39+
### Refactoring process
40+
41+
If you'd like to refactor the existing code you can get started immediately, but please have a look at our [architecture requirements](#architecture-requirements). We welcome architectural discussions on our [forum](http://www.elvastower.com/forums/index.php?/forum/256-developing-features/).
42+
43+
There are no additional requirements for the pull request.
3844

3945
### Bug process
4046

4147
If you'd like to fix a bug, you can get started immediately. If the fix turns out to be very small, you do not even need a bug report. Otherwise, you will need to make sure it has been reported on [our bug tracker on Launchpad](https://bugs.launchpad.net/or). If it has not, you can report the bug *and* fix it!
4248

43-
There are no requirements for creating the pull request.
49+
There are no additional requirements for _creating_ the pull request.
4450

4551
These things must be done in the required order:
4652

‎Source/ContentChecker/ContentChecker.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net472</TargetFramework>
3+
<TargetFrameworks Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFrameworks>
4+
<TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net472</TargetFrameworks>
45
<OutputType>Exe</OutputType>
56
<UseWindowsForms>true</UseWindowsForms>
67
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net472</TargetFramework>
3+
<TargetFrameworks Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFrameworks>
4+
<TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net472</TargetFrameworks>
45
<OutputType>WinExe</OutputType>
56
<AssemblyName>Contrib.ActivityEditor</AssemblyName>
67
<ApplicationIcon>..\..\..\ORTS.ico</ApplicationIcon>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net472</TargetFramework>
3+
<TargetFrameworks Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFrameworks>
4+
<TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net472</TargetFrameworks>
45
<OutputType>Library</OutputType>
56
<AssemblyName>Contrib.LibAE</AssemblyName>
67
<IsPublishable>False</IsPublishable>

‎Source/Contrib/ContentManager/ContentManager.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net472</TargetFramework>
3+
<TargetFrameworks Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFrameworks>
4+
<TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net472</TargetFrameworks>
45
<OutputType>WinExe</OutputType>
56
<RootNamespace>ORTS.ContentManager</RootNamespace>
67
<AssemblyName>Contrib.ContentManager</AssemblyName>

‎Source/Contrib/ContentManager/ContentManagerGUI.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,8 @@ void searchBox_TextChanged(object sender, EventArgs e)
270270
var content = pending[path];
271271
pending.Remove(path);
272272

273-
if (content.Name.ToLowerInvariant().Contains(search))
273+
// do not add root element to search results, see bug 1944070
274+
if (content.Type != ContentType.Root && content.Name.ToLowerInvariant().Contains(search))
274275
finds.Add(new SearchResult(content, path));
275276

276277
foreach (var child in ((ContentType[])Enum.GetValues(typeof(ContentType))).SelectMany(ct => content.Get(ct)))

‎Source/Contrib/DataCollector/DataCollector.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net472</TargetFramework>
3+
<TargetFrameworks Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFrameworks>
4+
<TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net472</TargetFrameworks>
45
<OutputType>Exe</OutputType>
56
<RootNamespace>ORTS.DataCollector</RootNamespace>
67
<AssemblyName>Contrib.DataCollector</AssemblyName>

‎Source/Contrib/DataConverter/DataConverter.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net472</TargetFramework>
3+
<TargetFrameworks Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFrameworks>
4+
<TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net472</TargetFrameworks>
45
<OutputType>Exe</OutputType>
56
<RootNamespace>Orts.DataConverter</RootNamespace>
67
<AssemblyName>Contrib.DataConverter</AssemblyName>

‎Source/Contrib/DataValidator/DataValidator.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net472</TargetFramework>
3+
<TargetFrameworks Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFrameworks>
4+
<TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net472</TargetFrameworks>
45
<OutputType>Exe</OutputType>
56
<AssemblyName>Contrib.DataValidator</AssemblyName>
67
<IsPublishable>False</IsPublishable>

‎Source/Contrib/SimulatorTester/SimulatorTester.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net472</TargetFramework>
3+
<TargetFrameworks Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFrameworks>
4+
<TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net472</TargetFrameworks>
45
<OutputType>Exe</OutputType>
56
<RootNamespace>Orts.SimulatorTester</RootNamespace>
67
<AssemblyName>Contrib.SimulatorTester</AssemblyName>

0 commit comments

Comments
 (0)