Skip to content

Commit 07b3d5a

Browse files
committed
Automatic merge of T1.6-89-ga2a9bbcc8 and 13 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 e813c42: 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 #1082 at 5845a1a: Allow variable water level in glass gauge - Pull request #1128 at 1d7643d: Particle Emitter Overhaul - Pull request #1160 at 21e55c8: Route Based TTrack Sounds
15 parents 85e1cfb + a2a9bbc + f46d5f2 + d8d61eb + e813c42 + 270f22f + ba3c47f + 91d2d26 + e241a0d + 39cd994 + 48c9a63 + 6cfe4e2 + 5845a1a + 1d7643d + 21e55c8 commit 07b3d5a

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

Source/Orts.Formats.Msts/SoundManagmentFile.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
using System.Diagnostics;
2222
using System.Linq;
2323
using System.Text;
24+
using Orts.Formats.Msts;
2425
using Orts.Parsers.Msts;
2526

2627
namespace Orts.Formats.Msts

Source/RunActivity/Viewer3D/Sound.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,19 +40,20 @@
4040
//#define DEBUGSCR
4141

4242
using System;
43+
using System.Collections.Generic;
44+
using System.Diagnostics;
45+
using System.IO;
46+
using System.Linq;
4347
using Orts.Common;
4448
using Orts.Formats.Msts;
4549
using Orts.Simulation;
4650
using Orts.Simulation.AIs;
4751
using Orts.Simulation.Physics;
4852
using Orts.Simulation.RollingStocks;
4953
using Orts.Simulation.Signalling;
54+
using Orts.Viewer3D;
5055
using ORTS.Common;
5156
using ORTS.Settings;
52-
using System.Collections.Generic;
53-
using System.Diagnostics;
54-
using System.IO;
55-
using System.Linq;
5657
using Event = Orts.Common.Event;
5758
using Events = Orts.Common.Events;
5859

0 commit comments

Comments
 (0)