Skip to content

Commit

Permalink
Automatic merge of T1.5.1-158-g6e55f9cf4 and 14 pull requests
Browse files Browse the repository at this point in the history
- Pull request #706 at 91bcfa2: Extended door functionality
- Pull request #719 at 13a1638: Upgraded to MonoGame 3.8.0 (+ small update for other libraries)
- Pull request #722 at fb9079e: Fix Windows Forms deprecations in ActivityEditor
- Pull request #732 at aac9b67: Improvements for air brakes
- Pull request #735 at b9a0ea3: Added new parameter for battery switch
- Pull request #746 at b6acfde: Website release 1.5.1
- Pull request #748 at 4f0e878: latitude/longitude fix for bug 1393111
- Pull request #749 at db5764c: OpenRailway Map
- Pull request #753 at ab8fe32: Extends CabControls for user input
- Pull request #754 at 70a1325: Container weights: https://blueprints.launchpad.net/or/+spec/container-weights
- Pull request #758 at 00005ce: Steam wheel slip#1
- Pull request #759 at 3c84439: fix: Improve sky dome distortion causing bug #1471416
- Pull request #760 at 113dd63: Updated EditorConfig with .NET and StyleCop analyzer configuration
- Pull request #761 at f6a3aca: fix: Allow 100% cloud-free skys by making 0% overcast = 0% clouds
  • Loading branch information
openrails-bot committed Jan 5, 2023
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
Expand Up @@ -1811,7 +1811,7 @@ public override void PrepareFrame(RenderFrame frame, ElapsedTime elapsedTime)
if (!IsPowered && Control.ValueIfDisabled != null)
Num = (float)Control.ValueIfDisabled;
else
Num = Locomotive.GetDataOf(Control);
Num = Locomotive.GetDataOf(Control);

if (Gauge.Orientation == 0) // gauge horizontal
{
Expand Down Expand Up @@ -2996,7 +2996,7 @@ public override void PrepareFrame(RenderFrame frame, ElapsedTime elapsedTime)
if (!IsPowered && Control.ValueIfDisabled != null)
Num = (float)Control.ValueIfDisabled;
else
Num = Locomotive.GetDataOf(Control);
Num = Locomotive.GetDataOf(Control);

if (digital.MinValue < digital.MaxValue) Num = MathHelper.Clamp(Num, (float)digital.MinValue, (float)digital.MaxValue);
if (Math.Abs(Num) < digital.AccuracySwitch)
Expand Down Expand Up @@ -3082,7 +3082,7 @@ public string GetDigits(out Color DrawColor)
if (!IsPowered && Control.ValueIfDisabled != null)
Num = (float)Control.ValueIfDisabled;
else
Num = Locomotive.GetDataOf(Control);
Num = Locomotive.GetDataOf(Control);

if (Math.Abs(Num) < digital.AccuracySwitch)
Format = Format2;
Expand Down Expand Up @@ -3160,7 +3160,7 @@ public string GetDigits(out Color DrawColor)
if (!IsPowered && Control.ValueIfDisabled != null)
Num = (float)Control.ValueIfDisabled;
else
Num = Locomotive.GetDataOf(Control);
Num = Locomotive.GetDataOf(Control);

if (digital.MinValue < digital.MaxValue) Num = MathHelper.Clamp(Num, (float)digital.MinValue, (float)digital.MaxValue);
if (Math.Abs(Num) < digital.AccuracySwitch)
Expand Down Expand Up @@ -3438,7 +3438,7 @@ public override void PrepareFrame(RenderFrame frame, ElapsedTime elapsedTime)
{
var doShow = true;
if (LocoViewer.ThreeDimentionCabRenderer.ControlMap.TryGetValue(p.Key, out var cabRenderer))
{
{
if (!cabRenderer.IsPowered && cabRenderer.Control.HideIfDisabled)
{
doShow = false;
Expand Down

0 comments on commit 93a8261

Please sign in to comment.