Skip to content

Commit

Permalink
Automatic merge of X1.3.1-189-gab83b4ca9 and 6 pull requests
Browse files Browse the repository at this point in the history
- Pull request #40 at e81861b: Monogame upgrade
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #216 at 927a49c: Upgrade and replace web server with EmbedIO
- Pull request #225 at bb67fb6: Fix advanced adhesion wheelslip upon resuming from save: https://bugs.launchpad.net/or/+bug/1294410
- Pull request #226 at a3a8b86: EmbedIO web server graphical track monitor
- Pull request #228 at 4343221: adds links to OR on Elvas Tower
  • Loading branch information
openrails-bot committed Jul 6, 2020
8 parents e6c1017 + ab83b4c + e81861b + 7d9f14b + 927a49c + bb67fb6 + a3a8b86 + 4343221 commit ec48e0e
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 6 deletions.
23 changes: 18 additions & 5 deletions Website/openrails.org/discover/project-team/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,25 @@
<h1>Discover > Project Team</h1>
</div>
</div>
<div class="row">
<div class="col-md-3"></div>
<div class="col-md-6">
<h2>Meeting the Team</h2>
<p>
The Project Team meets on <a href="http://www.elvastower.com">the Elvas Tower bulletin board</a> where Dave Nelson has encouraged us from the very beginning.
He provides <a href="http://www.elvastower.com/forums/index.php?/forum/190-open-rails-simulator-project/">hosting for our public discussions</a> and private threads so, although we hang out on other boards too, this is the one to follow.
</p>
</div>
</div>
<div class="row">
<div class="col-md-3"></div>
<div class="col-md-6">
<h2>Roles and Focus</h2>
<p>
<h2>Roles and Focus</h2>
<p>
Most of the team has a focus even if we help out with several roles. Here is the currently active team but it's difficult to keep track of everyone, so please get in touch if your name is missing or you would like it removed.
</p><p>
</p><p>
(The names listed are those used on <a href="http://www.elvastower.com">the Elvas Tower forum</a>.)
</p>
</p>
</div>
</div>
<div class="row">
Expand Down Expand Up @@ -53,8 +63,11 @@
<table>
<tr><td>JTang</td></tr>
<tr><td>Matej Pacha</td></tr>
<tr><td>Rob Roeterdink (roeter)</td></tr>
<tr><td>Mauricio (mbm_OR)</td></tr>
<tr><td>PerpetualKid</td></tr>
<tr><td>rdamurphy</td></tr>
<tr><td>Rob Roeterdink (roeter)</td></tr>
<tr><td>Ryan Young (YoRyan)</td></tr>
<tr><td>steamer_ctn</td></tr>
<tr><td>Stefan PAITONI</td></tr>
<tr><td>wacampbell</td></tr>
Expand Down
2 changes: 1 addition & 1 deletion Website/openrails.org/share/community/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
</p><p>
These boards have forums and files dedicated to Open Rails:</p>
<ul>
<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>
<li><a href="http://www.elvastower.com" target="_blank" title="(Open Rails forums are public, others require membership.)">Elvas Tower</a> - International and American and <br/>also the <a href="http://www.elvastower.com/forums/index.php?/forum/190-open-rails-simulator-project/">home of the Open Rails Project Team</a></li>
<li><a href="http://www.trainsim.com" target="_blank">TrainSim</a> - International and American</li>
<li><a href="http://www.railpage.com.au" target="_blank">Rail Page</a> - Australian</li>
<li><a href="http://forums.railvictoria.net/viewforum.php?f=48" target="_blank">Rail Victoria Forums</a> - Australian</li>
Expand Down

0 comments on commit ec48e0e

Please sign in to comment.