C:\Program Files\dotnet\sdk\10.0.401\Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.EolTargetFrameworks.targets(32,5): warning NETSDK1138: The target framework 'net6.0' is out of support and will not receive security updates in the future. Please refer to https://aka.ms/dotnet-core-support for more information about the support policy. [P:\Jenkins\jobs\Open Rails Code Bot (Unstable)\workspace\Open Rails Code Bot.csproj]
C:\Program Files\dotnet\sdk\10.0.401\Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.EolTargetFrameworks.targets(32,5): warning NETSDK1138: The target framework 'net6.0' is out of support and will not receive security updates in the future. Please refer to https://aka.ms/dotnet-core-support for more information about the support policy. [P:\Jenkins\jobs\Open Rails Code Bot (Unstable)\workspace\Open Rails Code Bot.csproj]
C:\Program Files\dotnet\sdk\10.0.401\Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.EolTargetFrameworks.targets(32,5): warning NETSDK1138: The target framework 'net6.0' is out of support and will not receive security updates in the future. Please refer to https://aka.ms/dotnet-core-support for more information about the support policy. [P:\Jenkins\jobs\Open Rails Code Bot (Unstable)\workspace\Open Rails Code Bot.csproj]
Open Rails Code Bot started at 2026-10-10 09:22:41Z
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 (36):
#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 for-unstable
Allowed to auto-merge? True
#800 Changes to migrate from Launchpad Bugs to GitHub Issues
By: cjakeman
Branch: migrate-bugtracker
Draft: True
Labels: website documentation 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: enhancement
Allowed to auto-merge? False
#1057 Switchable brake system
By: pzgulyas
Branch: gpr
Draft: False
Labels: enhancement for-unstable
Allowed to auto-merge? True
#1081 Brake cuts power unification
By: cesarBLG
Branch: brake-cuts-power
Draft: False
Labels: enhancement
Allowed to auto-merge? True
#1091 Automatic speed control
By: cesarBLG
Branch: cruise-control-review
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: True
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 not-for-unstable
Allowed to auto-merge? False
#1186 Hot Reloading of Trains, Scenery, and Terrain
By: SteelFill
Branch: hot_reload
Draft: True
Labels: enhancement
Allowed to auto-merge? True
#1212 Add dynamic spotlight lighting system
By: Adhi-APLHA-mca
Branch: feature/dynamic-lighting-system
Draft: False
Labels: enhancement
Allowed to auto-merge? False
#1218 Partial bug fix for https://bugs.launchpad.net/or/+bug/2148806 Switch state isn't synced in multiplayer mode
By: Csantucci
Branch: mp-switch-sync
Draft: True
Labels: bug
Allowed to auto-merge? True
#1233 adds Log Motion Data to DataLogger
By: cjakeman
Branch: coupling-rod-drift
Draft: True
Labels: bug
Allowed to auto-merge? True
#1237 added Control Rectangles (Ctrl+F5) for 3d locomotives
By: sweiland-openrails
Branch: display_controls_3d
Draft: False
Labels: enhancement
Allowed to auto-merge? True
#1246 Support for higher-resolution terrain
By: twpol
Branch: feature/hi-res-terrain
Draft: True
Labels: enhancement
Allowed to auto-merge? True
#1251 MSTS legacy shaders
By: vitro-mod
Branch: msts-legacy-shaders
Draft: False
Labels: enhancement
Allowed to auto-merge? False
#1253 Russian localization update
By: myaroslav54
Branch: ru_local_update
Draft: False
Labels: locales
Allowed to auto-merge? False
#1254 Fix multiplayer server crash from concurrent access to onlinePlayers
By: edwar64896
Branch: fix/mpserver-thread-safe-onlineplayers
Draft: False
Labels: bug
Allowed to auto-merge? False
#1255 Validate table dimensions in InterpolatorDiesel2D
By: edwar64896
Branch: fix/interpolator-validate-table-dimensions
Draft: False
Labels: bug
Allowed to auto-merge? False
#1256 Parse degF values safely and culture-invariantly in STFReader
By: edwar64896
Branch: fix/stfreader-degf-tryparse
Draft: False
Labels: bug
Allowed to auto-merge? False
#1257 Report an empty timetable file instead of crashing
By: edwar64896
Branch: fix/timetablereader-empty-file
Draft: False
Labels: bug
Allowed to auto-merge? False
#1258 Replace Thread.Abort with cancellation in the route image fetch
By: edwar64896
Branch: fix/contentform-thread-abort
Draft: False
Labels: bug
Allowed to auto-merge? False
#1261 Correction for varying wind speed.
By: peternewell
Branch: WInd_Sounds#1
Draft: True
Labels: enhancement for-unstable
Allowed to auto-merge? True
#1263 Harmless Part of Particle Emitter Overhaul
By: SteelFill
Branch: particle_emitter_fixes
Draft: False
Labels: bug refactoring
Allowed to auto-merge? True
#1266 Steam Locomotive Steam Cylinder Exhaust Sounds
By: peternewell
Branch: Steam_Locomotive_Exhaust_Sounds
Draft: False
Labels: enhancement for-unstable
Allowed to auto-merge? True
#1268 Support full SIMIS token IDs
By: GokuMK
Branch: native-token-ids
Draft: False
Labels: refactoring for-unstable
Allowed to auto-merge? True
#1269 Expand procedural profiles for tracks, roads and line objects
By: GokuMK
Branch: procedural-shapes
Draft: True
Labels: enhancement for-unstable
Allowed to auto-merge? True
#1270 Procedural terrain materials
By: GokuMK
Branch: procedural-terrain-textures
Draft: True
Labels: enhancement for-unstable
Allowed to auto-merge? True
#1271 Fix SBRException.GetPosition() regression
By: cesarBLG
Branch: net6-loading-time
Draft: False
Labels: bug
Allowed to auto-merge? True
#1272 Wheelslip Refactor
By: SteelFill
Branch: wheelslip_protection
Draft: False
Labels: refactoring
Allowed to auto-merge? True
#1273 Flexible Connections: Hoses, Hooks and Couplers
By: NarrativaFerroviaria
Branch: feature/flexible-connections
Draft: False
Labels:
Allowed to auto-merge? False
Pull requests suitable for auto-merging (20) [(d) = draft, (i) = for-unstable]:
(i) #570 glTF 2.0 support with PBR lighting
(i) #1057 Switchable brake system
(i) #1266 Steam Locomotive Steam Cylinder Exhaust Sounds
(i) #1268 Support full SIMIS token IDs
#1081 Brake cuts power unification
#1091 Automatic speed control
#1124 Built-in PBL2 brake controller
#1237 added Control Rectangles (Ctrl+F5) for 3d locomotives
#1263 Harmless Part of Particle Emitter Overhaul
#1271 Fix SBRException.GetPosition() regression
#1272 Wheelslip Refactor
(d) (i) #1261 Correction for varying wind speed.
(d) (i) #1269 Expand procedural profiles for tracks, roads and line objects
(d) (i) #1270 Procedural terrain materials
(d) #1126 ShapeHierarchy Attachment for More Wagon Addons
(d) #1127 Advanced Shape Descriptor Controls
(d) #1186 Hot Reloading of Trains, Scenery, and Terrain
(d) #1218 Partial bug fix for https://bugs.launchpad.net/or/+bug/2148806 Switch state isn't synced in multiplayer mode
(d) #1233 adds Log Motion Data to DataLogger
(d) #1246 Support for higher-resolution terrain
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 0f2b17b35e Automatic merge of T1.6.1-506-g056ba09d37 and 15 pull requests
> git --no-pager clean --force -d -x
> git --no-pager checkout --quiet --detach 056ba09d3701948a2da4b23e65de0a0f102eb6d2
Merging #570 glTF 2.0 support with PBR lighting...
Program/Readme - this folder is intentionally empty.txt +0 -32
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/Contrib/TrackViewer/Drawing/BasicShapes.cs +1 -1
Source/Contrib/TrackViewer/Drawing/DrawTerrain.cs +1 -1
Source/Documentation/Manual/developing.rst +173 -0
Source/ORTS.Common/ConsistGenerator.cs +204 -0
Source/Orts.Formats.Msts/ConsistFile.cs +11 -0
Source/Orts.Settings/UserSettings.cs +2 -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/Orts.Simulation/Simulation/Turntables.cs +15 -15
Source/Orts.Simulation/Simulation/Weather.cs +25 -0
Source/RunActivity/Content/Bloom.fx +275 -0
Source/RunActivity/Content/EnvMap/cmft.bat +74 -0
Source/RunActivity/Content/SceneryShader.fx +1,096 -319
Source/RunActivity/Content/ShadowMap.fx +260 -44
Source/RunActivity/RunActivity.csproj +12 -0
Source/RunActivity/Viewer3D/AnimatedPart.cs +201 -82
Source/RunActivity/Viewer3D/Cameras.cs +50 -0
Source/RunActivity/Viewer3D/DDSLib.cs +508 -73
Source/RunActivity/Viewer3D/Forest.cs +18 -14
Source/RunActivity/Viewer3D/GltfShape.cs +2,190 -0
Source/RunActivity/Viewer3D/Lights.cs +116 -40
Source/RunActivity/Viewer3D/MSTSSky.cs +0 -3
Source/RunActivity/Viewer3D/Materials.cs +1,241 -225
Source/RunActivity/Viewer3D/ParticleEmitter.cs +8 -6
Source/RunActivity/Viewer3D/Popups/HUDWindow.cs +8 -6
Source/RunActivity/Viewer3D/Precipitation.cs +18 -13
Source/RunActivity/Viewer3D/Processes/GameStateRunActivity.cs +2 -2
Source/RunActivity/Viewer3D/Processes/RenderProcess.cs +5 -0
Source/RunActivity/Viewer3D/RenderFrame.cs +453 -192
Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs +49 -44
Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs +94 -78
Source/RunActivity/Viewer3D/RollingStock/SubSystems/DistributedPowerInterface.cs +8 -6
Source/RunActivity/Viewer3D/Scenery.cs +18 -5
Source/RunActivity/Viewer3D/Shaders.cs +288 -91
Source/RunActivity/Viewer3D/Shapes.cs +714 -886
Source/RunActivity/Viewer3D/Signals.cs +139 -160
Source/RunActivity/Viewer3D/Sky.cs +0 -5
Source/RunActivity/Viewer3D/SkyInterpolation.cs +2 -0
Source/RunActivity/Viewer3D/Terrain.cs +30 -13
Source/RunActivity/Viewer3D/Transfers.cs +17 -14
Source/RunActivity/Viewer3D/Viewer.cs +2 -2
Source/RunActivity/Viewer3D/Water.cs +21 -12
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change c78a2c0791b99b54cfd73f3ab0a9f4bc620fe6f7
< Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
< Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs
< Auto-merging Source/RunActivity/Viewer3D/Popups/HUDWindow.cs
< Auto-merging Source/RunActivity/Viewer3D/Processes/GameStateRunActivity.cs
< Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs
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/MSTSLocomotive.cs +62 -29
Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs +480 -685
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 +78 -21
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/BrakeController.cs +1 -0
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/TrainControlSystem.cs +6 -6
Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs +15 -6
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 261a0c5d7a8b6d638b8eaf1fd092a55e56fd6e71
< Auto-merging Source/Documentation/Manual/physics.rst
< Auto-merging Source/Orts.Common/Conversions.cs
< Auto-merging Source/Orts.Simulation/Simulation/Physics/Train.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/RollingStocks/TrainCar.cs
< Auto-merging Source/Orts.Simulation/Simulation/Simulator.cs
< Auto-merging Source/RunActivity/Viewer3D/Popups/HUDWindow.cs
< Auto-merging Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs
< Automatic merge failed; fix conflicts and then commit the result.
> git --no-pager reset --hard
< HEAD is now at 5d1f77d58d Merge commit 'c78a2c0791b99b54cfd73f3ab0a9f4bc620fe6f7' into HEAD
> git --no-pager clean --force -d -x
Error: git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 261a0c5d7a8b6d638b8eaf1fd092a55e56fd6e71 failed: 1
Merging #1266 Steam Locomotive Steam Cylinder Exhaust Sounds...
Source/Orts.Formats.Msts/SoundManagmentFile.cs +9 -1
Source/Orts.Simulation/Common/Events.cs +19 -0
Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs +9 -0
Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs +1 -0
Source/RunActivity/Viewer3D/Sound.cs +2 -0
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change e7dca90a7fae267a41bc9b020d2b538a4926e288
< Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs
< Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs
Merging #1268 Support full SIMIS token IDs...
Docs/SIMIS Token IDs.md +93 -0
Source/Orts.Formats.Msts/WorldFile.cs +0 -7
Source/Orts.Parsers.Msts/SBR.cs +6 -20
Source/Orts.Parsers.Msts/TokenID.cs +48 -49
Source/Tests/Orts.Parsers.Msts/SbrTokenNamespaceTests.cs +291 -0
Source/Tests/Tests.csproj +2 -1
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change e559bfea908452f38013ff594211d77431b4c37a
Merging #1081 Brake cuts power unification...
Source/Documentation/Manual/physics.rst +7 -2
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 a8127a1a48b670d053696e3aee9bbff97684c989
< Auto-merging Source/Documentation/Manual/physics.rst
< Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
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 +63 -296
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 +661 -664
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 5ac1f7d87a6730bd516315fd3bdd46421e888c3b
< 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/CruiseControl.cs
< Auto-merging Source/RunActivity/Viewer3D/Popups/TrainDrivingWindow.cs
< Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
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/Orts.Simulation/Simulation/Simulator.cs
< Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
Merging #1237 added Control Rectangles (Ctrl+F5) for 3d locomotives...
Source/RunActivity/Viewer3D/Popups/ControlRectangle.cs +39 -0
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change d29cebf937a6904d07e3fdeca5ea06226900d369
Merging #1263 Harmless Part of Particle Emitter Overhaul...
Source/Documentation/Manual/physics.rst +6 -6
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselEngine.cs +13 -12
Source/RunActivity/Viewer3D/ParticleEmitter.cs +133 -79
Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs +1 -1
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change b14a110f2280d6446771425b95f1703daa2211f9
< Auto-merging Source/Documentation/Manual/physics.rst
< Auto-merging Source/RunActivity/Viewer3D/ParticleEmitter.cs
< Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs
Merging #1271 Fix SBRException.GetPosition() regression...
Source/Orts.Parsers.Msts/SBR.cs +1 -1
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 0fb09e3c0c75a45a790bae6cf1d8c3002938382e
< Auto-merging Source/Orts.Parsers.Msts/SBR.cs
Merging #1272 Wheelslip Refactor...
Source/Contrib/SimulatorTester/Program.cs +1 -1
Source/Documentation/Manual/physics.rst +6 -4
Source/Orts.Simulation/Simulation/AIs/AITrain.cs +0 -7
Source/Orts.Simulation/Simulation/Physics/Train.cs +41 -5
Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs +135 -186
Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs +1 -1
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerTransmissions/Axle.cs +216 -171
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerTransmissions/InductionMotor.cs +4 -12
Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs +1 -1
Source/Orts.Simulation/Simulation/Simulator.cs +5 -1
Source/Orts.Simulation/Simulation/Timetables/ProcessTimetable.cs +0 -1
Source/Orts.Simulation/Simulation/Timetables/TTPool.cs +0 -11
Source/Orts.Simulation/Simulation/Timetables/TTTrain.cs +0 -22
Source/Orts.Simulation/Simulation/Timetables/TTTurntable.cs +0 -11
Source/RunActivity/Viewer3D/Popups/HUDWindow.cs +1 -1
Source/RunActivity/Viewer3D/Popups/TrainDrivingWindow.cs +2 -2
Source/RunActivity/Viewer3D/Viewer.cs +2 -1
Source/RunActivity/Viewer3D/WebServices/TrainDrivingDisplay.cs +2 -2
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 38b910118dd437be99fc51bbfc1686467941b21c
< Auto-merging Source/Documentation/Manual/physics.rst
< Auto-merging Source/Orts.Simulation/Simulation/Physics/Train.cs
< Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
< Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs
< Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
< Auto-merging Source/Orts.Simulation/Simulation/Simulator.cs
< Auto-merging Source/RunActivity/Viewer3D/Popups/HUDWindow.cs
< Auto-merging Source/RunActivity/Viewer3D/Popups/TrainDrivingWindow.cs
< Auto-merging Source/RunActivity/Viewer3D/Viewer.cs
Merging #1261 Correction for varying wind speed....
Source/Orts.Formats.Msts/SoundManagmentFile.cs +84 -0
Source/RunActivity/Viewer3D/Sound.cs +541 -2
Source/RunActivity/Viewer3D/Weather.cs +58 -3
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 8251c5b21ac729bcd3f83a6f6063c5195b16905f
< Auto-merging Source/Orts.Formats.Msts/SoundManagmentFile.cs
< Auto-merging Source/RunActivity/Viewer3D/Sound.cs
Merging #1269 Expand procedural profiles for tracks, roads and line objects...
Docs/SIMIS Token IDs.md +93 -0
Source/ContentChecker/LoaderFactory.cs +1 -1
Source/ContentChecker/TelepoleLoader.cs +27 -0
Source/Orts.Formats.Msts/TelepoleDataFile.cs +139 -0
Source/Orts.Formats.Msts/WorldFile.cs +92 -8
Source/Orts.Parsers.Msts/SBR.cs +6 -20
Source/Orts.Parsers.Msts/TokenID.cs +50 -49
Source/RunActivity/Viewer3D/DynamicTrack.cs +660 -72
Source/RunActivity/Viewer3D/Materials.cs +4 -0
Source/RunActivity/Viewer3D/Ruler.cs +183 -0
Source/RunActivity/Viewer3D/Scenery.cs +44 -5
Source/RunActivity/Viewer3D/SuperElevation.cs +161 -57
Source/RunActivity/Viewer3D/Telepole.cs +403 -0
Source/RunActivity/Viewer3D/TrackProfileTemplate.cs +294 -0
Source/RunActivity/Viewer3D/TrackProfileTemplatePrimitive.cs +663 -0
Source/RunActivity/Viewer3D/Viewer.cs +6 -0
Source/Tests/Orts.Parsers.Msts/SbrTokenNamespaceTests.cs +293 -0
Source/Tests/Tests.csproj +2 -1
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change f1bf82f9d17f4332ec5a7278c1e722f8bb4caad6
< Auto-merging Source/RunActivity/Viewer3D/Materials.cs
< Auto-merging Source/RunActivity/Viewer3D/Scenery.cs
< Auto-merging Source/RunActivity/Viewer3D/Viewer.cs
Merging #1270 Procedural terrain materials...
Docs/SIMIS Token IDs.md +93 -0
Program/Readme - this folder is intentionally empty.txt +0 -32
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/ContentChecker/LoaderFactory.cs +1 -1
Source/ContentChecker/TelepoleLoader.cs +27 -0
Source/Contrib/TrackViewer/Drawing/BasicShapes.cs +1 -1
Source/Contrib/TrackViewer/Drawing/DrawTerrain.cs +1 -1
Source/Documentation/Manual/developing.rst +173 -0
Source/ORTS.Common/ConsistGenerator.cs +204 -0
Source/Orts.Formats.Msts/ConsistFile.cs +11 -0
Source/Orts.Formats.Msts/TelepoleDataFile.cs +139 -0
Source/Orts.Formats.Msts/TerrainFile.cs +167 -0
Source/Orts.Formats.Msts/TerrainMaterialFile.cs +176 -0
Source/Orts.Formats.Msts/TerrainMaterialMapFile.cs +196 -0
Source/Orts.Formats.Msts/WorldFile.cs +92 -8
Source/Orts.Parsers.Msts/SBR.cs +6 -20
Source/Orts.Parsers.Msts/TokenID.cs +57 -49
Source/Orts.Settings/UserSettings.cs +2 -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/Orts.Simulation/Simulation/Turntables.cs +15 -15
Source/Orts.Simulation/Simulation/Weather.cs +25 -0
Source/RunActivity/Content/Bloom.fx +275 -0
Source/RunActivity/Content/EnvMap/cmft.bat +74 -0
Source/RunActivity/Content/SceneryShader.fx +1,183 -306
Source/RunActivity/Content/ShadowMap.fx +260 -44
Source/RunActivity/RunActivity.csproj +12 -0
Source/RunActivity/Viewer3D/AnimatedPart.cs +201 -82
Source/RunActivity/Viewer3D/Cameras.cs +50 -0
Source/RunActivity/Viewer3D/Common/Helpers.cs +37 -0
Source/RunActivity/Viewer3D/DDSLib.cs +508 -73
Source/RunActivity/Viewer3D/DynamicTrack.cs +660 -72
Source/RunActivity/Viewer3D/Forest.cs +18 -14
Source/RunActivity/Viewer3D/GltfShape.cs +2,190 -0
Source/RunActivity/Viewer3D/Lights.cs +116 -40
Source/RunActivity/Viewer3D/MSTSSky.cs +0 -3
Source/RunActivity/Viewer3D/Materials.cs +1,269 -225
Source/RunActivity/Viewer3D/ParticleEmitter.cs +8 -6
Source/RunActivity/Viewer3D/Popups/HUDWindow.cs +8 -6
Source/RunActivity/Viewer3D/Precipitation.cs +18 -13
Source/RunActivity/Viewer3D/ProceduralTerrain.cs +215 -0
Source/RunActivity/Viewer3D/Processes/GameStateRunActivity.cs +2 -2
Source/RunActivity/Viewer3D/Processes/RenderProcess.cs +5 -0
Source/RunActivity/Viewer3D/RenderFrame.cs +453 -192
Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs +49 -44
Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs +93 -77
Source/RunActivity/Viewer3D/RollingStock/SubSystems/DistributedPowerInterface.cs +8 -6
Source/RunActivity/Viewer3D/Ruler.cs +183 -0
Source/RunActivity/Viewer3D/Scenery.cs +62 -10
Source/RunActivity/Viewer3D/Shaders.cs +311 -92
Source/RunActivity/Viewer3D/Shapes.cs +714 -886
Source/RunActivity/Viewer3D/Signals.cs +139 -160
Source/RunActivity/Viewer3D/Sky.cs +0 -5
Source/RunActivity/Viewer3D/SkyInterpolation.cs +2 -0
Source/RunActivity/Viewer3D/SuperElevation.cs +161 -57
Source/RunActivity/Viewer3D/Telepole.cs +403 -0
Source/RunActivity/Viewer3D/Terrain.cs +275 -25
Source/RunActivity/Viewer3D/Tiles.cs +3 -0
Source/RunActivity/Viewer3D/TrackProfileTemplate.cs +294 -0
Source/RunActivity/Viewer3D/TrackProfileTemplatePrimitive.cs +663 -0
Source/RunActivity/Viewer3D/Transfers.cs +17 -14
Source/RunActivity/Viewer3D/Viewer.cs +8 -2
Source/RunActivity/Viewer3D/Water.cs +21 -12
Source/Tests/Orts.Formats.Msts/TerrainMaterialTests.cs +275 -0
Source/Tests/Orts.Parsers.Msts/SbrTokenNamespaceTests.cs +298 -0
Source/Tests/Tests.csproj +2 -1
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 03987bfe87d88cf43ba1f4a1fb18427c2d7e1867
< Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
< Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs
< Auto-merging Source/RunActivity/Viewer3D/Popups/HUDWindow.cs
< Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.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 -117
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 +104 -15
Source/RunActivity/Viewer3D/Viewer.cs +13 -8
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 7033b9161460df214d0da20c9ec26495a7e6d6c4
< 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.Formats.Msts/SoundManagmentFile.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
< Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
< Auto-merging Source/RunActivity/Viewer3D/AnimatedPart.cs
< CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/AnimatedPart.cs
< Auto-merging Source/RunActivity/Viewer3D/Cameras.cs
< Auto-merging Source/RunActivity/Viewer3D/Lights.cs
< CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/Lights.cs
< Auto-merging Source/RunActivity/Viewer3D/ParticleEmitter.cs
< CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/ParticleEmitter.cs
< Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
< CONFLICT (content): Merge conflict in 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
< CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/Shapes.cs
< Auto-merging Source/RunActivity/Viewer3D/Sound.cs
< CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/Sound.cs
< Auto-merging Source/RunActivity/Viewer3D/Viewer.cs
< CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/Viewer.cs
< Automatic merge failed; fix conflicts and then commit the result.
> git --no-pager reset --hard
< HEAD is now at 4f0fa95b71 Merge commit '03987bfe87d88cf43ba1f4a1fb18427c2d7e1867' into HEAD
> git --no-pager clean --force -d -x
Error: git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 7033b9161460df214d0da20c9ec26495a7e6d6c4 failed: 1
Merging #1127 Advanced Shape Descriptor Controls...
Source/Documentation/Manual/features-rollingstock.rst +351 -3
Source/Documentation/Manual/options.rst +2 -0
Source/Orts.Formats.Msts/ShapeDescriptorFile.cs +118 -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 5737887c81b2ad241a4ebb606b2fba97bec08adc
< 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
< 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
< Auto-merging Source/RunActivity/Viewer3D/Shapes.cs
< CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/Shapes.cs
< Automatic merge failed; fix conflicts and then commit the result.
> git --no-pager reset --hard
< HEAD is now at 4f0fa95b71 Merge commit '03987bfe87d88cf43ba1f4a1fb18427c2d7e1867' into HEAD
> git --no-pager clean --force -d -x
Error: git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 5737887c81b2ad241a4ebb606b2fba97bec08adc failed: 1
Merging #1186 Hot Reloading of Trains, Scenery, and Terrain...
Source/Documentation/Manual/options.rst +77 -0
Source/Menu/Options.Designer.cs +32 -0
Source/Menu/Options.cs +7 -0
Source/Orts.Common/Input/UserCommand.cs +1 -0
Source/Orts.Formats.Msts/AceFile.cs +20 -6
Source/Orts.Formats.Msts/CabViewFile.cs +19 -8
Source/Orts.Formats.Msts/ShapeDescriptorFile.cs +40 -5
Source/Orts.Formats.Msts/SoundManagmentFile.cs +71 -6
Source/Orts.Parsers.Msts/STFReader.cs +11 -1
Source/Orts.Settings/InputSettings.cs +1 -0
Source/Orts.Settings/UserSettings.cs +2 -0
Source/Orts.Simulation/Common/ORTSPaths.cs +1 -1
Source/Orts.Simulation/Simulation/Physics/Train.cs +2 -2
Source/Orts.Simulation/Simulation/RollingStocks/MSTSControlTrailerCar.cs +2 -2
Source/Orts.Simulation/Simulation/RollingStocks/MSTSDieselLocomotive.cs +3 -3
Source/Orts.Simulation/Simulation/RollingStocks/MSTSElectricLocomotive.cs +2 -2
Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs +90 -52
Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs +20 -2
Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs +121 -4
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/BrakeController.cs +8 -2
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/IController.cs +1 -0
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/MSTSNotchController.cs +3 -2
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/EOT.cs +2 -2
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselEngine.cs +37 -9
Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs +11 -3
Source/Orts.Simulation/Simulation/Simulator.cs +194 -0
Source/RunActivity/Viewer3D/DDSLib.cs +2 -1
Source/RunActivity/Viewer3D/DynamicTrack.cs +84 -7
Source/RunActivity/Viewer3D/Forest.cs +17 -1
Source/RunActivity/Viewer3D/Lights.cs +77 -22
Source/RunActivity/Viewer3D/Materials.cs +177 -35
Source/RunActivity/Viewer3D/ParticleEmitter.cs +34 -0
Source/RunActivity/Viewer3D/Popups/OSDLocations.cs +4 -4
Source/RunActivity/Viewer3D/Processes/SoundProcess.cs +201 -2
Source/RunActivity/Viewer3D/RoadCars.cs +28 -4
Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs +137 -13
Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs +94 -4
Source/RunActivity/Viewer3D/RollingStock/TrainCarViewer.cs +25 -2
Source/RunActivity/Viewer3D/Scenery.cs +240 -53
Source/RunActivity/Viewer3D/Shapes.cs +132 -16
Source/RunActivity/Viewer3D/Signals.cs +15 -0
Source/RunActivity/Viewer3D/Sound.cs +12 -2
Source/RunActivity/Viewer3D/Terrain.cs +131 -14
Source/RunActivity/Viewer3D/Tiles.cs +11 -4
Source/RunActivity/Viewer3D/Trains.cs +38 -19
Source/RunActivity/Viewer3D/Transfers.cs +16 -1
Source/RunActivity/Viewer3D/Viewer.cs +451 -4
Source/RunActivity/Viewer3D/Water.cs +36 -0
Source/RunActivity/Viewer3D/World.cs +23 -0
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 7ea47cf5435d0314099d774605d61c57bdee4bd6
< Auto-merging Source/Orts.Formats.Msts/CabViewFile.cs
< Auto-merging Source/Orts.Formats.Msts/SoundManagmentFile.cs
< Auto-merging Source/Orts.Settings/UserSettings.cs
< Auto-merging Source/Orts.Simulation/Common/ORTSPaths.cs
< Auto-merging Source/Orts.Simulation/Simulation/Physics/Train.cs
< Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
< Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs
< Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs
< Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/BrakeController.cs
< Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselEngine.cs
< Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
< Auto-merging Source/Orts.Simulation/Simulation/Simulator.cs
< Auto-merging Source/RunActivity/Viewer3D/DDSLib.cs
< Auto-merging Source/RunActivity/Viewer3D/DynamicTrack.cs
< CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/DynamicTrack.cs
< Auto-merging Source/RunActivity/Viewer3D/Forest.cs
< Auto-merging Source/RunActivity/Viewer3D/Lights.cs
< Auto-merging Source/RunActivity/Viewer3D/Materials.cs
< CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/Materials.cs
< Auto-merging Source/RunActivity/Viewer3D/ParticleEmitter.cs
< CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/ParticleEmitter.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/Scenery.cs
< Auto-merging Source/RunActivity/Viewer3D/Shapes.cs
< CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/Shapes.cs
< Auto-merging Source/RunActivity/Viewer3D/Signals.cs
< Auto-merging Source/RunActivity/Viewer3D/Sound.cs
< Auto-merging Source/RunActivity/Viewer3D/Terrain.cs
< CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/Terrain.cs
< Auto-merging Source/RunActivity/Viewer3D/Tiles.cs
< Auto-merging Source/RunActivity/Viewer3D/Transfers.cs
< Auto-merging Source/RunActivity/Viewer3D/Viewer.cs
< Auto-merging Source/RunActivity/Viewer3D/Water.cs
< Automatic merge failed; fix conflicts and then commit the result.
> git --no-pager reset --hard
< HEAD is now at 4f0fa95b71 Merge commit '03987bfe87d88cf43ba1f4a1fb18427c2d7e1867' into HEAD
> git --no-pager clean --force -d -x
Error: git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 7ea47cf5435d0314099d774605d61c57bdee4bd6 failed: 1
Merging #1218 Partial bug fix for https://bugs.launchpad.net/or/+bug/2148806 Switch state isn't synced in multiplayer mode...
Source/Orts.Simulation/MultiPlayer/Message.cs +1 -0
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 135564bc83be461132fa62606cac89b24ed56e35
Merging #1233 adds Log Motion Data to DataLogger...
Source/Menu/Options.Designer.cs +13 -0
Source/Menu/Options.cs +1 -0
Source/Orts.Settings/UserSettings.cs +2 -0
Source/RunActivity/Viewer3D/InfoDisplay.cs +16 -0
Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs +15 -3
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 6e6c0f682c43db2955b936170a3ef0f02ac1a98b
< Auto-merging Source/Menu/Options.Designer.cs
< Auto-merging Source/Menu/Options.cs
< Auto-merging Source/Orts.Settings/UserSettings.cs
< Auto-merging Source/RunActivity/Viewer3D/InfoDisplay.cs
< Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs
< CONFLICT (content): Merge conflict in 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 69596278c9 Merge commit '135564bc83be461132fa62606cac89b24ed56e35' into HEAD
> git --no-pager clean --force -d -x
Error: git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 6e6c0f682c43db2955b936170a3ef0f02ac1a98b failed: 1
Merging #1246 Support for higher-resolution terrain...
Source/RunActivity/Viewer3D/RenderFrame.cs +1 -2
Source/RunActivity/Viewer3D/Terrain.cs +28 -30
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 14d1f00c2ae97f634f2cefffd472edd99617b6b9
< Auto-merging Source/RunActivity/Viewer3D/RenderFrame.cs
< Auto-merging Source/RunActivity/Viewer3D/Terrain.cs
Pull requests successfully auto-merged (15):
#570 glTF 2.0 support with PBR lighting
#1266 Steam Locomotive Steam Cylinder Exhaust Sounds
#1268 Support full SIMIS token IDs
#1081 Brake cuts power unification
#1091 Automatic speed control
#1124 Built-in PBL2 brake controller
#1237 added Control Rectangles (Ctrl+F5) for 3d locomotives
#1263 Harmless Part of Particle Emitter Overhaul
#1271 Fix SBRException.GetPosition() regression
#1272 Wheelslip Refactor
#1261 Correction for varying wind speed.
#1269 Expand procedural profiles for tracks, roads and line objects
#1270 Procedural terrain materials
#1218 Partial bug fix for https://bugs.launchpad.net/or/+bug/2148806 Switch state isn't synced in multiplayer mode
#1246 Support for higher-resolution terrain
Pull requests not auto-merged (5):
#1057 Switchable brake system
#1126 ShapeHierarchy Attachment for More Wagon Addons
#1127 Advanced Shape Descriptor Controls
#1186 Hot Reloading of Trains, Scenery, and Terrain
#1233 adds Log Motion Data to DataLogger
No changes to push into merge branch
> git --no-pager checkout --quiet unstable
Open Rails Code Bot finished at 2026-10-10 09:22:55Z
|
