Merge branch 'openrails:master' into creation_automation

Author: SteelFill

Source/Contrib/TimetableEditor/about.lfm

@@ -38,7 +38,7 @@ object Form2: TForm2
     Width = 97
     Alignment = taCenter
     AutoSize = True
-    Caption = 'Version: 1.5.1'
+    Caption = 'Version: 1.6'
     Font.CharSet = ANSI_CHARSET
     Font.Height = -16
     Font.Name = 'Arial'

Source/Contrib/TimetableEditor/about.lrt

@@ -1,5 +1,5 @@
 TFORM2.CAPTION=about
 TFORM2.BUTTON1.CAPTION=close
 TFORM2.LABEL1.CAPTION=Timetable Editor
-TFORM2.STATICTEXT1.CAPTION=Version: 1.5.1
+TFORM2.STATICTEXT1.CAPTION=Version: 1.6
 TFORM2.LABEL2.CAPTION=Open Rails

Source/Contrib/TimetableEditor/languages/contrib.timetableeditor.de.po

@@ -197,7 +197,7 @@ msgid "Open Rails"
 msgstr ""
 
 #: tform2.statictext1.caption
-msgid "Version: 1.5"
+msgid "Version: 1.6"
 msgstr ""
 
 #: tform3.bitbtn2.caption

Source/Contrib/TimetableEditor/languages/contrib.timetableeditor.po

@@ -187,7 +187,7 @@ msgid "Open Rails"
 msgstr ""
 
 #: tform2.statictext1.caption
-msgid "Version: 1.5"
+msgid "Version: 1.6"
 msgstr ""
 
 #: tform3.bitbtn2.caption

Source/Contrib/TimetableEditor/languages/contrib.timetableeditor.ru.po

@@ -197,8 +197,8 @@ msgid "Open Rails"
 msgstr "Open Rails"
 
 #: tform2.statictext1.caption
-msgid "Version: 1.5"
-msgstr "Версия: 1.5"
+msgid "Version: 1.6"
+msgstr "Версия: 1.6"
 
 #: tform3.bitbtn2.caption
 msgctxt "TFORM3.BITBTN2.CAPTION"

Source/Documentation/Manual/driving.rst

@@ -573,8 +573,8 @@ A switch shown in green can be operated, a switch shown in red is locked.
 
 .. _driving-train-operations:
 
-F9 Train Operations Monitor
----------------------------
+Ctrl-Alt-F9 Train Operations Monitor
+------------------------------------
 
 The Open Rails Train Operations window is similar in function to the F9 
 window in MSTS, but includes additional features to control the air brake 
@@ -655,10 +655,10 @@ uncoupling can also be found :ref:`here <driving-hud-brake>`.
 
 .. _train-operations-monitor:
 
-Ctrl-Alt-F9 Train Operations Monitor
-------------------------------------
+F9 Train Car Operations Monitor
+---------------------------
 
-This Open Rails Train Operations window has a vertical view of the entire train:
+This Train Operations window provides a vertical view of the entire train:
 
 .. image:: images/TrainCarOperations-01.png
   :align: center
@@ -669,15 +669,15 @@ This Open Rails Train Operations window has a vertical view of the entire train:
 This window shows the whole train in vertical mode. Any car can be selected by clicking on the Car ID. 
 Two arrows will then appear pointing to the selected car.
 
-By clicking on the selected CarId the "Train Operations Viewer" window will be displayed:
+By clicking on the selected Car Id the "Train Operations Viewer" window will be displayed:
 
 .. image:: images/TrainOperationsViewer-02.png
   :align: center
   :scale: 100%
 
 |
 
-From the "Train Operations Viewer" window, we can set all the available systems, as in the “Car Operation menu”:
+From the "Train Operations Viewer" window, we can set all the available systems, as in the “Car Operation Menu”:
 
 - FrontBrakeHose
 - FrontAngleCock
@@ -710,7 +710,7 @@ Any changes made in this window will also appear in the "Train Car Operations" w
 
 |
 
-After a change in the braking system that keeps the train stopped, the CarID changes to a cyan colour. 
+After a change in the braking system that keeps the train stopped, the Car ID changes to a cyan colour. 
 In this way, it is easy for the user, to find out which car is stopping the train.
 
 A click on the right arrow hides all non-system brake symbols, inside the "Train Car Operations" window:
@@ -730,10 +730,10 @@ To make the text bold, click the left arrow:
 |
 
 While the "Train Operations Viewer" window is visible, we can modify the "Train Car Operations" window, 
-but if we open the "Train Operations" window <F9> and click on any CarID, the "Car Operation Menu" will 
-appear and it will point to the previously selected CarID in the "Train Operations Viewer" window.
+but if we open the "Train Operations" window <Alt+Shift+F9> and click on any Car ID, the "Car Operation Menu" will 
+appear and it will point to the Car ID which was previously selected in the "Train Operations Viewer" window.
 The "Car Operations Menu" is updated from the "Train Operations Viewer" window.
-A click on the CarID in the “Train Operations Viewer” will close the window.
+A click on the Car ID in the “Train Operations Viewer” will close the window.
 
 If the train is very long and not all the cars are displayed in the "Train Car Operations" window, we can scroll by clicking on the white down arrow (vertical scroll bar) at the bottom right.
 Once the required car has been selected, it will remain visible on the last row:
@@ -1200,8 +1200,9 @@ of the train that is approaching. In this image, signal 462 is showing an APPROA
 
 .. image:: images/timetable_tab4.png
 
-The adjustment for "Daylight offset (hrs)" is provided for convenience to advance the sun as it moves 
+An adjustment for "Daylight offset (hrs)" is provided for convenience to advance the sun as it moves 
 across the sky so that night time trains can be more easily observed in daylight.
+Use ``<Alt+Shift+=>`` to increase the offset and ``<Alt+Shift+->`` to decrease it.
 
 Additional Train Operation Commands
 ===================================

Source/Documentation/Manual/physics.rst

@@ -3190,7 +3190,7 @@ Brake Shoe Force - This is the current change being implemented. The following c
 
 ``ORTSBrakeShoeType`` - this defines a number of different brake shoe types and curves. To provide a more realistic representation of the braking force the default CoF curves are 2D, ie 
 they are impacted by both the speed and Brake Shoe Force.  Typically ``ORTSBrakeShoeType`` will have one of the following keywords included - 
-``Cast_Iron_P6`` - older cast iron brake shoes, 2D as above, ``Cast_Iron_P10`` - newer cast iron brake shoes with increased phosphorous, 2D as above, ``Hi_Friction_Composite`` 
+``Cast_Iron_P6`` - older cast iron brake shoes, 2D as above, ``Cast_Iron_P10`` - newer cast iron brake shoes with increased phosphorous, 2D as above, ``High_Friction_Composite`` 
 - high friction composite shoe, 2D as above, ``Disc_Pads`` - brakes with disc pads, 2D as above, ``User_Defined`` - is a user defined curve 
 using the ORTSBrakeShoeFriction parameter, 1D (ie, speed only, see above section for the parameter format).
 
@@ -3387,6 +3387,8 @@ the following parameters will adjust the behaviour of air brakes:
 .. index::
    single: DynamicBrakeHasAutoBailOff
    single: ORTSDynamicBrakesHasPartialBailOff
+   single: ORTSDynamicBlendingRetainedPressure
+   single: ORTSDynamicBlendingMinimumSpeed
    single: ORTSTrainDynamicBlendingTable
    single: ORTSDynamicBrakeReplacementWithEngineBrake 
    single: ORTSDynamicBrakeReplacementWithEngineBrakeAtSpeed
@@ -3397,6 +3399,13 @@ the following parameters will adjust the behaviour of air brakes:
   air brakes are released while dynamic brakes satisfy the train brake demand.
   If dynamic braking is not sufficient, air brakes will be partially applied
   so the combination air+dynamic provides the required brake demand.
+- ``Engine(ORTSDynamicBlendingRetainedPressure`` -- Sets the brake cylinder
+  pressure which, when used in combination with ORTSDynamicBrakesHasPartialBailOff,
+  will remain applied regardless of the blended dynamic brake force. This
+  pressure is also the minimum pressure at which the blended braking system will activate.
+- ``Engine(ORTSDynamicBlendingMinimumSpeed`` -- Below the specified speed
+  (default units mph, default value 5 mph / 8 kph), local dynamic brake blending
+  will be disabled, allowing locomotive brakes to hold the train while stopped.
 
 Sometimes the train brake controller is capable to apply the dynamic
 brakes for the whole consist, usually as a first step before air brakes

Source/Documentation/Manual/software-platform.rst

@@ -159,7 +159,7 @@ If you choose to develop your own pages, please consider sharing them with the O
 
 .. image:: images/switch-panel.png
 
-- The Train Car Operations page has the same functionality as the :ref:`Ctrl-Alt-F9 Train Operations Monitor <train-operations-monitor>`.
+- The Train Car Operations page has the same functionality as the :ref:`F9 Train Operations Monitor <train-operations-monitor>`.
   Advantage of having this windows as a web page is that it can be shown outside the Open Rails main window.
   Even on another display like for instance a tablet. It has more or less the same functionality, more details
   to be found :ref:`here <train-operations-monitor>`.

Source/Documentation/Manual/timetable.rst

@@ -1149,7 +1149,7 @@ junction somewhere beyond that station.
         This function will return 'true' if approaching train is to stop at the request stop in order to set down
         passengers, otherwise it returns 'false'.
         Using this function, the state of the signal can be set as required. The signal can be visualized as an
-        actual signal, but also, for instance, a passenger figure can be animated to be visual on the plaƞorm
+        actual signal, but also, for instance, a passenger figure can be animated to be visual on the platform
         if the train is to stop, and otherwise not be visual.
 
         Apart from this function, the signal must set two variables :
@@ -1201,7 +1201,7 @@ junction somewhere beyond that station.
                     A 'spoiler' indication which shows if the stop is required to set down or pick up, can be shown if the
                     Next Station Window is displayed (normally using key F10), by pressing keys ALT+F10.
 
-                    When ALT+F10 is pressed, and the next station is a request stop, a line is displayed at the boƩom of
+                    When ALT+F10 is pressed, and the next station is a request stop, a line is displayed at the bottom of
                     the window showing if stop is required or not.
 
                     NOTE : this spoiler function is not yet available and will be included later.

Source/Installer/Version.iss

@@ -1 +1 @@
-#define MyAppVersion "1.5"
+#define MyAppVersion "none"