Skip to content

Commit e49e757

Browse files
committed
Automatic merge of T1.5.1-1718-gda57f73bd and 16 pull requests
- Pull request #570 at f11a428: glTF 2.0 support with PBR lighting - Pull request #900 at 4629736: DMI in 3D cab + two more dials - Pull request #1030 at d3ae4a2: Refactor settings, in prep for settings exporter - Pull request #1052 at 3b5cb90: Content Manager: Add axle count, and lowest derail force - Pull request #1062 at bbc0013: Train Forces popup Window. - Pull request #1064 at cb510d6: Add Train Info tab to Help window (F1) - Pull request #1066 at 62c89c1: Log derailment, using TraceInformation. - Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH - Pull request #1000 at d8d9709: Locomotive operation from control car - Pull request #1049 at 6a0c471: Re-organise document storage and access - Pull request #1057 at 254b6d4: Switchable brake system - Pull request #1069 at 3f153f0: Mouse wheel control only with Alt – Followup for #1051 - Pull request #1070 at f818e40: Fix a NullReferenceException in TCS scripts - Pull request #1071 at 722dd3f: Change cover image for v1.6 - Pull request #1074 at e9a66c1: Gradient - commit 2024-16-12 - Pull request #1076 at d1ff8fd: Allow depart early
18 parents feb126c + da57f73 + f11a428 + 4629736 + d3ae4a2 + 3b5cb90 + bbc0013 + cb510d6 + 62c89c1 + 1f5ba4c + d8d9709 + 6a0c471 + 254b6d4 + 3f153f0 + f818e40 + 722dd3f + e9a66c1 + d1ff8fd commit e49e757

File tree

3 files changed

+278
-2
lines changed

3 files changed

+278
-2
lines changed
373 Bytes
Loading

Source/RunActivity/RunActivity.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,9 @@
567567
<Content Include="Content\TrackMonitorImages.png">
568568
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
569569
</Content>
570-
<Content Include="Content\TrainOperationsCoupler.png">
570+
<Content Include="Content\TrainInfoSprites.png">
571+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
572+
</Content> <Content Include="Content\TrainOperationsCoupler.png">
571573
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
572574
</Content>
573575
<Content Include="Content\TrainOperations\TrainOperationsMap.png">

0 commit comments

Comments
 (0)