Skip to content

Commit c59c788

Browse files
pzgulyaspzgulyas
committed
Merge remote-tracking branch 'remotes/origin/master' into gltf2
2 parents 7269d24 + f3e543f commit c59c788

File tree

401 files changed

+16489
-15015
lines changed

Some content is hidden

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

401 files changed

+16489
-15015
lines changed

‎.github/release.yml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
changelog:
2+
exclude:
3+
labels:
4+
- ignore-for-release
5+
authors:
6+
- appveyor
7+
- dependabot
8+
- github-actions
9+
categories:
10+
- title: New Features
11+
labels:
12+
- enhancement
13+
- title: Documentation and Localization
14+
labels:
15+
- documentation
16+
- locales
17+
- title: Bug Fixes
18+
labels:
19+
- bug
20+
- title: Other Changes
21+
labels:
22+
- "*"

‎Build.cmd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ IF "%Mode%" == "Stable" (
163163
REM Create binary and source zips.
164164
CALL :delete "OpenRails-%Mode%*.zip" || GOTO :error
165165
PUSHD "Program" && 7za.exe a -r -tzip -x^^!*.xml "..\OpenRails-%Mode%.zip" . && POPD || GOTO :error
166-
7za.exe a -r -tzip -x^^!.* -x^^!obj -x^^!lib -x^^!_build -x^^!*.bak -x^^!Website "OpenRails-%Mode%-Source.zip" "Source" || GOTO :error
166+
7za.exe a -r -tzip -x^^!.* -x^^!obj -x^^!lib -x^^!_build -x^^!*.bak "OpenRails-%Mode%-Source.zip" "Source" || GOTO :error
167167

168168
ENDLOCAL
169169
GOTO :EOF

‎Docs/Contributing.md‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,22 @@ You are free to make any modifications to the Open Rails code that you like; tha
2020

2121
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!
2222

23-
**Note:** You must start your work from the "master" branch and merged pull requests back into the "master" branch, unless we direct you otherwise.
23+
**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.
24+
25+
**Note:** You should do your work on separate branches; they must be created from the "master" branch and pull requests must merge back into the "master" branch, unless we direct you otherwise.
2426

2527
### Documentation and translations
2628

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

2931
There are no requirements for the pull request.
3032

33+
### Contributed projects
34+
35+
If you'd like to improve the [contributed projects](../Source/Contrib) you can get started immediately.
36+
37+
There are no requirements for the pull request.
38+
3139
### Bug process
3240

3341
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!
@@ -154,7 +162,7 @@ When we start preparing for a new Stable Version, all code in the Testing Versio
154162

155163
### Submitting your code
156164

157-
When you're done writing code, you should make a pull request on GitHub. The title and description of the requests should concisely indicate what bug or feature you've implemented and you will need to include links to whichever of the following are appropriate:
165+
When you're done writing code, you should make a pull request on GitHub from your fork's branch back to the official repository's "master" branch. The title and description of the requests should concisely indicate what bug or feature you've implemented and you will need to include links to whichever of the following are appropriate:
158166

159167
* Bug report
160168
* Road-map card

‎Docs/Policies.md‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# Project Policies
2+
3+
This document records the policies currently in place under which the Project Team operates.
4+
5+
## License
6+
7+
The [GNU Public License](http://www.gnu.org/licenses/licenses.html) allows a user to use Open Rails in any way, except that you may not distribute software containing part of Open Rails without respecting the license terms.
8+
9+
## Liability
10+
11+
Open Rails is intended for entertainment purposes only and, to avoid liability, is not suitable for professional applications.
12+
13+
## Code Submissions
14+
15+
[Code contributions](https://github.com/openrails/openrails/blob/master/Docs/Contributing.md) to our repository must be in Microsoft's C# language. An authorised developer may not change content in the official version of Open Rails without approval from another authorised developer.
16+
17+
## Content Compatibility
18+
19+
Open Rails will continue to maintain compatibility with content from previous official versions of Open Rails.
20+
21+
## File Formats
22+
23+
New types of content will use the JavaScript Object Notation (JSON).
24+
Existing types of content from previous official versions of Open Rails will continue to be loaded without change.
25+
26+
## Keyboard Assignments
27+
28+
New key assignments should obey the following rules where that is possible.
29+
30+
* Reserve digit keys for camera operations.
31+
* Reserve Fn keys for pop-up windows.
32+
* Reserve the Alt modifier for debug operations.
33+
* Reserve modifier+space (e.g. Ctrl+space) for future expansion using sequences of keys.
34+
35+
Existing key assignments may not be changed without community discussion and approval of the Open Rails Management Team.
36+
37+
## Crashes and Derailments
38+
39+
Open Rails simulates emergency events which bring a train to a standstill, such as a derailment, and provides both a visual indication and a notification of the problem.
40+
41+
Open Rails does not show rolling stock leaving the track due to crashes or derailments. We have many members from the rail industry who have spent their working lives preventing incidents that cause injuries and loss of life and we respect that point of view.

‎Docs/Readme.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@ Open Rails is a free train simulator supporting the world's largest range of dig
1919
* [Join the community](http://www.openrails.org/share/community/?utm_campaign=documentation&utm_source=readme&utm_medium=referral)
2020
* [Report bugs or offer suggestions](http://www.openrails.org/contribute/reporting-bugs/?utm_campaign=documentation&utm_source=readme&utm_medium=referral)
2121
* [Create content](http://www.openrails.org/contribute/building-models/?utm_campaign=documentation&utm_source=readme&utm_medium=referral)
22+
* [How to propose and submit work](Contributing.md)
2223
* [Write code](http://www.openrails.org/contribute/developing-code/?utm_campaign=documentation&utm_source=readme&utm_medium=referral)
2324
* [Join the team](http://www.openrails.org/contribute/joining-the-team/?utm_campaign=documentation&utm_source=readme&utm_medium=referral)
24-
* [More details](Contributing.md)
25+
2526

2627
## Build status
2728

‎Source/Contrib/ActivityEditor/ActivityEditor/Engine/SimpleTextEd.Designer.cs‎

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

‎Source/Contrib/ActivityEditor/ActivityEditor/Engine/SimpleTextEd.resx‎

Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+
<xsd:element name="root" msdata:IsDataSet="true">
65+
<xsd:complexType>
66+
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
82+
</xsd:complexType>
83+
</xsd:element>
84+
<xsd:element name="data">
85+
<xsd:complexType>
86+
<xsd:sequence>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+
</xsd:sequence>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
94+
</xsd:complexType>
95+
</xsd:element>
96+
<xsd:element name="resheader">
97+
<xsd:complexType>
98+
<xsd:sequence>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+
</xsd:sequence>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:choice>
105+
</xsd:complexType>
106+
</xsd:element>
107+
</xsd:schema>
108+
<resheader name="resmimetype">
109+
<value>text/microsoft-resx</value>
110+
</resheader>
111+
<resheader name="version">
112+
<value>2.0</value>
113+
</resheader>
114+
<resheader name="reader">
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+
</resheader>
117+
<resheader name="writer">
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+
</resheader>
120+
<metadata name="bar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
121+
<value>17, 17</value>
122+
</metadata>
123+
</root>

‎Source/Contrib/TrackViewer/Drawing/DrawColors.cs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ static class DrawColors
4646
public static ColorScheme colorsRoadsHotlight = new ColorScheme(HighlightType.Hotlight);
4747
public static ColorScheme colorsPathMain = new ColorScheme();
4848
public static ColorScheme colorsPathSiding = new ColorScheme();
49+
public static ColorScheme colorsEvent = new ColorScheme();
4950

5051
static ColorsGroupTrack trackGroupFlat = new ColorsGroupTrack();
5152
static ColorsGroupTrack roadTrackGroupFlat = new ColorsGroupTrack();
@@ -212,6 +213,11 @@ private static void SetItemColors(IPreferenceChanger preferenceChanger)
212213
TrackViewer.catalog.GetString("Select speedpost color"));
213214
itemColors.Speedpost = itemColor;
214215

216+
itemColor = new ColorWithHighlights(Color.DarkGray, 40);
217+
itemColor.MakeIntoUserPreference(preferenceChanger, "event",
218+
TrackViewer.catalog.GetString("Select event color"));
219+
itemColors.Event = itemColor;
220+
215221
itemColor = new ColorWithHighlights(Color.Blue, 40);
216222
itemColors.CandidateNode = itemColor;
217223

@@ -321,6 +327,7 @@ class ColorsGroupBasic {
321327
public ColorWithHighlights RoadCrossing { get; set; }
322328
public ColorWithHighlights Speedpost { get; set; }
323329
public ColorWithHighlights Siding { get; set; }
330+
public ColorWithHighlights Event { get; set; }
324331

325332
public ColorWithHighlights Text { get; set; }
326333
public ColorWithHighlights ClearWindowInset { get; set; }
@@ -362,6 +369,7 @@ class ColorScheme
362369
public Color RoadCrossing { get { return TrackItemColors.RoadCrossing.Colors[highlightType]; } }
363370
public Color Speedpost { get { return TrackItemColors.Speedpost.Colors[highlightType]; } }
364371
public Color Siding { get { return TrackItemColors.Siding.Colors[highlightType]; } }
372+
public Color Event { get { return TrackItemColors.Event.Colors[highlightType]; } }
365373

366374
public Color ActiveNode { get { return TrackItemColors.ActiveNode.Colors[highlightType]; } }
367375
public Color CandidateNode { get { return TrackItemColors.CandidateNode.Colors[highlightType]; } }

0 commit comments

Comments
 (0)