Skip to content

Commit 1b2e07e

Browse files
committed
Automatic merge of T1.5.1-1852-g24537f48e and 10 pull requests
- Pull request #570 at 362e4e7: glTF 2.0 support with PBR lighting - Pull request #1062 at 9a76b26: Train Forces popup Window. - Pull request #1064 at 1be1fc4: Add Train Info tab to Help window (F1) - Pull request #1085 at 37e2817: updates key commands for Train Operations window and also Daylight Offset - Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc) - Pull request #1090 at 9e0bfe8: Add null check to avoid crash on corrupt signal files - Pull request #1092 at 7cc63cb: Adds $gradient, $req, depart-early and passing-time to Manual - Pull request #1082 at 5845a1a: Allow variable water level in glass gauge - Pull request #1081 at 689494b: Brake cuts power unification - Pull request #1091 at b0c622b: Automatic speed control
12 parents 72ff910 + 24537f4 + 362e4e7 + 9a76b26 + 1be1fc4 + 37e2817 + e10390b + 9e0bfe8 + 7cc63cb + 5845a1a + 689494b + b0c622b commit 1b2e07e

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

Source/Documentation/Manual/operation.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -614,7 +614,7 @@ AE in the .srv file as "Efficiency".
614614

615615
If the AI train makes station stops, its maxspeed depends from the "Performance"
616616
parameter for every route section, as can be seen and defined in the AI train
617-
timetable (that is maxspeed is the product of the first MAxVelocity parameter by
617+
timetable (that is maxspeed is the product of the first MaxVelocity parameter by
618618
the "Performance" parameter divided by 100).
619619

620620
Such performance parameter list is written (divided by 100) by the AE in
@@ -632,6 +632,8 @@ This corresponds to MSTS behaviour.
632632
Moreover the Efficiency parameter is used also to compute acceleration and
633633
braking curves.
634634

635+
.. _operation-speed:
636+
635637
Calculation of Train Speed Limit
636638
--------------------------------
637639

Source/Documentation/Manual/timetable.rst

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -428,6 +428,8 @@ Special Rows
428428
The #dispose row presently does not affect the end of the run for the player
429429
train.
430430

431+
.. _timetable-train-speed:
432+
431433
- ``#speed`` row
432434

433435
This optional field defines maximum speed for trains, which may restrict the
@@ -438,7 +440,7 @@ Special Rows
438440
If specified, only one ``#speed`` (m/s), ``#speedkph``, or ``#speedmph`` row
439441
can be present in a single timetable file.
440442

441-
This row also accepts a number of :ref:`speed commands <timetable-speed>`.
443+
This row also accepts a number of :ref:`speed commands <timetable-cmd-speed>`.
442444

443445
- ``#restartdelay`` row
444446

@@ -514,7 +516,7 @@ Gradient
514516
Syntax
515517
``$gradient /perc=n /speed=s``
516518

517-
The gradient command must be set in a ``#speed`` field of a train.
519+
The gradient command must be set in the ``#speed`` :ref:`field of a train <timetable-train-speed>`.
518520

519521
Functionality
520522
When gradient is set, forced acceleration is turned off if the leading engine of the train is on a
@@ -1395,7 +1397,7 @@ A typical value for modern stock for the ``$dec`` command is 2 or 3.
13951397
clear of the reverse position. This is useful when shunting in yards when
13961398
there is no need to fully exit the yard to reverse and the entry signal.
13971399

1398-
.. _timetable-speed:
1400+
.. _timetable-cmd-speed:
13991401

14001402
Speed Commands
14011403
''''''''''''''

0 commit comments

Comments
 (0)