Skip to content

Commit 69d50a8

Browse files
committed
Automatic merge of T1.5.1-799-gb02a6e5d3 and 15 pull requests
- Pull request #570 at 3539862: Experimental glTF 2.0 support with PBR lighting - Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters - Pull request #876 at f92de76: docs: add source for documents previously on website to source Documentation folder - Pull request #882 at b554363: Blueprint/train car operations UI window - Pull request #885 at 8f94333: feat: Add notifications to Menu - Pull request #886 at 6c0785b: Scene viewer extension to TrackViewer - Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH - Pull request #896 at 5866028: First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains - Pull request #897 at 42f1dd9: feat: Improved system information collection - Pull request #899 at a0a37ac: Duplex steam engines - Booster Engine addition - Pull request #903 at 0d6d045: Downloading route content (Github, zip) - Pull request #907 at 9b0b04f: Bug fix for https://bugs.launchpad.net/or/+bug/2047300 Dynamic tracks disappear after long tunnel - Pull request #908 at 4b4afe3: feat: supports switching adhesion precisions - Pull request #911 at 6834af0: docs: Add refactoring as a special type of PR - Pull request #912 at 9a12fbe: New Triple Valve Features Vol. 2
17 parents f7e31c1 + b02a6e5 + 3539862 + d00beb9 + f92de76 + b554363 + 8f94333 + 6c0785b + 1f5ba4c + 5866028 + 42f1dd9 + a0a37ac + 0d6d045 + 9b0b04f + 4b4afe3 + 6834af0 + 9a12fbe commit 69d50a8

File tree

3 files changed

+223
-27
lines changed

3 files changed

+223
-27
lines changed

Source/Documentation/Manual/physics.rst

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3106,6 +3106,7 @@ MaxAuxilaryChargingRate and EmergencyResChargingRate.
31063106
single: ORTSEmergencyValveActuationRate
31073107
single: ORTSEmergencyDumpValveRate
31083108
single: ORTSEmergencyDumpValveTimer
3109+
single: ORTSEmergencyQuickAction
31093110
single: ORTSEmergencyResQuickRelease
31103111
single: ORTSMainResPipeAuxResCharging
31113112
single: ORTSBrakeRelayValveRatio
@@ -3114,8 +3115,15 @@ MaxAuxilaryChargingRate and EmergencyResChargingRate.
31143115
single: ORTSBrakeRelayValveReleaseRate
31153116
single: ORTSMaxTripleValveCylinderPressure
31163117
single: ORTSMaxServiceCylinderPressure
3118+
single: ORTSMaxServiceApplicationRate
3119+
single: ORTSTwoStageLowPressure
3120+
single: ORTSTwoStageIncreasingSpeed
3121+
single: ORTSTwoStageDecreasingSpeed
3122+
single: ORTSHighSpeedReducingPressure
31173123
single: ORTSUniformChargingThreshold
31183124
single: ORTSUniformChargingRatio
3125+
single: ORTSUniformReleaseThreshold
3126+
single: ORTSUniformReleaseRatio
31193127
single: ORTSQuickServiceLimit
31203128
single: ORTSQuickServiceApplicationRate
31213129
single: ORTSQuickServiceVentRate
@@ -3159,9 +3167,12 @@ MaxAuxilaryChargingRate and EmergencyResChargingRate.
31593167
- ``Wagon(ORTSEmergencyDumpValveTimer`` -- Timer for emergency dump valve to close
31603168
after it is activated. If set to 0, it will close as soon as BP is discharged.
31613169
Default value will prevent BP from being charged for 2 minutes.
3170+
- ``Wagon(ORTSEmergencyQuickAction`` -- If set to 1, air from the brake pipe will
3171+
be sent to the brake cylinder at MaxApplicationRate during emergency applications.
3172+
Speeds up emergency application along the entire train. (default 0)
31623173
- ``Wagon(ORTSEmergencyResQuickRelease`` -- Set to 1 (default 0) to enable quick release,
31633174
in which emergency reservoir air is used to increase the brake pipe pressure
3164-
during release. Remains active until brake cylinder pressure drops below 5 psi.
3175+
during release. Remains active until aux res has recharged.
31653176
- ``Wagon(ORTSMainResPipeAuxResCharging`` -- Boolean value that indicates,
31663177
for twin pipe systems, if the main reservoir pipe is used for charging the auxiliary
31673178
reservoirs. If set to false, the main reservoir pipe will not be used
@@ -3185,12 +3196,32 @@ MaxAuxilaryChargingRate and EmergencyResChargingRate.
31853196
- ``Wagon(ORTSMaxServiceCylinderPressure`` -- Sets the maximum cylinder pressure
31863197
demanded during service applications. During emergency applications,
31873198
brake cylinder pressure is instead limited by ``ORTSMaxTripleValveCylinderPressure``.
3199+
- ``Wagon(ORTSMaxServiceApplicationRate`` -- Sets the maximum application rate
3200+
allowed during service applications. For emergency applications, the application
3201+
rate will be limited by ``MaxApplicationRate``.
3202+
- ``Wagon(ORTSTwoStageLowPressure`` -- For two stage braking systems where brake force
3203+
is reduced at lower speeds and increased at higher speeds, sets the maximum cylinder
3204+
pressure demanded when at slower speeds (defaults to 0, disabling two stage braking).
3205+
For high speed, use ``ORTSMaxTripleValveCylinderPressure`` to set the pressure limit.
3206+
- ``Wagon(ORTSTwoStageIncreasingSpeed`` -- The speed at which the two stage braking
3207+
system changes from low pressure to high pressure during acceleration.
3208+
- ``Wagon(ORTSTwoStageDecreasingSpeed`` -- The speed at which the two stage braking
3209+
system changes from high pressure to low pressure during deceleration.
3210+
- ``Wagon(ORTSHighSpeedReducingPressure`` -- If the demanded brake cylinder pressure
3211+
exceeds this value, the brakes will gradually release to this pressure. Simulates
3212+
the high speed reducing valve (HSRV). (default 0 for wagons with no HSRV)
31883213
- ``Wagon(ORTSUniformChargingThreshold`` -- The pressure difference between the brake
31893214
pipe and auxiliary reservoir at which uniform charging activates during release
31903215
(default 3 psi), usually used to reduce the rate of auxiliary reservoir charging.
31913216
- ``Wagon(ORTSUniformChargingRatio`` -- Factor used to divide auxiliary reservoir
31923217
charging rate by when uniform charging is active. Eg: setting of 2 will halve
31933218
charging rate while uniform charging is active (defaults to 0, disabling the feature).
3219+
- ``Wagon(ORTSUniformReleaseThreshold`` -- The pressure difference between the brake
3220+
pipe and auxiliary reservoir at which uniform release activates during release
3221+
(default 3 psi), usually used to reduce the rate of brake cylinder release.
3222+
- ``Wagon(ORTSUniformReleaseRatio`` -- Factor used to divide brake cylinder
3223+
release rate by when uniform release is active. Eg: setting of 2 will halve
3224+
release rate while uniform release is active (defaults to 0, disabling the feature).
31943225
- ``Wagon(ORTSQuickServiceLimit`` -- Quick service activates when triple valve
31953226
initially changes from release to apply, and will remain active until brake
31963227
cylinder pressure reaches the pressure specified here (default 0,

0 commit comments

Comments
 (0)