Skip to content

Commit

Permalink
Automatic merge of T1.5-rc1-80-gf4212d3c4 and 12 pull requests
Browse files Browse the repository at this point in the history
- Pull request #570 at 824f96f: Experimental glTF 2.0 support with PBR lighting
- Pull request #630 at 704731a: Sky Color Fix (Addresses Trello Roadmap Card #367 for More accurate sunrise and sunset)
- Pull request #652 at 918fdb1: Add button functions to Raildriver
- Pull request #677 at c1c417f: Correct double heading bug
- Pull request #692 at 20de7da: Italian translation for OR 1.5
- Pull request #699 at 6baf43d: Bug fix for https://bugs.launchpad.net/or/+bug/1987453. Web: HUD/Force Information, some labels not visible.
- Pull request #706 at 265d33d: Extended door functionality
- Pull request #712 at 68cd8ab: Search for NORMAL signals if no argument is provided
- Pull request #713 at 6c8701f: https://blueprints.launchpad.net/or/+spec/cruise-control 
- Pull request #715 at 447143b: Bug fix for //bugs.launchpad.net/or/+bug/1990930 Default snow terrtex not appearing
- Pull request #722 at fb9079e: Fix Windows Forms deprecations in ActivityEditor
- Pull request #726 at d812554: Correctly initialize triple valve for EP trains
  • Loading branch information
openrails-bot committed Oct 10, 2022
14 parents c19faf8 + f4212d3 + 824f96f + 704731a + 918fdb1 + c1c417f + 20de7da + 6baf43d + 265d33d + 68cd8ab + 6c8701f + 447143b + fb9079e + d812554 commit cd2b2c9
Showing 1 changed file with 1 addition and 1 deletion.
Expand Up @@ -329,7 +329,7 @@ public override void Initialize(bool handbrakeOn, float maxPressurePSI, float fu
ControlResPressurePSI = maxPressurePSI;
FullServPressurePSI = fullServPressurePSI;
AutoCylPressurePSI = immediateRelease ? 0 : Math.Min((maxPressurePSI - BrakeLine1PressurePSI) * AuxCylVolumeRatio, MaxCylPressurePSI);
AuxResPressurePSI = TwoPipes ? maxPressurePSI : Math.Max(maxPressurePSI - AutoCylPressurePSI / AuxCylVolumeRatio, BrakeLine1PressurePSI);
AuxResPressurePSI = Math.Max(TwoPipes ? maxPressurePSI : maxPressurePSI - AutoCylPressurePSI / AuxCylVolumeRatio, BrakeLine1PressurePSI);
if ((Car as MSTSWagon).EmergencyReservoirPresent)
EmergResPressurePSI = Math.Max(AuxResPressurePSI, maxPressurePSI);
TripleValveState = AutoCylPressurePSI < 1 ? ValveState.Release : ValveState.Lap;
Expand Down

0 comments on commit cd2b2c9

Please sign in to comment.