Skip to content

Commit 159f0c6

Browse files
authored
Merge branch 'master' into new-advanced-coupler
2 parents 04fdfb8 + f20bac3 commit 159f0c6

File tree

6 files changed

+146
-108
lines changed

6 files changed

+146
-108
lines changed

contribute/developing-code/index.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
To compile and debug the Open Rails source code, ensure you have the following Microsoft products installed:
6565
</p>
6666
<ul>
67-
<li>Visual Studio 2015/17/19, any edition. The
67+
<li>Visual Studio 2017 or 2019, any edition. The
6868
<a href="https://www.visualstudio.com/downloads/">Community Edition</a>
6969
is free
7070
<br />(Note 1: To save on disk space, all you need is the option Windows > .NET Development)

discover/news/index.php

Lines changed: 117 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -15,102 +15,127 @@
1515
<div class="row">
1616
<div class="col-md-1"></div>
1717
<div class="col-md-5">
18-
<h2>Jan 2017 - Version 1.2</h2>
19-
<p>
20-
<a href="/discover/version-1-2/">Open Rails 1.2</a> released! <a href="/download/program/">Download it here</a>.
21-
</p>
22-
<hr />
23-
<h2>Mar 2016 - Version 1.1</h2>
24-
<p>
25-
<a href="/discover/version-1-1/">Open Rails 1.1</a> released!
26-
</p>
27-
<hr />
28-
<h2>Dec 2015 - More Access to Elvas Tower</h2>
29-
<p>
30-
The Elvas Tower forum plays a major role in developing Open Rails but has been closed to non-members following a dispute.
31-
We can now report that some of the <a href="http://www.elvastower.com/forums/">Open Rails sub-forums</a>
32-
are open again.
33-
</p>
34-
<hr />
35-
<h2>Jun 2015 - Great Zig Zag Railway</h2>
36-
<p>
37-
Peter Newell has just released (June 2105) the <a href="http://www.zigzag.coalstonewcastle.com.au/">Great Zig Zag Railway</a>,
38-
a steam route for Open Rails v1.0 (this 120MB download requires no other files).
39-
</p>
40-
<hr />
41-
<h2>May 2015 - Version 1.0</h2>
42-
<p>
43-
<a href="/discover/version-1-0/">Open Rails 1.0</a> released! <a href="/download/program/">Download it here</a>.
44-
</p>
45-
<hr />
46-
<h2>Apr 2015 - Demo Model 1</h2>
47-
<p>
48-
Open Rails first demonstration route <a href="/download/content">Demo Model 1</a> has been published.
49-
</p>
50-
<hr />
51-
<h2>Dec 2014 - 3D Cabs</h2>
52-
<p>
53-
<a href="http://www.dekosoft.com">Dekosoft Trains</a> has added locos exclusively for Open Rails to its range.
54-
These are GP30 diesels taking advantage of our 3D cab feature.
55-
</p>
56-
<hr />
57-
<h2>Jul 2014 - Web Site</h2>
58-
<p>
59-
The legacy graphics-heavy web site has been replaced by one based on Bootstrap which is both easier to maintain and
60-
suitable for phones and tablets as well as PCs.
61-
</p><p>
62-
You can still <a href="/web1/index.html">see an archive of the old site</a>.
63-
</p>
64-
<hr />
65-
<h2>Apr 2014 - Installer</h2>
66-
<p>
67-
An installer is now available, so Open Rails and its pre-requisites such as XNA can be delivered in a single download.
68-
</p>
69-
<hr />
70-
<h2>Apr 2014 - Smoother, More Detailed Graphics</h2>
71-
<p>
72-
Open Rails currently uses DirectX 9 and, although this is not the latest version of DirectX, hidden away inside is a method for reducing the
73-
number of "draw calls" which the CPU makes to the GPU. Fewer calls mean higher frame rates, smoother motion and the capacity to handle
74-
more detail.
75-
</p><p>
76-
The technique is called "hardware instancing" and allows identical objects (e.g. trees in a forest) to be combined into a single draw
77-
call. The work is transferred to the GPU which copies them as many times as necessary and usually has spare capacity.
78-
</p><p>
79-
You can expect some increases in frame rate, especially on routes with many identical objects. To turn this on, tick the checkbox for<br>
80-
<span class="tt">Options > Experimental > Use model instancing</span>
81-
</p>
82-
<hr />
83-
<h2>Mar 2014 - Additional Languages</h2>
84-
<p>
85-
Open Rails becomes available in additional languages, initially eight including Chinese.<br />
86-
</p><p>
87-
<img src="additional_languages.jpg" height=415 width=314 alt='screendump listing languages'/>
88-
</p>
89-
<hr />
90-
<h2>Mar 2014 - Work Starts On Timetables</h2>
91-
<p>
92-
A schedule of trains (or timetable) is nearly impossible to arrange in Microsoft Train Simulator as AI trains don't adhere to booked station stops. In Open Rails,
93-
the situation is better but an activity with a player train and AI traffic is still very different from a timetable.
94-
</p><p>
95-
Work has now begun on a timetable element which is an alternative to the usual activity. The timetable will contain all the details
96-
needed for each scheduled train - path, consist, booked stops etc.. Conventional activities will continue as before.
97-
</p><p>
98-
Also there is no longer any distinction between player train or AI train - any train in the timetable can be selected as the player
99-
train, the others are operated by a remote player or by the simulator.
100-
</p>
101-
<hr />
102-
<h2>Feb 2014</h2>
103-
<p>
104-
Fog is developed from just softening the horizon into a realistic effect which users can fully control.
105-
</p>
18+
<h2>Apr 2020</h2>
19+
<p>
20+
After more than a year of work <a href="http://www.siskurail.org/" title="Oregon to California, created by Dale Rickert">the free, restored and improved Siskiyou Route</a> is once more available.
21+
</p>
22+
<hr />
23+
<h2>Apr 2019</h2>
24+
<p>
25+
<a href="https://www.trainsim.com/vbts/tslib.php?searchid=13577139">ENG files published</a> with accurate physics for 176 USA diesel locos.
26+
</p>
27+
<hr />
28+
<h2>Dec 2018</h2>
29+
<p>
30+
<a href="/discover/version-1-3-1/">Open Rails 1.3.1</a> released <a href="/download/program/">Download it here</a>.
31+
</p>
32+
<hr />
33+
<h2>Mar 2018</h2>
34+
<p>
35+
Geoff Rowlands found a way to model 3D controls so they can be grabbed by the handle <a href="https://www.youtube.com/watch?v=UO9XrBz3iD0&feature=youtu.be">as in this video</a>.
36+
</p>
37+
<hr />
38+
<h2>Nov 2017</h2>
39+
<p>
40+
Open Rails trialled <a href="http://www.monogame.net/">with Monogame instead of XNA</a> uses less RAM and give higher frame rates.
41+
</p>
42+
<hr />
43+
<h2>Jan 2017 - Version 1.2</h2>
44+
<p>
45+
<a href="/discover/version-1-2/">Open Rails 1.2</a> released.
46+
</p>
47+
<hr />
48+
<h2>Mar 2016 - Version 1.1</h2>
49+
<p>
50+
<a href="/discover/version-1-1/">Open Rails 1.1</a> released.
51+
</p>
52+
<hr />
53+
<h2>Dec 2015 - More Access to Elvas Tower</h2>
54+
<p>
55+
The Elvas Tower forum plays a major role in developing Open Rails but has been closed to non-members following a dispute.
56+
We can now report that some of the <a href="http://www.elvastower.com/forums/">Open Rails sub-forums</a>
57+
are open again.
58+
</p>
59+
<hr />
60+
<h2>Jun 2015 - Great Zig Zag Railway</h2>
61+
<p>
62+
Peter Newell has just released (June 2105) the <a href="http://www.zigzag.coalstonewcastle.com.au/">Great Zig Zag Railway</a>,
63+
a steam route for Open Rails v1.0 (this 120MB download requires no other files).
64+
</p>
65+
<hr />
66+
<h2>May 2015 - Version 1.0</h2>
67+
<p>
68+
<a href="/discover/version-1-0/">Open Rails 1.0</a> released! <a href="/download/program/">Download it here</a>.
69+
</p>
70+
<hr />
71+
<h2>Apr 2015 - Demo Model 1</h2>
72+
<p>
73+
Open Rails first demonstration route <a href="/download/content">Demo Model 1</a> has been published.
74+
</p>
75+
<hr />
76+
<h2>Dec 2014 - 3D Cabs</h2>
77+
<p>
78+
<a href="http://www.dekosoft.com">Dekosoft Trains</a> has added locos exclusively for Open Rails to its range.
79+
These are GP30 diesels taking advantage of our 3D cab feature.
80+
</p>
81+
<hr />
82+
<h2>Jul 2014 - Web Site</h2>
83+
<p>
84+
The legacy graphics-heavy web site has been replaced by one based on Bootstrap which is both easier to maintain and
85+
suitable for phones and tablets as well as PCs.
86+
</p><p>
87+
You can still <a href="/web1/index.html">see an archive of the old site</a>.
88+
</p>
89+
<hr />
90+
<h2>Apr 2014 - Installer</h2>
91+
<p>
92+
An installer is now available, so Open Rails and its pre-requisites such as XNA can be delivered in a single download.
93+
</p>
94+
<hr />
95+
<h2>Apr 2014 - Smoother, More Detailed Graphics</h2>
96+
<p>
97+
Open Rails currently uses DirectX 9 and, although this is not the latest version of DirectX, hidden away inside is a method for reducing the
98+
number of "draw calls" which the CPU makes to the GPU. Fewer calls mean higher frame rates, smoother motion and the capacity to handle
99+
more detail.
100+
</p><p>
101+
The technique is called "hardware instancing" and allows identical objects (e.g. trees in a forest) to be combined into a single draw
102+
call. The work is transferred to the GPU which copies them as many times as necessary and usually has spare capacity.
103+
</p><p>
104+
You can expect some increases in frame rate, especially on routes with many identical objects. To turn this on, tick the checkbox for<br>
105+
<span class="tt">Options > Experimental > Use model instancing</span>
106+
</p>
107+
<hr />
108+
<h2>Mar 2014 - Additional Languages</h2>
109+
<p>
110+
Open Rails becomes available in additional languages, initially eight including Chinese.<br />
111+
</p><p>
112+
<img src="additional_languages.jpg" height=415 width=314 alt='screendump listing languages'/>
113+
</p>
114+
<hr />
115+
<h2>Mar 2014 - Work Starts On Timetables</h2>
116+
<p>
117+
A schedule of trains (or timetable) is nearly impossible to arrange in Microsoft Train Simulator as AI trains don't adhere to booked station stops. In Open Rails,
118+
the situation is better but an activity with a player train and AI traffic is still very different from a timetable.
119+
</p><p>
120+
Work has now begun on a timetable element which is an alternative to the usual activity. The timetable will contain all the details
121+
needed for each scheduled train - path, consist, booked stops etc.. Conventional activities will continue as before.
122+
</p><p>
123+
Also there is no longer any distinction between player train or AI train - any train in the timetable can be selected as the player
124+
train, the others are operated by a remote player or by the simulator.
125+
</p>
126+
<hr />
127+
<h2>Feb 2014</h2>
128+
<p>
129+
Fog is developed from just softening the horizon into a realistic effect which users can fully control.
130+
</p>
106131
</div>
107132
<div class="col-md-1"></div>
108133
<div class="col-md-4">
109134
<h2>Recent Code Changes</h2>
110-
<ul>
111-
<?php include "../../api/update/testing/changelog.html" ?>
112-
</ul>
113-
<p><a href='../../download/changes/'>See more code changes</a></p>
135+
<ul>
136+
<?php include "../../api/update/testing/changelog.html" ?>
137+
</ul>
138+
<p><a href='../../download/changes/'>See more code changes</a></p>
114139
<div class="col-md-1">
115140
</div>
116141
</div>

index.php

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -71,23 +71,24 @@
7171
<div class="heading">
7272
<h4>News</h4>
7373
</div>
74+
<div style="background-color: #ffffcc; margin: 0 -5px; padding: 0 5px;">
75+
<p>
76+
<strong>Apr 2020</strong>
77+
After more than a year of work <a href="http://www.siskurail.org/" title="Oregon to California, created by Dale Rickert">the free, restored and improved Siskiyou Route</a> is once more available.
78+
</p>
79+
</div>
7480
<p>
75-
<strong>Mar 2018</strong>
76-
Geoff Rowlands found a way to model 3D controls so they can be grabbed by the handle <a href="https://www.youtube.com/watch?v=UO9XrBz3iD0&feature=youtu.be">as in this video</a>.
81+
<strong>Apr 2019</strong>
82+
<a href="https://www.trainsim.com/vbts/tslib.php?searchid=13577139">ENG files published</a> with accurate physics for 176 USA diesel locos.
7783
</p>
7884
<p>
79-
<strong>Nov 2017</strong>
80-
Open Rails trialled <a href="http://www.monogame.net/">with Monogame instead of XNA</a> uses less RAM and give higher frame rates.
85+
<strong>Mar 2018</strong>
86+
Geoff Rowlands found a way to model 3D controls so they can be grabbed by the handle <a href="https://www.youtube.com/watch?v=UO9XrBz3iD0&feature=youtu.be">as in this video</a>.
8187
</p>
8288
<p>
8389
<strong>Nov 2017</strong>
8490
Open Rails trialled <a href="http://www.monogame.net/">with Monogame instead of XNA</a> uses less RAM and give higher frame rates.
8591
</p>
86-
<p>
87-
<strong>Feb 2017</strong>
88-
3D cabs available commercially -
89-
<a href="https://www.youtube.com/watch?v=EiccxSAIEe0&feature=em-subs_digest">see video</a>.
90-
</p>
9192
</div>
9293
<div class="col-md-4 divider">
9394
<div class="heading">
@@ -139,6 +140,9 @@
139140
#modal2 .user-existing > .user-content {
140141
background-color: rgb(45, 94, 139);
141142
}
143+
#modal2 .user-existing2 > .user-content {
144+
background-color: rgb(118, 45, 139);
145+
}
142146
#modal2 .user-content {
143147
padding: 1px 20px 20px;
144148
}
@@ -184,6 +188,15 @@
184188
<a href="http://www.trainsimulations.net/ORTS_starter_pack.html"><img src="landing_page_ts.png"></a>
185189
</div>
186190
</div>
191+
<!-- <div class="user-existing2 col-md-6">
192+
<div class="user-content">
193+
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
194+
<h1>Already using Open Rails?</h1>
195+
<h1>Try the <strong><a href="http://www.siskurail.org" title="The Central Oregon and Pacific Railroad operates between Northern California and Eugene, Oregon, USA.">Siskiyou Route</a></strong></h1>
196+
<p>This extensive route, created by Dale Rickert, has over 300 miles of mainline track passing through 31 cities and comes with nearly 150 locos and 350 wagons.</p>
197+
<a href="http://www.siskurail.org" title="The Central Oregon and Pacific Railroad operates between Northern California and Eugene, Oregon, USA."><img src="landing_page_dr.png"></a>
198+
</div>
199+
</div>-->
187200
</div><!-- End of Modal content -->
188201
</div><!-- End of Modal dialog -->
189202
</div><!-- End of Modal -->

landing_page_dr.png

801 KB
Loading

share/community/index.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
</p><p>
3838
These boards have forums and files dedicated to Open Rails:</p>
3939
<ul>
40-
<li><a href="http://www.elvastower.com" target="_blank">Elvas Tower</a> - International and American</li>
40+
<li><a href="http://www.elvastower.com" target="_blank" title="(Open Rails forums are public, others require membership.)">Elvas Tower</a> - International and American</li>
4141
<li><a href="http://www.trainsim.com" target="_blank">TrainSim</a> - International and American</li>
4242
<li><a href="http://www.railpage.com.au" target="_blank">Rail Page</a> - Australian</li>
4343
<li><a href="http://forums.railvictoria.net/viewforum.php?f=48" target="_blank">Rail Victoria Forums</a> - Australian</li>
@@ -54,7 +54,7 @@
5454
<li><a href="http://www.activitysimulatorworld.net" target="_blank">Activity Simulator World</a> - French</li>
5555
<li><a href="http://www.ir-msts.in" target="_blank">IR MSTS</a> - Indian</li>
5656
<li><a href="http://www.trainsimhobby.net/forum" target="_blank">TrainSimHobby</a> - Italian</li>
57-
<li><a href="http://www.msts.fora.pl" target="_blank">Polish MSTS Forum</a> - Polish</li>
57+
<li><a href="https://www.facebook.com/groups/589816824813670" target="_blank">Open Rails Facebook Group</a> - Polish</li>
5858
<li><a href="http://www.spaintrainzrutas.com" target="_blank">Spain Trainz Rutas</a> - Spanish</li>
5959
</ul>
6060
<p>&nbsp;</p>

trade/index.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@
3434
These vendors sell or create products suitable for Open Rails:
3535
</p>
3636
<ul>
37+
<li><a href="http://www.trainsimulations.net/">TrainSimulations</a> - Canada</li>
38+
<li><a href="http://pikku.msts.cz/openrails.html">Pikku Locomotive Works</a> - Czechoslovakia</li>
39+
<li><a href="http://broadgaugeproduction.irts.in/">Broad Gauge Productions</a> - India</li>
3740
<li><a href="http://www.3dtrains.com" target="_blank">3DTrains</a> - USA</li>
38-
<li><a href="http://www.conbuilder.com" target="_blank">ConBuilder</a> - Utility Suite</li>
3941
<li><a href="http://dekosoft.com/trains">Dekosoft Trains</a> - USA</li>
40-
<li><a href="http://pikku.msts.cz/openrails.html">Pikku Locomotive Works</a> - Czechoslovakia</li>
41-
<li><a href="http://www.trainsimulations.net/">TrainSimulations</a> - Canada</li>
4242
<li><a href="http://www.gabriele90.com/">Gabriele 90</a> - Italy</li>
43-
<li><a href="http://broadgaugeproduction.com/">Broad Gauge Productions</a> - India</li>
43+
<li><a href="http://www.conbuilder.com" target="_blank">ConBuilder</a> - Utility Suite</li>
4444
</ul>
4545
<p>&nbsp;</p>
4646
<h2>Vendors Supporting MSTS</h2>

0 commit comments

Comments
 (0)