Skip to content

Commit a675233

Browse files
author
Chris Jakeman
committed
Merge remote-tracking branch 'upstream/master'
2 parents ddbe08f + 04375e6 commit a675233

File tree

21 files changed

+142
-208
lines changed

21 files changed

+142
-208
lines changed

‎Source/Documentation/Manual/images/cover_image.png‎

723 KB
Loading

‎Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1836,14 +1836,15 @@ public override void Update(float elapsedClockSeconds)
18361836
if (TendersSteamLocomotive != null)
18371837
{
18381838
if (TendersSteamLocomotive.IsTenderRequired == 1)
1839-
{
1840-
TendersSteamLocomotive.MaxTenderCoalMassKG = TenderWagonMaxCoalMassKG;
1841-
1839+
{
18421840
// Combined total water found by taking the current combined water (which may have extra water added via the auxiliary tender), and subtracting the
1843-
// amount of water defined in the ENG file, and adding the water defiend in the WAG file.
1841+
// amount of water defined in the ENG file, and adding the water defined in the WAG file.
18441842
float TempMaxCombinedWater = TendersSteamLocomotive.MaxTotalCombinedWaterVolumeUKG;
18451843
TendersSteamLocomotive.MaxTotalCombinedWaterVolumeUKG = (TempMaxCombinedWater - (Kg.ToLb(TendersSteamLocomotive.MaxLocoTenderWaterMassKG) / WaterLBpUKG)) + (Kg.ToLb(TenderWagonMaxWaterMassKG) / WaterLBpUKG);
18461844

1845+
TendersSteamLocomotive.MaxTenderCoalMassKG = TenderWagonMaxCoalMassKG;
1846+
TendersSteamLocomotive.MaxLocoTenderWaterMassKG = TenderWagonMaxWaterMassKG;
1847+
18471848
if (Simulator.Settings.VerboseConfigurationMessages)
18481849
{
18491850
Trace.TraceInformation("Fuel and Water Masses adjusted to Tender Values Specified in WAG File - Coal mass {0} kg, Water Mass {1}", FormatStrings.FormatMass(TendersSteamLocomotive.MaxTenderCoalMassKG, IsMetric), FormatStrings.FormatFuelVolume(L.FromGUK(TendersSteamLocomotive.MaxTotalCombinedWaterVolumeUKG), IsMetric, IsUK));

‎Website/openrails.org/contribute/developing-code/index.php‎

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
</p>
5252
<ul>
5353
<li>Addons - accessory files shipped with the installation package</li>
54-
<li>Architecture - an incomplete experiment in restructuring the program</li>
54+
<li>Design - documents recording the design of OR components</li>
5555
<li>Documentation - operations manual and other documentation</li>
5656
<li>Program - empty space for executables once they are compiled</li>
5757
<li>Source - the principal source code files</li>
@@ -68,11 +68,10 @@
6868
<li>Visual Studio 2017 or 2019, any edition. The
6969
<a href="https://www.visualstudio.com/downloads/">Community Edition</a>
7070
is free
71-
<br />(Note 1: To save on disk space, all you need is the option Windows > .NET Development)
72-
<br />(Note 2: Install this before Microsoft XNA Framework Redistributable 3.1)
71+
<br />(Note: To save on disk space, all you need is the option Windows > .NET Development)
7372
</li>
74-
<li><a href="https://www.microsoft.com/en-gb/download/details.aspx?id=15163">Microsoft XNA Framework Redistributable 3.1</a></li>
7573
</ul>
74+
<br>
7675
<p>
7776
After you have downloaded the code:
7877
</p>
@@ -128,22 +127,10 @@
128127
<a href=# id="code_policy"><h2 class="accordion_head"><span class="glyphicon glyphicon-play btn-xs"></span> Policy for Code Changes</h2></a>
129128
<div class="accordion_body">
130129
<p>
131-
To allow many people to contribute directly to Open Rails successfully, we have a policy in place to keep tabs on where changes come from and which changes are allowed. The policy is as follows:
130+
To allow many people to contribute directly to Open Rails successfully, we have a policy in place to keep tabs on where
131+
changes come from and which changes are allowed.
132+
The policy is set out in the document <a href="https://github.com/openrails/openrails/blob/master/Docs/Contributing.md">Contributing.md</a>.
132133
</p>
133-
<ol>
134-
<li>All changes must be one of:
135-
<ul>
136-
<li><em>Simple</em> bug fixes, with a link to the bug</li>
137-
<li><em>Targeted</em> bug fixes, with a link to the bug</li>
138-
<li><em>Approved</em> blueprints, with a link to the blueprint</li>
139-
<li>Documentation or localisation updates (kept separate from code changes)</li>
140-
</ul>
141-
</li>
142-
<li><em>Simple</em> means no more than a few lines changes and no uncertainty over the logic change.</li>
143-
<li><em>Targeted</em> means "Milestone" is set to the next planned stable version.</li>
144-
<li><em>Approved</em> means "Direction" is "Approved", "Milestone target" is unset or set to the next planned stable version, and at least 7 days of discussion has taken place.</li>
145-
</ol>
146-
<br>
147134
<p>
148135
For members of the <a href="../../discover/project-team/">Development Team</a>, these policies are defined in more detail in
149136
<a href="http://www.elvastower.com/forums/index.php?/topic/26392-new-policy-for-code-changes/">Policy for code changes</a>

‎Website/openrails.org/contribute/joining-the-team/index.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
</p><p>
2626
Although we get notified automatically, it's a good idea to post a message on the <a href="http://www.elvastower.com/forums/index.php?/forum/192-discussion/">Elvas Tower forum</a> because members often respond with ideas for navigating the code, understanding the bug, fixing it or testing it.
2727
</p><p>
28-
If your solution appears to fix the problem, then <a href="../developing-code/#submitting_a_change">upload a change file</a> to the forum so we can include it in the code.
28+
If your solution appears to fix the problem, then <a href="../developing-code/#submitting_a_change">make a Pull Request</a> to the repository so we can review it and include it in the code.
2929
</p>
3030
</div>
3131
<div class="col-md-1"></div>

‎Website/openrails.org/discover/project-team/index.php‎

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,13 @@
4444
<div class="col-md-3">
4545
<p>&nbsp;</p>
4646
<table>
47-
<tr><td>BillC</td></tr>
48-
<tr><td>Cédric Gniewek (Serana)</td></tr>
49-
<tr><td>Chris Jakeman * (cjakeman)</td></tr>
47+
<tr><td>cesarbl</td></tr>
48+
<tr><td>cjakeman *</td></tr>
5049
<tr><td>CSantucci</td></tr>
51-
<tr><td>edwardk</td></tr>
52-
<tr><td>Goku</td></tr>
53-
<tr><td>Peter Gulyas (gpz)</td></tr>
50+
<tr><td>gpz</td></tr>
5451
<tr><td>James Ross *</td></tr>
55-
<tr><td>jeroenp</td></tr>
52+
<tr><td>jonas</td></tr>
53+
<tr><td>mbm_OR</td></tr>
5654
</table>
5755
<p class="small"><br>
5856
* Open Rails Management Team
@@ -61,16 +59,13 @@
6159
<div class="col-md-3">
6260
<p>&nbsp;</p>
6361
<table>
64-
<tr><td>JTang</td></tr>
65-
<tr><td>Matej Pacha</td></tr>
66-
<tr><td>Mauricio (mbm_OR)</td></tr>
67-
<tr><td>PerpetualKid</td></tr>
68-
<tr><td>rdamurphy</td></tr>
69-
<tr><td>Rob Roeterdink (roeter)</td></tr>
70-
<tr><td>Ryan Young (YoRyan)</td></tr>
62+
<tr><td>paolo</td></tr>
63+
<tr><td>perpetualKid</td></tr>
64+
<tr><td>roeter</td></tr>
65+
<tr><td>Serana</td></tr>
7166
<tr><td>steamer_ctn</td></tr>
72-
<tr><td>Stefan PAITONI</td></tr>
7367
<tr><td>wacampbell</td></tr>
68+
<tr><td>YoRyan</td></tr>
7469
</table>
7570
</div>
7671
</div>
@@ -94,23 +89,21 @@
9489
<tr><td>chalky</td></tr>
9590
<tr><td>coonskin *</td></tr>
9691
<tr><td>Copperpen</td></tr>
97-
<tr><td>Eldorado.Railroad</td></tr>
9892
</table>
9993
<p class="small"><br>
10094
* Open Rails Management Team
10195
</p>
10296
</div>
10397
<div class="col-md-3">
10498
<p>&nbsp;</p>
105-
<table>
106-
<tr><td>engmod</td></tr>
107-
<tr><td>EugenR</td></tr>
108-
<tr><td>Genma Saotome</td></tr>
109-
<tr><td>plainsman</td></tr>
110-
<tr><td>thegrindre</td></tr>
111-
<tr><td>Turbo Bill</td></tr>
112-
<tr><td>WaltN</td></tr>
113-
</table>
99+
<table>
100+
<tr><td>Eldorado.Railroad</td></tr>
101+
<tr><td>engmod</td></tr>
102+
<tr><td>EugenR</td></tr>
103+
<tr><td>Genma Saotome</td></tr>
104+
<tr><td>plainsman</td></tr>
105+
<tr><td>thegrindre</td></tr>
106+
</table>
114107
</div>
115108
</div>
116109
<div class="row">
@@ -123,9 +116,14 @@
123116
<div class="col-md-6">
124117
<p>&nbsp;</p>
125118
<table class="staff">
119+
<tr><td>Brazilian</td><td>Diter</td></tr>
120+
<tr><td>Czech</td><td>Howky</td></tr>
126121
<tr><td>French</td><td>Serana</td></tr>
127-
<tr><td>German</td><td>Markus Gelbmann (markus_GE)</td></tr>
122+
<tr><td>German</td><td>jonas</td></tr>
128123
<tr><td>Italian</td><td>strawberryfield</td></tr>
124+
<tr><td>Portuguese</td><td>Aldarion</td></tr>
125+
<tr><td>Russian</td><td>Weter</td></tr>
126+
<tr><td>Spanish</td><td>xavivilla</td></tr>
129127
</table>
130128
</div>
131129
<div class="col-md-6">

‎Website/openrails.org/discover/version-1-4/index.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
<p>
7171
A <a href="https://launchpad.net/or/+milestone/1.4">full list of changes</a> is available.
7272
</p>
73-
<h3><a href="../version-1-3-1/">Changes in previous version</a></h3>
73+
<h3><a href="../version-1-3/">Changes in previous version</a></h3>
7474
<p>&nbsp;</p>
7575
</div>
7676
</div>

‎Website/openrails.org/download/changes/index.php‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
<p>
1818
This is a list of all the code changes since the last stable version. Those since the previous testing version are <span class="text-primary">highlighted</span>.
1919
</p>
20-
<p>
21-
<strong>For users on X4081 and earlier:</strong> Due to an issue with the updater, you will need to <a href="../program/confirm.php?file=OpenRails-Testing.zip">manually download the latest version</a> once before you can continue updating within the application.
22-
</p>
2320
<ul class="revisions">
2421
<?php include "../../api/update/testing/changelog_stable.html" ?>
2522
</ul>

‎Website/openrails.org/download/content/index.php‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@
5050
<p>
5151
The Spanish websites <a href="http://viajerosaltren.es">Viajeros al Tren</a> and <a href="http://www.spaintrainzrutas.com/">Spain Trainz Rutas</a> are some of the first to offer Open Rails-specific products.
5252
</p><p>
53-
<a href="http://www.dekosoft.com">Dekosoft Trains</a> have since offered GP30 locos with 3D cabs exclusively for Open Rails.
53+
<a href="http://www.dekosoft.com">Dekosoft Trains</a> offer GP30 locos with 3D cabs exclusively for Open Rails.
5454
</p><p>
55-
Peter Newell has just released (June 2015) the <a href="http://www.zigzag.coalstonewcastle.com.au/">Great Zig Zag Railway</a>, a steam route for Open Rails v1.0 (this 120MB download requires no other files).
55+
Peter Newell has published the <a href="http://www.zigzag.coalstonewcastle.com.au/">Great Zig Zag Railway</a>, a steam route for Open Rails v1.0 (this 120MB download requires no other files).
5656
</p><p>
5757
Some Australian routes (New South Wales) have been packaged by Peter Newell to work just with Open Rails:
5858
</p>
@@ -62,14 +62,16 @@
6262
<li><a href="http://www.manning-river.coalstonewcastle.com.au/">Manning River Breakwall Railway</a></li>
6363
<li><a href="http://www.tweed.coalstonewcastle.com.au/">Tweed Railway</a></li>
6464
</ul>
65+
<p>
66+
See <a href="/trade">our Trade page</a> for links to commercial vendors.
67+
</p>
6568
<h3>Library Files</h3>
6669
<ul>
67-
<li>A search for "ORTS" or "Open Rails" on <a href="http://www.elvastower.com">Elvas Tower</a> forum finds 146 files.</li>
68-
<li>A search for "ORTS" or "Open Rails" on <a href="http://www.trainsim.com">TrainSim</a> forum finds 31 files.</li>
69-
<li>A search for "Open" with simulator = OpenRails on <a href="http://www.uktrainsim.com">UKTrainSim</a> forum finds 6 files.</li>
70+
<li>A search for "Open Rails" on <a href="http://www.elvastower.com">Elvas Tower</a> forum finds 450 files.</li>
71+
<li>A search for "Open Rails" on <a href="http://www.trainsim.com">TrainSim</a> forum finds 519 files.</li>
7072
</ul>
7173
<p>
72-
<small>[Searches made 6-May-2015]</small>
74+
<small>[Searches made 28-May-2021]</small>
7375
</p>
7476
</div>
7577
</div>

‎Website/openrails.org/download/program/index.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<?php include "../../shared/banners/show_banner.php" ?>
99
<?php include "../../shared/menu.php" ?>
1010
<?php
11-
$download_stable = 'OpenRails-1.3.1-Setup.exe';
11+
$download_stable = 'OpenRails-1.4-Setup.exe';
1212
$download_testing = 'OpenRails-Testing.zip';
1313
$file_path = "../../files";
1414
?>
@@ -20,7 +20,7 @@
2020
<div class="row">
2121
<div class="col-md-1"></div>
2222
<div class="col-md-4">
23-
<h1>Stable Version 1.3.1 <small>(recommended)</small></h1>
23+
<h1>Stable Version 1.4 <small>(recommended)</small></h1>
2424
<br>
2525
<!-- Button to trigger modal -->
2626
<a href="#modal1" role="button" class='btn download_button btn-lg btn-block' data-toggle="modal">
@@ -32,7 +32,7 @@
3232
<p style="text-align: center;">
3333
<!-- Cannot set modification date to correct value so write it literally -->
3434
<!-- <?php echo date('d F Y', filemtime("$file_path/$download_stable")) . ', ' . round(filesize("$file_path/$download_stable") / 1024 / 1024) . 'MB'; ?> -->
35-
<?php echo '08 December 2018, ' . round(filesize("$file_path/$download_stable") / 1024 / 1024) . 'MB'; ?>
35+
<?php echo '19 Oct 2021, ' . round(filesize("$file_path/$download_stable") / 1024 / 1024) . 'MB'; ?>
3636
</p>
3737
<!--<p class="alert alert-info">
3838
We're working hard on producing the next stable version. Please check back soon.

‎Website/openrails.org/download/source/index.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<?php include "../../shared/banners/show_banner.php" ?>
88
<?php include "../../shared/menu.php" ?>
99
<?php
10-
$source_stable = 'OpenRails-1.2-Source.zip';
10+
$source_stable = 'OpenRails-1.4-Source.zip';
1111
$source_testing = 'OpenRails-Testing-Source.zip';
1212
$file_path = "../../files";
1313
?>
@@ -19,7 +19,7 @@
1919
<div class="row">
2020
<div class="col-md-1"></div>
2121
<div class="col-md-4">
22-
<h1>Stable Version 1.2</h1>
22+
<h1>Stable Version 1.4</h1>
2323
<br>
2424
<a href='<?php echo "$file_path/$source_stable" ?>' class='btn download_button btn-lg btn-block'>
2525
<h2><span class='glyphicon glyphicon-download'></span> &nbsp; Download the source code</h2>
@@ -28,7 +28,7 @@
2828
</p>
2929
</a>
3030
<p style="text-align: center;">
31-
<?php echo date('d F Y', filemtime("$file_path/$source_stable")) . ', ' . round(filesize("$file_path/$source_stable") / 1024 / 1024) . 'MB'; ?>
31+
<?php echo '19 Oct 2021, ' . round(filesize("$file_path/$source_stable") / 1024 / 1024) . 'MB'; ?>
3232
</p>
3333
</div>
3434
<div class="col-md-2"></div>

0 commit comments

Comments
 (0)