Project Summary

Author: Open Rails Team

Language: C#

License: GPL-3.0-only

Browse: Builds, Log, Triage, Documentation, Repository

Last automatic build: U2025.10.16-1622 2025-10-16 17:28:23

Build status:

Last changed: 2025-10-15 20:02:30

git clone https://git.launchpad.net/or

Silver's Simple Site - Projects - Open Rails

Open Rails is a train simulator that supports the world's largest range of digital content. Accurate behaviour for steam, diesel and electric traction including trains with multiple locos. Signals which correctly protect the train and permit complex timetabled operations. Multi-user mode in which any timetabled train can be driven in person or by computer.


Preview

Open Rails Code Bot started at 2025-10-16 22:22:24Z
GitHub organisation: openrails
GitHub team:         development-team
GitHub repository:   openrails
GitHub base branch:  master
GitHub merge branch: unstable
Team members (18):
 Sharpe49
 twpol
 cjakeman
 pzgulyas
 YoRyan
 perpetualKid
 strawberryfield
 cesarBLG
 peternewell
 Csantucci
 Roeterdink
 wjcurrey
 Looky1173
 markus-GE
 mbm-OR
 SteelFill
 sweiland-openrails
 rwf-rr
Open pull requests (26):
 #57 Ensure that build fails when tests fail to run
   By:     twpol
   Branch: bugfix/net4-test-runner
   Draft:  True
   Labels: not-for-unstable infrastructure
   Allowed to auto-merge? False
 #527 Brake cuts power refactor and new parameters
   By:     Sharpe49
   Branch: brake-cuts-power-refactor
   Draft:  False
   Labels: enhancement not-for-unstable
   Allowed to auto-merge? False
 #541 Initial Virtual File System development
   By:     pzgulyas
   Branch: ziparchive
   Draft:  True
   Labels: enhancement not-for-unstable
   Allowed to auto-merge? False
 #570 glTF 2.0 support with PBR lighting
   By:     pzgulyas
   Branch: gltf2
   Draft:  False
   Labels: enhancement
   Allowed to auto-merge? True
 #800 Changes to migrate from Launchpad Bugs to GitHub Issues
   By:     cjakeman
   Branch: migrate-bugtracker
   Draft:  False
   Labels: website documentation not-for-unstable infrastructure
   Allowed to auto-merge? False
 #884 build: Additional settings for dotnet build
   By:     twpol
   Branch: feature/dotnet-build
   Draft:  True
   Labels: not-for-unstable infrastructure
   Allowed to auto-merge? False
 #886 Scene viewer extension to TrackViewer
   By:     pzgulyas
   Branch: tv3d-m
   Draft:  True
   Labels: enhancement not-for-unstable
   Allowed to auto-merge? False
 #1013 Tools for reverse engineering shape and ace files (converting)
   By:     Hirek193
   Branch: master
   Draft:  False
   Labels:
   Allowed to auto-merge? False
 #1057 Switchable brake system
   By:     pzgulyas
   Branch: gpr
   Draft:  False
   Labels: enhancement
   Allowed to auto-merge? True
 #1081 Brake cuts power unification
   By:     cesarBLG
   Branch: brake-cuts-power
   Draft:  True
   Labels: enhancement question
   Allowed to auto-merge? True
 #1082 Allow variable water level in glass gauge
   By:     peternewell
   Branch: water_gauge#1
   Draft:  False
   Labels: enhancement for-unstable
   Allowed to auto-merge? True
 #1091 Automatic speed control
   By:     cesarBLG
   Branch: cruise-control-review
   Draft:  False
   Labels: enhancement
   Allowed to auto-merge? True
 #1122 Wagon Size and Centering Controls
   By:     SteelFill
   Branch: size_centering
   Draft:  False
   Labels: enhancement
   Allowed to auto-merge? True
 #1124 Built-in PBL2 brake controller
   By:     cesarBLG
   Branch: pbl2
   Draft:  False
   Labels: enhancement
   Allowed to auto-merge? True
 #1126 ShapeHierarchy Attachment for More Wagon Addons
   By:     SteelFill
   Branch: shape_hierarchy
   Draft:  False
   Labels: enhancement
   Allowed to auto-merge? True
 #1127 Advanced Shape Descriptor Controls
   By:     SteelFill
   Branch: shape_descriptor_features
   Draft:  True
   Labels: enhancement
   Allowed to auto-merge? True
 #1128 Particle Emitter Overhaul
   By:     SteelFill
   Branch: particle_emitter_overhaul
   Draft:  False
   Labels: enhancement refactoring
   Allowed to auto-merge? True
 #1130 Fix F9 points to an incorrect car ID.
   By:     mbm-OR
   Branch: bugfix/Fix-F9-CarId-bug
   Draft:  False
   Labels: bug
   Allowed to auto-merge? True
 #1156 Fix incorrectly disabled options in train operations window
   By:     cesarBLG
   Branch: control-operations-enable
   Draft:  False
   Labels: bug for-unstable
   Allowed to auto-merge? True
 #1157 Dynamic brake authorization by TCS
   By:     cesarBLG
   Branch: dynamic-brake-authorization
   Draft:  False
   Labels: enhancement
   Allowed to auto-merge? True
 #1158 Temporary fix for bug 2121985: F9 TCO out-of-range after resume
   By:     rwf-rr
   Branch: bugfix-f9-index-out-of-range-on-resume
   Draft:  False
   Labels:
   Allowed to auto-merge? True
 #1159 Skip OR warnings about TSRE-specific token Ruler
   By:     Csantucci
   Branch: skip-ruler-warnings
   Draft:  False
   Labels: enhancement
   Allowed to auto-merge? True
 #1163 Fix: Crash when using Camera 8 and F9.
   By:     mbm-OR
   Branch: bugfix/Fix-camera8-F9-crash
   Draft:  False
   Labels: bug
   Allowed to auto-merge? True
 #1164 Fix: F9 crashes with a front coupled single steam locomotive by Csantucci.
   By:     mbm-OR
   Branch: bugfix/Fix-F9-crashes-front-coupler
   Draft:  False
   Labels: bug
   Allowed to auto-merge? True
 #1166 Simplify loading of internal and game textures
   By:     twpol
   Branch: feature/texture-file-format-separation
   Draft:  False
   Labels: refactoring
   Allowed to auto-merge? True
 #1167 Fix: RunActivity slow to terminate because of long sleep in Host Process
   By:     rwf-rr
   Branch: bugfix-runactivity-slow-exit
   Draft:  False
   Labels:
   Allowed to auto-merge? True
Pull requests suitable for auto-merging (19):
 #1082 Allow variable water level in glass gauge
 #1156 Fix incorrectly disabled options in train operations window
 #570 glTF 2.0 support with PBR lighting
 #1057 Switchable brake system
 #1091 Automatic speed control
 #1122 Wagon Size and Centering Controls
 #1124 Built-in PBL2 brake controller
 #1126 ShapeHierarchy Attachment for More Wagon Addons
 #1128 Particle Emitter Overhaul
 #1130 Fix F9 points to an incorrect car ID.
 #1157 Dynamic brake authorization by TCS
 #1158 Temporary fix for bug 2121985: F9 TCO out-of-range after resume
 #1159 Skip OR warnings about TSRE-specific token Ruler
 #1163 Fix: Crash when using Camera 8 and F9.
 #1164 Fix: F9 crashes with a front coupled single steam locomotive by Csantucci.
 #1166 Simplify loading of internal and game textures
 #1167 Fix: RunActivity slow to terminate because of long sleep in Host Process
 #1081 Brake cuts power unification
 #1127 Advanced Shape Descriptor Controls
Preparing repository...
 > git --no-pager config remove-section remote.origin
 > git --no-pager remote add origin --mirror=fetch git@github.com:openrails/openrails.git
 > git --no-pager fetch --update-head-ok
 > git --no-pager reset --hard
 < HEAD is now at e87500817 Automatic merge of T1.6-139-g6b62c2a7d and 12 pull requests
 > git --no-pager clean --force -d -x
 > git --no-pager checkout --quiet --detach 6b62c2a7d898c8cf4e5f1731c10ac23e6435f41c
Merging #1082 Allow variable water level in glass gauge...
 Source/Documentation/Manual/physics.rst +19 -0
 Source/Orts.Formats.Msts/CabViewFile.cs +1 -0
 Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs +264 -161
 > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 853817063c5ba4369b671eff52ece9288936f320
 < Auto-merging Source/Documentation/Manual/physics.rst
 < Auto-merging Source/Orts.Formats.Msts/CabViewFile.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs
Merging #1156 Fix incorrectly disabled options in train operations window...
 Source/Orts.Simulation/Common/Scripting/PowerSupply/ControlCarPowerSupply.cs +1 -0
 Source/Orts.Simulation/Common/Scripting/PowerSupply/DieselPowerSupply.cs +21 -1
 Source/Orts.Simulation/Common/Scripting/PowerSupply/ElectricPowerSupply.cs +28 -0
 Source/Orts.Simulation/Common/Scripting/PowerSupply/LocomotivePowerSupply.cs +14 -0
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/ILocomotivePowerSupply.cs +2 -0
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/LocomotivePowerSupply.cs +2 -0
 Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs +28 -76
 Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs +38 -99
 > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change f46d5f27f12f1f92bc56822cab600026f7212c02
 < Auto-merging Source/Orts.Simulation/Common/Scripting/PowerSupply/LocomotivePowerSupply.cs
Merging #570 glTF 2.0 support with PBR lighting...
 Source/3rdPartyLibs/glTFLoader/Build_Instructions.txt +10 -0
 Source/3rdPartyLibs/glTFLoader/animation.channel.target.schema.json +40 -0
 Source/3rdPartyLibs/glTFLoader/extras.schema.json +13 -0
 Source/ORTS.Common/ConsistGenerator.cs +198 -0
 Source/Orts.Formats.Msts/ConsistFile.cs +11 -0
 Source/Orts.Settings/UserSettings.cs +4 -0
 Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs +7 -0
 Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs +3 -1
 Source/Orts.Simulation/Simulation/RollingStocks/RollingStock.cs +4 -1
 Source/Orts.Simulation/Simulation/Simulator.cs +2 -2
 Source/RunActivity/Content/EnvMapDay/images.txt +3 -0
 Source/RunActivity/Content/SceneryShader.fx +814 -197
 Source/RunActivity/Content/ShadowMap.fx +146 -10
 Source/RunActivity/RunActivity.csproj +27 -0
 Source/RunActivity/Viewer3D/AnimatedPart.cs +57 -21
 Source/RunActivity/Viewer3D/Cameras.cs +24 -0
 Source/RunActivity/Viewer3D/Forest.cs +1 -1
 Source/RunActivity/Viewer3D/GltfShape.cs +2,073 -0
 Source/RunActivity/Viewer3D/Lights.cs +83 -36
 Source/RunActivity/Viewer3D/Materials.cs +434 -85
 Source/RunActivity/Viewer3D/Processes/RenderProcess.cs +5 -0
 Source/RunActivity/Viewer3D/RenderFrame.cs +194 -7
 Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs +1 -2
 Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs +50 -53
 Source/RunActivity/Viewer3D/Shaders.cs +165 -28
 Source/RunActivity/Viewer3D/Shapes.cs +141 -39
 Source/RunActivity/Viewer3D/Terrain.cs +3 -3
 Source/RunActivity/Viewer3D/Transfers.cs +1 -2
 Source/RunActivity/Viewer3D/Water.cs +2 -3
 > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 362e4e7900dc521f5e7a4868a382f03052b39a39
 < Auto-merging Source/Orts.Settings/UserSettings.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs
 < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs
 < Auto-merging Source/Orts.Simulation/Simulation/Simulator.cs
 < Auto-merging Source/RunActivity/RunActivity.csproj
 < Auto-merging Source/RunActivity/Viewer3D/AnimatedPart.cs
 < Auto-merging Source/RunActivity/Viewer3D/Cameras.cs
 < Auto-merging Source/RunActivity/Viewer3D/Lights.cs
 < Auto-merging Source/RunActivity/Viewer3D/Materials.cs
 < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
 < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs
 < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs
 < Auto-merging Source/RunActivity/Viewer3D/Shapes.cs
 < Automatic merge failed; fix conflicts and then commit the result.
 > git --no-pager reset --hard
 < HEAD is now at 5600e4ad0 Merge commit 'f46d5f27f12f1f92bc56822cab600026f7212c02' into HEAD
 > git --no-pager clean --force -d -x
 Error: git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 362e4e7900dc521f5e7a4868a382f03052b39a39 failed: 1
Merging #1057 Switchable brake system...
 Source/Documentation/Manual/physics.rst +70 -2
 Source/Orts.Common/Conversions.cs +1 -1
 Source/Orts.Parsers.Msts/STFReader.cs +2 -3
 Source/Orts.Simulation/Simulation/AIs/AITrain.cs +1 -0
 Source/Orts.Simulation/Simulation/Physics/Train.cs +40 -25
 Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs +435 -647
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/BrakeSystem.cs +76 -1
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs +236 -100
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/EPBrakeSystem.cs +4 -5
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/MSTSBrakeSystem.cs +0 -11
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/ManualBraking.cs +5 -4
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/SMEBrakeSystem.cs +3 -2
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/SingleTransferPipe.cs +10 -15
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/StraightVacuumSinglePipe.cs +6 -5
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/VacuumSinglePipe.cs +73 -16
 Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs +12 -5
 Source/Orts.Simulation/Simulation/Simulator.cs +4 -4
 Source/RunActivity/Viewer3D/Popups/CarOperationsWindow.cs +3 -3
 Source/RunActivity/Viewer3D/Popups/HUDWindow.cs +17 -5
 Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs +4 -4
 Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs +63 -3
 Source/RunActivity/Viewer3D/WebServices/SwitchPanel/SwitchOnPanelDefinition.cs +1 -1
 Source/RunActivity/Viewer3D/WebServices/SwitchPanel/SwitchOnPanelStatus.cs +1 -1
 Source/RunActivity/Viewer3D/WebServices/TrainCarOperationsWebpage.cs +12 -12
 > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 1c2bcb497b4d6f482b32486bd0d3e7ddda74f920
 < Auto-merging Source/Documentation/Manual/physics.rst
 < Auto-merging Source/Orts.Common/Conversions.cs
 < Auto-merging Source/Orts.Parsers.Msts/STFReader.cs
 < Auto-merging Source/Orts.Simulation/Simulation/Physics/Train.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs
 < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/ManualBraking.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/SingleTransferPipe.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/StraightVacuumSinglePipe.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/VacuumSinglePipe.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
 < Auto-merging Source/RunActivity/Viewer3D/Popups/HUDWindow.cs
 < Auto-merging Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs
 < Auto-merging Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs
 < Auto-merging Source/RunActivity/Viewer3D/WebServices/TrainCarOperationsWebpage.cs
 < Automatic merge failed; fix conflicts and then commit the result.
 > git --no-pager reset --hard
 < HEAD is now at 5600e4ad0 Merge commit 'f46d5f27f12f1f92bc56822cab600026f7212c02' into HEAD
 > git --no-pager clean --force -d -x
 Error: git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 1c2bcb497b4d6f482b32486bd0d3e7ddda74f920 failed: 1
Merging #1091 Automatic speed control...
 Source/Documentation/Manual/cruisecontrol.rst +79 -33
 Source/Orts.Common/AccelerationController.cs +105 -0
 Source/Orts.Simulation/Common/Scripting/BrakeController.cs +2 -2
 Source/Orts.Simulation/Common/Scripting/TrainControlSystem.cs +30 -0
 Source/Orts.Simulation/Simulation/Confirmer.cs +1 -1
 Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs +52 -289
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs +1 -1
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/EPBrakeSystem.cs +1 -1
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/BrakeController.cs +9 -0
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/MSTSBrakeController.cs +25 -17
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/MultiPositionController.cs +6 -4
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/CruiseControl.cs +654 -659
 Source/RunActivity/Viewer3D/Popups/TrainDrivingWindow.cs +1 -1
 Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs +32 -74
 > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 492795a4d30f0fee09d4e2e5a3b3d50d73ec6004
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/CruiseControl.cs
Merging #1122 Wagon Size and Centering Controls...
 Source/Documentation/Manual/features-rollingstock.rst +94 -0
 Source/Orts.Formats.Msts/ShapeFile.cs +94 -0
 Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs +179 -8
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/FreightAnimations.cs +7 -0
 Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs +4 -0
 > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 73c47b4cfe5aa601dadcd6f40d9b2f71b6e4644d
Merging #1124 Built-in PBL2 brake controller...
 Source/Documentation/Manual/features-rollingstock.rst +9 -2
 Source/Orts.Formats.Msts/CabViewFile.cs +2 -0
 Source/Orts.Simulation/Common/Commands.cs +22 -3
 Source/Orts.Simulation/Common/Scripting/BrakeController.cs +10 -0
 Source/Orts.Simulation/Simulation/Confirmer.cs +2 -0
 Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs +10 -0
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/BrakeController.cs +26 -1
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/PBL2BrakeController.cs +465 -0
 Source/Orts.Simulation/Simulation/Simulator.cs +1 -0
 Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs +3 -0
 > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change e241a0d1226220a09811b6882077c9eb77657a92
 < Auto-merging Source/Documentation/Manual/features-rollingstock.rst
 < Auto-merging Source/Orts.Formats.Msts/CabViewFile.cs
 < Auto-merging Source/Orts.Simulation/Common/Scripting/BrakeController.cs
 < Auto-merging Source/Orts.Simulation/Simulation/Confirmer.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/BrakeController.cs
 < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
Merging #1126 ShapeHierarchy Attachment for More Wagon Addons...
 Source/Documentation/Manual/cabs.rst +72 -17
 Source/Documentation/Manual/features-rollingstock.rst +244 -142
 Source/Documentation/Manual/physics.rst +17 -1
 Source/Documentation/Manual/sound.rst +133 -0
 Source/Orts.Formats.Msts/CabViewFile.cs +4 -0
 Source/Orts.Formats.Msts/LightCollection.cs +2 -0
 Source/Orts.Formats.Msts/SoundManagmentFile.cs +7 -2
 Source/Orts.Formats.OR/ContainerFile.cs +1 -1
 Source/Orts.Simulation/Simulation/Container.cs +1 -1
 Source/Orts.Simulation/Simulation/RollingStocks/Coupling/AnimatedAirHose.cs +1 -1
 Source/Orts.Simulation/Simulation/RollingStocks/Coupling/AnimatedCoupler.cs +1 -1
 Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs +13 -2
 Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs +31 -20
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/FreightAnimations.cs +70 -33
 Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs +8 -2
 Source/RunActivity/Viewer3D/ALSoundHelper.cs +0 -6
 Source/RunActivity/Viewer3D/AnimatedPart.cs +2 -7
 Source/RunActivity/Viewer3D/Cameras.cs +98 -23
 Source/RunActivity/Viewer3D/Lights.cs +12 -33
 Source/RunActivity/Viewer3D/ParticleEmitter.cs +50 -7
 Source/RunActivity/Viewer3D/RollingStock/MSTSElectricLocomotiveViewer.cs +0 -1
 Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs +90 -44
 Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs +179 -130
 Source/RunActivity/Viewer3D/RollingStock/SubSystems/FreightAnimationsViewer.cs +39 -7
 Source/RunActivity/Viewer3D/RollingStock/TrainCarViewer.cs +3 -41
 Source/RunActivity/Viewer3D/Shapes.cs +61 -13
 Source/RunActivity/Viewer3D/Sound.cs +103 -15
 Source/RunActivity/Viewer3D/Viewer.cs +13 -8
 > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change b9f492e7aa1adce2c7f41c6ea85994ac49db5701
 < Auto-merging Source/Documentation/Manual/features-rollingstock.rst
 < Auto-merging Source/Documentation/Manual/physics.rst
 < Auto-merging Source/Orts.Formats.Msts/CabViewFile.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/FreightAnimations.cs
 < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/FreightAnimations.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
 < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
 < Automatic merge failed; fix conflicts and then commit the result.
 > git --no-pager reset --hard
 < HEAD is now at d8583c77c Merge commit 'e241a0d1226220a09811b6882077c9eb77657a92' into HEAD
 > git --no-pager clean --force -d -x
 Error: git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change b9f492e7aa1adce2c7f41c6ea85994ac49db5701 failed: 1
Merging #1128 Particle Emitter Overhaul...
 Source/Documentation/Manual/physics.rst +217 -10
 Source/Orts.Simulation/MultiPlayer/Message.cs +14 -12
 Source/Orts.Simulation/Simulation/RollingStocks/MSTSDieselLocomotive.cs +4 -1
 Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs +62 -117
 Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs +131 -52
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselEngine.cs +2 -4
 Source/RunActivity/Content/ParticleEmitterShader.fx +44 -21
 Source/RunActivity/RunActivity.csproj +6 -0
 Source/RunActivity/Viewer3D/ParticleEmitter.cs +434 -137
 Source/RunActivity/Viewer3D/RollingStock/MSTSDieselLocomotiveViewer.cs +3 -5
 Source/RunActivity/Viewer3D/RollingStock/MSTSSteamLocomotiveViewer.cs +44 -40
 Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs +14 -14
 Source/RunActivity/Viewer3D/Shaders.cs +7 -0
 > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change d116396bfbd7affd5d2a240e647e6d45cfeae171
 < Auto-merging Source/Documentation/Manual/physics.rst
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSDieselLocomotive.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs
 < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs
Merging #1130 Fix F9 points to an incorrect car ID....
 Source/Orts.Simulation/Simulation/Simulator.cs +3 -2
 Source/RunActivity/Viewer3D/Cameras.cs +82 -11
 Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs +118 -117
 Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs +109 -102
 Source/RunActivity/Viewer3D/Viewer.cs +8 -0
 Source/RunActivity/Viewer3D/WebServices/TrainCarOperationsWebpage.cs +41 -19
 > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 0f4342d3f03f61c8ecdc9b39195e1df500533845
 < Auto-merging Source/Orts.Simulation/Simulation/Simulator.cs
 < Auto-merging Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs
 < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs
 < Auto-merging Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs
 < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs
 < Auto-merging Source/RunActivity/Viewer3D/Viewer.cs
 < Automatic merge failed; fix conflicts and then commit the result.
 > git --no-pager reset --hard
 < HEAD is now at 2059b0c22 Merge commit 'd116396bfbd7affd5d2a240e647e6d45cfeae171' into HEAD
 > git --no-pager clean --force -d -x
 Error: git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 0f4342d3f03f61c8ecdc9b39195e1df500533845 failed: 1
Merging #1157 Dynamic brake authorization by TCS...
 Source/Documentation/Manual/physics.rst +3 -1
 Source/Orts.Simulation/Common/Scripting/TrainControlSystem.cs +12 -0
 Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs +4 -1
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs +9 -10
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/TrainControlSystem.cs +5 -0
 Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs +15 -0
 > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 39cd994e185106a3e2e8da6912643c3620d53c39
 < Auto-merging Source/Documentation/Manual/physics.rst
 < Auto-merging Source/Orts.Simulation/Common/Scripting/TrainControlSystem.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/TrainControlSystem.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
Merging #1158 Temporary fix for bug 2121985: F9 TCO out-of-range after resume...
 Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs +7 -0
 Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs +14 -0
 Source/RunActivity/Viewer3D/WebServices/TrainCarOperationsWebpage.cs +6 -0
 > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change c45cb3a9273c543d441312e508b7dd5af9654410
 < Auto-merging Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs
 < Auto-merging Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs
 < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs
 < Auto-merging Source/RunActivity/Viewer3D/WebServices/TrainCarOperationsWebpage.cs
 < Automatic merge failed; fix conflicts and then commit the result.
 > git --no-pager reset --hard
 < HEAD is now at 766febd5e Merge commit '39cd994e185106a3e2e8da6912643c3620d53c39' into HEAD
 > git --no-pager clean --force -d -x
 Error: git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change c45cb3a9273c543d441312e508b7dd5af9654410 failed: 1
Merging #1159 Skip OR warnings about TSRE-specific token Ruler...
 Source/Orts.Formats.Msts/WorldFile.cs +1 -0
 Source/Orts.Parsers.Msts/TokenID.cs +3 -0
 > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 48c9a630f7028ed1302060047261ba8fbaa2c020
Merging #1163 Fix: Crash when using Camera 8 and F9....
 Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs +2 -2
 > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 2f9e292dd82f71db979ac9770418824eb8ae7795
 < Auto-merging Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs
Merging #1164 Fix: F9 crashes with a front coupled single steam locomotive by Csantucci....
 Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs +6 -2
 Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs +6 -2
 > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 1ad9889f75996c7271d7f5ac65512a77906580b0
 < Auto-merging Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs
 < Auto-merging Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs
Merging #1166 Simplify loading of internal and game textures...
 Source/Contrib/TrackViewer/Drawing/BasicShapes.cs +1 -1
 Source/Documentation/Manual/features-route.rst +1 -1
 Source/RunActivity/RunActivity.csproj +0 -3
 Source/RunActivity/Viewer3D/Lights.cs +1 -1
 Source/RunActivity/Viewer3D/MSTSSky.cs +4 -4
 Source/RunActivity/Viewer3D/Materials.cs +123 -180
 Source/RunActivity/Viewer3D/Popups/HelpWindow.cs +1 -1
 Source/RunActivity/Viewer3D/Popups/SwitchWindow.cs +1 -1
 Source/RunActivity/Viewer3D/Popups/TrackMonitorWindow.cs +2 -2
 Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs +53 -53
 Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs +48 -48
 Source/RunActivity/Viewer3D/Popups/TrainForcesWindow.cs +1 -1
 Source/RunActivity/Viewer3D/Popups/TrainOperationsWindow.cs +1 -1
 Source/RunActivity/Viewer3D/Popups/WindowManager.cs +2 -2
 Source/RunActivity/Viewer3D/Precipitation.cs +3 -3
 Source/RunActivity/Viewer3D/Processes/GameStateRunActivity.cs +1 -1
 Source/RunActivity/Viewer3D/RollingStock/SubSystems/ETCS/DriverMachineInterface.cs +1 -1
 Source/RunActivity/Viewer3D/Shaders.cs +1 -1
 Source/RunActivity/Viewer3D/Signals.cs +1 -1
 Source/RunActivity/Viewer3D/Sky.cs +6 -6
 > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 51e7f7aaf38d57b2070079ecd35be706ce4ce8a2
 < Auto-merging Source/RunActivity/RunActivity.csproj
 < Auto-merging Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs
 < Auto-merging Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs
 < Auto-merging Source/RunActivity/Viewer3D/Shaders.cs
Merging #1167 Fix: RunActivity slow to terminate because of long sleep in Host Process...
 Source/RunActivity/Viewer3D/Processes/HostProcess.cs +11 -4
 > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 115325f943b57ec701c92bf62c7232520a505998
Merging #1081 Brake cuts power unification...
 Source/Documentation/Manual/physics.rst +7 -3
 Source/Orts.Simulation/Common/Scripting/TrainControlSystem.cs +7 -2
 Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs +3 -4
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs +14 -0
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/VacuumSinglePipe.cs +3 -9
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/TrainControlSystem.cs +3 -3
 > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 689494b6b368013f482453a41bb0c82c0bbe6ed9
 < Auto-merging Source/Documentation/Manual/physics.rst
 < CONFLICT (content): Merge conflict in Source/Documentation/Manual/physics.rst
 < Auto-merging Source/Orts.Simulation/Common/Scripting/TrainControlSystem.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/VacuumSinglePipe.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/TrainControlSystem.cs
 < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/TrainControlSystem.cs
 < Automatic merge failed; fix conflicts and then commit the result.
 > git --no-pager reset --hard
 < HEAD is now at 20bc85b44 Merge commit '115325f943b57ec701c92bf62c7232520a505998' into HEAD
 > git --no-pager clean --force -d -x
 Error: git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 689494b6b368013f482453a41bb0c82c0bbe6ed9 failed: 1
Merging #1127 Advanced Shape Descriptor Controls...
 Source/Documentation/Manual/features-rollingstock.rst +326 -3
 Source/Documentation/Manual/options.rst +2 -0
 Source/Orts.Formats.Msts/ShapeDescriptorFile.cs +109 -3
 Source/Orts.Formats.OR/ContainerFile.cs +8 -2
 Source/Orts.Simulation/Simulation/Container.cs +6 -1
 Source/Orts.Simulation/Simulation/RollingStocks/Coupling/AnimatedAirHose.cs +2 -1
 Source/Orts.Simulation/Simulation/RollingStocks/Coupling/AnimatedCoupler.cs +2 -1
 Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs +18 -15
 Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs +113 -15
 Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/FreightAnimations.cs +29 -2
 Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs +2 -0
 Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs +1 -1
 Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs +53 -32
 Source/RunActivity/Viewer3D/RollingStock/SubSystems/ContainerViewer.cs +2 -2
 Source/RunActivity/Viewer3D/RollingStock/SubSystems/FreightAnimationsViewer.cs +1 -1
 Source/RunActivity/Viewer3D/Shapes.cs +353 -33
 > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change ec158ce32f2992633ab40d1340337b198104c611
 < Auto-merging Source/Documentation/Manual/features-rollingstock.rst
 < CONFLICT (content): Merge conflict in Source/Documentation/Manual/features-rollingstock.rst
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/FreightAnimations.cs
 < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/FreightAnimations.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
 < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
 < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs
 < Automatic merge failed; fix conflicts and then commit the result.
 > git --no-pager reset --hard
 < HEAD is now at 20bc85b44 Merge commit '115325f943b57ec701c92bf62c7232520a505998' into HEAD
 > git --no-pager clean --force -d -x
 Error: git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change ec158ce32f2992633ab40d1340337b198104c611 failed: 1
Pull requests successfully auto-merged (12):
 #1082 Allow variable water level in glass gauge
 #1156 Fix incorrectly disabled options in train operations window
 #1091 Automatic speed control
 #1122 Wagon Size and Centering Controls
 #1124 Built-in PBL2 brake controller
 #1128 Particle Emitter Overhaul
 #1157 Dynamic brake authorization by TCS
 #1159 Skip OR warnings about TSRE-specific token Ruler
 #1163 Fix: Crash when using Camera 8 and F9.
 #1164 Fix: F9 crashes with a front coupled single steam locomotive by Csantucci.
 #1166 Simplify loading of internal and game textures
 #1167 Fix: RunActivity slow to terminate because of long sleep in Host Process
Pull requests not auto-merged (7):
 #570 glTF 2.0 support with PBR lighting
 #1057 Switchable brake system
 #1126 ShapeHierarchy Attachment for More Wagon Addons
 #1130 Fix F9 points to an incorrect car ID.
 #1158 Temporary fix for bug 2121985: F9 TCO out-of-range after resume
 #1081 Brake cuts power unification
 #1127 Advanced Shape Descriptor Controls
No changes to push into merge branch
 > git --no-pager checkout --quiet unstable
Open Rails Code Bot finished at 2025-10-16 22:22:48Z

Continuous Integration graphs

Test results

Static analysis violations


Powered by the Content Parser System, copyright 2002 - 2025 James G. Ross.