Skip to content

Commit 9018080

Browse files
committed
Automatic merge of T1.6-rc7-43-ge3d1d75f9 and 15 pull requests
- Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc) - Pull request #1091 at 2e06f85: Automatic speed control - Pull request #1104 at 87cdd9f: Handle simple adhesion within the axle module - 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 #1130 at 8ae6bb7: Fix F9 points to an incorrect car ID. - Pull request #1143 at 84f72b8: Status in Work Orders popup set too fast - Pull request #1151 at 5e59187: fix: Do not allow non-ACE/DDS textures in content - Pull request #1152 at 66dfd09: fix: Clean up multiple issues with data logger - Pull request #1153 at d2f2a02: Fix TrItems in track viewer (events were over-writing mileposts) - Pull request #1082 at 5845a1a: Allow variable water level in glass gauge - Pull request #1081 at 689494b: Brake cuts power unification - Pull request #1124 at fab5457: Built-in PBL2 brake controller - Pull request #1128 at 1d7643d: Particle Emitter Overhaul
17 parents 0442a1a + e3d1d75 + e10390b + 2e06f85 + 87cdd9f + 270f22f + ba3c47f + 91d2d26 + 8ae6bb7 + 84f72b8 + 5e59187 + 66dfd09 + d2f2a02 + 5845a1a + 689494b + fab5457 + 1d7643d commit 9018080

File tree

3 files changed

+6
-0
lines changed

3 files changed

+6
-0
lines changed
5.33 MB
Binary file not shown.
1.33 MB
Binary file not shown.

Source/RunActivity/RunActivity.csproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@
5151
<Content Include="Content\Clouds01.png">
5252
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
5353
</Content>
54+
<Content Include="Content\dieselsmoke.dds">
55+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
56+
</Content>
5457
<Content Include="Content\ETCS\ETCS_DMI_symbols_credit.txt">
5558
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
5659
</Content>
@@ -519,6 +522,9 @@
519522
<Content Include="Content\SkyDome1.png">
520523
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
521524
</Content>
525+
<Content Include="Content\smokemain.dds">
526+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
527+
</Content>
522528
<Content Include="Content\Snowflake.png">
523529
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
524530
</Content>

0 commit comments

Comments
 (0)