Skip to content

Commit c258b50

Browse files
committed
Automatic merge of T1.6-89-ga2a9bbcc8 and 14 pull requests
- Pull request #1156 at f46d5f2: Fix incorrectly disabled options in train operations window - Pull request #1086 at d8d61eb: Add Settings Exporter tool (copy settings to INI, etc) - Pull request #1091 at 492795a: Automatic speed control - Pull request #1115 at 270f22f: Do not activate ETS switch if no suitable cars are attached - Pull request #1120 at ba3c47f: Automatically Calculate Friction Values if Missing - Pull request #1121 at 91d2d26: Manually Override Articulation - Pull request #1124 at e241a0d: Built-in PBL2 brake controller - Pull request #1157 at 39cd994: Dynamic brake authorization by TCS - Pull request #1159 at 48c9a63: Skip OR warnings about TSRE-specific token Ruler - Pull request #1161 at 6cfe4e2: Fix string trim in .ini files - Pull request #1162 at 2516cce: specifies precedence of DDS over ACE - Pull request #1082 at 5845a1a: Allow variable water level in glass gauge - Pull request #1128 at 1d7643d: Particle Emitter Overhaul - Pull request #1160 at c45a926: Route Based TTrack Sounds
16 parents c8450f0 + a2a9bbc + f46d5f2 + d8d61eb + 492795a + 270f22f + ba3c47f + 91d2d26 + e241a0d + 39cd994 + 48c9a63 + 6cfe4e2 + 2516cce + 5845a1a + 1d7643d + c45a926 commit c258b50

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

Source/Documentation/Manual/features-route.rst

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -715,11 +715,10 @@ In the ``.trk`` file of the route the parameter ``loadingscreen`` can be used as
715715

716716
LoadingScreen ( Load.ace )
717717

718-
If in the main directory of the route there is a file with the same name but with extension ``.dds``
719-
and the :ref:`DDS texture support<options-dds-textures>` is enabled
718+
A DDS extension takes precedence over ACE so, if
719+
in the main directory of the route there is a file with the same name but with extension ``.dds``,
720720
the latter is displayed instead of that with ``.ace`` extension.
721-
If the parameter is omitted then the file ``load.ace`` is loaded (as in MSTS) or ``load.dds``
722-
(if present and, again, the dds support is enabled).
721+
If the filename parameter is omitted then the file ``load.ace`` is loaded (as in MSTS) or ``load.dds`` if present.
723722

724723
The loading screen image can have any resolution and aspect ratio; it will be displayed letter-boxed
725724
on the screen keeping the aspect ratio.

Source/Documentation/Manual/software-platform.rst

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,5 +227,16 @@ Note: To avoid overloading the simulator, please keep API calls to once or twice
227227
- | ``Orts.Viewer3D.WebServices .WebServer.ORTSApiController .ApiSampleData``
228228

229229

230+
.. _dds-and-ace:
230231

232+
DDS and ACE Texture Files
233+
=========================
234+
235+
Open Rails prefers DDS over ACE texture files, but is tolerant where these don't match references in other files.
236+
237+
If a texture file is referenced with no extension, then ``.dds`` is added, searched for and loaded.
238+
If not found, then ``.ace`` is added, searched for and loaded.
239+
240+
If a texture file is referenced with either a ``dds`` or ``ace`` extension, then that is searched for and loaded
241+
but, if not found, then the other extension is substituted, searched for and loaded.
231242

0 commit comments

Comments
 (0)