Open Rails Code Bot started at 2025-04-16 00:07:14Z
GitHub organisation: openrails
GitHub team: development-team
GitHub repository: openrails
GitHub base branch: master
GitHub merge branch: unstable
Team members (17):
Sharpe49
twpol
cjakeman
pzgulyas
YoRyan
perpetualKid
strawberryfield
cesarBLG
peternewell
Csantucci
Roeterdink
wjcurrey
Looky1173
markus-GE
mbm-OR
SteelFill
sweiland-openrails
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 for-unstable
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
#892 Signal Function OPP_SIG_ID_TRAINPATH
By: Roeterdink
Branch: OPP_SIG_ID_TRAINPATH
Draft: False
Labels: enhancement
Allowed to auto-merge? True
#896 First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains
By: Csantucci
Branch: AI-Train-Sound-official
Draft: True
Labels: enhancement
Allowed to auto-merge? True
#900 DMI in 3D cab + two more dials
By: pzgulyas
Branch: dmi280
Draft: False
Labels: enhancement for-unstable
Allowed to auto-merge? True
#1000 Locomotive operation from control car
By: cesarBLG
Branch: control-car-controls
Draft: False
Labels: enhancement
Allowed to auto-merge? True
#1007 Russian localization up to 2025 Jan 3-rd
By: Weter-ORTS
Branch: master
Draft: False
Labels: for-unstable locales
Allowed to auto-merge? True
#1013 Tools for reverse engineering shape and ace files (converting)
By: Hirek193
Branch: master
Draft: False
Labels:
Allowed to auto-merge? False
#1029 Superelevation Follow Up Fixes
By: SteelFill
Branch: multi_track_profiles
Draft: False
Labels: bug
Allowed to auto-merge? True
#1030 Refactor settings, in prep for settings exporter
By: rwf-rr
Branch: refactor-user-settings-location
Draft: False
Labels: refactoring for-unstable
Allowed to auto-merge? True
#1045 Bugfix: Empty Start Time for Explore, and other issues loading from Menu Selection and Content Routes
By: rwf-rr
Branch: explore-start-time
Draft: False
Labels: bug for-unstable
Allowed to auto-merge? True
#1049 Re-organise document storage and access
By: cjakeman
Branch: docs-move-online
Draft: True
Labels: documentation
Allowed to auto-merge? True
#1052 Content Manager: Add axle count, and lowest derail force
By: rwf-rr
Branch: content-manager-more
Draft: False
Labels: for-unstable
Allowed to auto-merge? True
#1055 Route Based TTrack Sounds
By: peternewell
Branch: track_sounds#1
Draft: True
Labels: enhancement for-unstable
Allowed to auto-merge? True
#1057 Switchable brake system
By: pzgulyas
Branch: gpr
Draft: False
Labels: enhancement
Allowed to auto-merge? True
#1062 Train Forces popup Window.
By: rwf-rr
Branch: train-forces-popup-window
Draft: False
Labels: for-unstable
Allowed to auto-merge? True
#1064 Add Train Info tab to Help window (F1)
By: rwf-rr
Branch: help-add-train-info-tab
Draft: False
Labels: for-unstable
Allowed to auto-merge? True
#1066 Log derailment, using TraceInformation.
By: rwf-rr
Branch: log-derailment-and-more
Draft: False
Labels: for-unstable
Allowed to auto-merge? True
#1067 Traction and dynamic brake retardation
By: cesarBLG
Branch: controller-delays
Draft: False
Labels: enhancement
Allowed to auto-merge? True
#1069 Mouse wheel control only with Alt â Followup for #1051
By: pzgulyas
Branch: camwheel
Draft: False
Labels:
Allowed to auto-merge? True
#1070 Fix a NullReferenceException in TCS scripts
By: pzgulyas
Branch: scriptfix
Draft: False
Labels: bug
Allowed to auto-merge? True
Pull requests suitable for auto-merging (19):
#570 glTF 2.0 support with PBR lighting
#900 DMI in 3D cab + two more dials
#1007 Russian localization up to 2025 Jan 3-rd
#1030 Refactor settings, in prep for settings exporter
#1045 Bugfix: Empty Start Time for Explore, and other issues loading from Menu Selection and Content Routes
#1052 Content Manager: Add axle count, and lowest derail force
#1062 Train Forces popup Window.
#1064 Add Train Info tab to Help window (F1)
#1066 Log derailment, using TraceInformation.
#892 Signal Function OPP_SIG_ID_TRAINPATH
#1000 Locomotive operation from control car
#1029 Superelevation Follow Up Fixes
#1057 Switchable brake system
#1067 Traction and dynamic brake retardation
#1069 Mouse wheel control only with Alt â Followup for #1051
#1070 Fix a NullReferenceException in TCS scripts
#1055 Route Based TTrack Sounds
#896 First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains
#1049 Re-organise document storage and access
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 a2adc9911 Automatic merge of T1.5.1-1695-gade019506 and 17 pull requests
> git --no-pager clean --force -d -x
> git --no-pager checkout --quiet --detach ade01950658fca870a74c8ae326639bd99ddd14d
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 +140 -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 f11a428ab55ed1b5021bf5b72bee4a8e8694302d
Merging #900 DMI in 3D cab + two more dials...
Source/Documentation/Manual/cabs.rst +47 -28
Source/RunActivity/Viewer3D/Materials.cs +42 -1
Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs +39 -1
Source/RunActivity/Viewer3D/RollingStock/SubSystems/ETCS/DriverMachineInterface.cs +82 -59
Source/RunActivity/Viewer3D/RollingStock/SubSystems/ETCS/SpeedDistanceMonitoring.cs +26 -10
Source/RunActivity/Viewer3D/Shapes.cs +5 -5
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 4629736361298209c0fa96fef2087776478a362f
< Auto-merging Source/Documentation/Manual/cabs.rst
< Auto-merging Source/RunActivity/Viewer3D/Materials.cs
< Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
< Auto-merging Source/RunActivity/Viewer3D/RollingStock/SubSystems/ETCS/DriverMachineInterface.cs
< Auto-merging Source/RunActivity/Viewer3D/Shapes.cs
Merging #1007 Russian localization up to 2025 Jan 3-rd...
Source/Locales/Contrib/Contrib.pot +1,975 -1,975
Source/Locales/Contrib/ru.po +4 -4
Source/Locales/Menu/Menu.pot +1,763 -1,668
Source/Locales/Menu/ru.po +776 -398
Source/Locales/ORTS.Common/ORTS.Common.pot +1,159 -1,159
Source/Locales/ORTS.Common/ru.po +278 -262
Source/Locales/ORTS.Menu/ORTS.Menu.pot +82 -82
Source/Locales/ORTS.Settings/ORTS.Settings.pot +152 -152
Source/Locales/Orts.Formats.OR/Orts.Formats.OR.pot +19 -19
Source/Locales/Orts.Simulation/Orts.Simulation.pot +3,239 -3,239
Source/Locales/Orts.Simulation/ru.po +1,115 -810
Source/Locales/RunActivity/RunActivity.pot +3,847 -3,847
Source/Locales/RunActivity/ru.po +1,245 -1,034
Source/Locales/Updater/Updater.pot +17 -17
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change ad60314909150906f97e5bd6533aac008b5eb7b4
< Auto-merging Source/Locales/Contrib/Contrib.pot
< CONFLICT (content): Merge conflict in Source/Locales/Contrib/Contrib.pot
< Auto-merging Source/Locales/Menu/Menu.pot
< CONFLICT (content): Merge conflict in Source/Locales/Menu/Menu.pot
< Auto-merging Source/Locales/ORTS.Common/ORTS.Common.pot
< CONFLICT (content): Merge conflict in Source/Locales/ORTS.Common/ORTS.Common.pot
< Auto-merging Source/Locales/ORTS.Menu/ORTS.Menu.pot
< CONFLICT (content): Merge conflict in Source/Locales/ORTS.Menu/ORTS.Menu.pot
< Auto-merging Source/Locales/ORTS.Settings/ORTS.Settings.pot
< CONFLICT (content): Merge conflict in Source/Locales/ORTS.Settings/ORTS.Settings.pot
< Auto-merging Source/Locales/Orts.Formats.OR/Orts.Formats.OR.pot
< CONFLICT (content): Merge conflict in Source/Locales/Orts.Formats.OR/Orts.Formats.OR.pot
< Auto-merging Source/Locales/Orts.Simulation/Orts.Simulation.pot
< CONFLICT (content): Merge conflict in Source/Locales/Orts.Simulation/Orts.Simulation.pot
< Auto-merging Source/Locales/RunActivity/RunActivity.pot
< CONFLICT (content): Merge conflict in Source/Locales/RunActivity/RunActivity.pot
< Auto-merging Source/Locales/Updater/Updater.pot
< CONFLICT (content): Merge conflict in Source/Locales/Updater/Updater.pot
< Automatic merge failed; fix conflicts and then commit the result.
> git --no-pager reset --hard
< HEAD is now at c9f77bda5 Merge commit '4629736361298209c0fa96fef2087776478a362f' into HEAD
> git --no-pager clean --force -d -x
Error: git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change ad60314909150906f97e5bd6533aac008b5eb7b4 failed: 1
Merging #1030 Refactor settings, in prep for settings exporter...
Source/Orts.Common/SettingsBase.cs +75 -0
Source/Orts.Common/SettingsStore.cs +49 -1
Source/Orts.Settings/ContentSettings.cs +3 -1
Source/Orts.Settings/FolderSettings.cs +3 -1
Source/Orts.Settings/InputSettings.cs +3 -1
Source/Orts.Settings/RailDriverSettings.cs +3 -1
Source/Orts.Settings/TelemetrySettings.cs +3 -1
Source/Orts.Settings/UpdateSettings.cs +1 -1
Source/Orts.Settings/UpdateState.cs +3 -1
Source/Orts.Settings/UserSettings.cs +18 -11
Source/Orts.Updater/UpdateManager.cs +1 -1
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change d3ae4a2a36f67cc356d82ebfb84a32943cba0b75
< Auto-merging Source/Orts.Settings/UserSettings.cs
Merging #1045 Bugfix: Empty Start Time for Explore, and other issues loading from Menu Selection and Content Routes...
Source/Menu/MainForm.cs +98 -38
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change cc4d53c058520b11bcd7188b99af9286b5d9c3c9
< Auto-merging Source/Menu/MainForm.cs
Merging #1052 Content Manager: Add axle count, and lowest derail force...
Source/Contrib/ContentManager/ContentInfo.cs +51 -17
Source/Contrib/ContentManager/ContentMSTS.cs +7 -0
Source/Contrib/ContentManager/Models/Car.cs +46 -5
Source/Contrib/ContentManager/Models/Consist.cs +62 -10
Source/Orts.Formats.Msts/EngineFile.cs +10 -0
Source/Orts.Formats.Msts/WagonFile.cs +8 -0
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 3b5cb904005f6928c325f26b28cece4a22cbc94e
Merging #1062 Train Forces popup Window....
Source/Orts.Common/Conversions.cs +7 -0
Source/Orts.Common/Input/UserCommand.cs +1 -0
Source/Orts.Settings/InputSettings.cs +1 -0
Source/Orts.Settings/UserSettings.cs +2 -0
Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs +4 -0
Source/RunActivity/RunActivity.csproj +3 -0
Source/RunActivity/Viewer3D/Popups/TrainForcesWindow.cs +443 -0
Source/RunActivity/Viewer3D/Viewer.cs +3 -0
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change b96d6fa682da4f78820bd0bcea8b739a636d42b1
< Auto-merging Source/Orts.Common/Conversions.cs
< Auto-merging Source/Orts.Settings/InputSettings.cs
< Auto-merging Source/Orts.Settings/UserSettings.cs
< Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
< Auto-merging Source/RunActivity/RunActivity.csproj
Merging #1064 Add Train Info tab to Help window (F1)...
Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs +4 -0
Source/RunActivity/RunActivity.csproj +3 -1
Source/RunActivity/Viewer3D/Popups/HelpWindow.cs +275 -1
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 52410f9ed43f7ae763eaf465e5710e0b1de51f99
< Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
< Auto-merging Source/RunActivity/RunActivity.csproj
Merging #1066 Log derailment, using TraceInformation....
Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs +18 -3
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 62c89c1d6ac6d9e7c7f77cc449a50083f635154e
< Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
Merging #892 Signal Function OPP_SIG_ID_TRAINPATH...
Source/Orts.Formats.Msts/SignalScripts.cs +1 -0
Source/Orts.Simulation/Simulation/Signalling/SIGSCRfile.cs +37 -0
Source/Orts.Simulation/Simulation/Signalling/SignalHead.cs +4 -0
Source/Orts.Simulation/Simulation/Signalling/SignalObject.cs +54 -0
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 1f5ba4c81b4cda5097d56b671c464767dc6d50f7
< Auto-merging Source/Orts.Formats.Msts/SignalScripts.cs
< Auto-merging Source/Orts.Simulation/Simulation/Signalling/SIGSCRfile.cs
< Auto-merging Source/Orts.Simulation/Simulation/Signalling/SignalObject.cs
Merging #1000 Locomotive operation from control car...
Source/Documentation/Manual/physics.rst +1 -1
Source/Orts.Simulation/Common/Commands.cs +1 -1
Source/Orts.Simulation/Common/Scripting/PowerSupply/ControlCarPowerSupply.cs +33 -7
Source/Orts.Simulation/Common/Scripting/PowerSupply/LocomotivePowerSupply.cs +4 -4
Source/Orts.Simulation/Simulation/RollingStocks/MSTSControlTrailerCar.cs +133 -30
Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs +18 -130
Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs +37 -24
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/ControlCarPowerSupply.cs +64 -12
Source/Orts.Simulation/Simulation/Simulator.cs +17 -0
Source/RunActivity/Viewer3D/RollingStock/MSTSControlTrailerCarViewer.cs +78 -0
Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs +32 -1
Source/RunActivity/Viewer3D/Trains.cs +1 -0
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change d8d970943b56b73a58fcab401a485dee7071b078
< Auto-merging Source/Documentation/Manual/physics.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/Simulator.cs
< Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
Merging #1029 Superelevation Follow Up Fixes...
Source/Orts.Formats.Msts/TrackSectionsFile.cs +12 -2
Source/Orts.Simulation/Simulation/Physics/Train.cs +6 -6
Source/RunActivity/Viewer3D/DynamicTrack.cs +3 -0
Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs +22 -17
Source/RunActivity/Viewer3D/SuperElevation.cs +33 -29
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 92c74ef5d0c931ef80d546a28cfeee7faa8281e2
< Auto-merging Source/Orts.Formats.Msts/TrackSectionsFile.cs
< Auto-merging Source/Orts.Simulation/Simulation/Physics/Train.cs
< Auto-merging Source/RunActivity/Viewer3D/DynamicTrack.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/MSTSWagon.cs +391 -394
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 +13 -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 50c378938e2f57239578e07b448b6b46ef6f635d
< 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/MSTSWagon.cs
< Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
< Auto-merging Source/Orts.Simulation/Simulation/Simulator.cs
Merging #1067 Traction and dynamic brake retardation...
Source/Documentation/Manual/physics.rst +62 -0
Source/Orts.Simulation/Simulation/RollingStocks/MSTSControlTrailerCar.cs +1 -1
Source/Orts.Simulation/Simulation/RollingStocks/MSTSDieselLocomotive.cs +76 -164
Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs +256 -138
Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs +4 -2
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/MSTSNotchController.cs +60 -24
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/CruiseControl.cs +66 -47
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselEngine.cs +3 -2
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerTransmissions/ElectricMotor.cs +0 -4
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerTransmissions/InductionMotor.cs +1 -4
Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs +32 -17
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 154f8836fc33c1b1b6abf5468b046b161f9c316e
< Auto-merging Source/Documentation/Manual/physics.rst
< Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSControlTrailerCar.cs
< Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
< Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
< CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
< Automatic merge failed; fix conflicts and then commit the result.
> git --no-pager reset --hard
< HEAD is now at f5453e246 Merge commit '50c378938e2f57239578e07b448b6b46ef6f635d' into HEAD
> git --no-pager clean --force -d -x
Error: git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 154f8836fc33c1b1b6abf5468b046b161f9c316e failed: 1
Merging #1069 Mouse wheel control only with Alt â Followup for #1051...
Source/RunActivity/Viewer3D/Cameras.cs +1 -1
Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs +3 -2
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 3f153f0f2f98e8a4134b8034493d658d8e89aa36
< Auto-merging Source/RunActivity/Viewer3D/Cameras.cs
< Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
Merging #1070 Fix a NullReferenceException in TCS scripts...
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/TrainControlSystem.cs +7 -4
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change f818e40d9506e956c19c3151d675569b55ea9ec3
Merging #1055 Route Based TTrack Sounds...
Source/Orts.Formats.Msts/RouteFile.cs +8 -1
Source/Orts.Formats.Msts/SoundManagmentFile.cs +29 -2
Source/Orts.Simulation/Simulation/Physics/Train.cs +91 -0
Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs +2 -2
Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs +160 -10
Source/RunActivity/Viewer3D/Sound.cs +118 -26
Source/RunActivity/Viewer3D/Viewer.cs +3 -0
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 5c78967cb95a07430a115279dcc624d8df42492f
< Auto-merging Source/Orts.Simulation/Simulation/Physics/Train.cs
< Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs
< Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
< Auto-merging Source/RunActivity/Viewer3D/Viewer.cs
Merging #896 First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains...
Source/Documentation/Manual/sound.rst +15 -0
Source/Orts.Simulation/Common/Events.cs +18 -0
Source/Orts.Simulation/Simulation/AIs/AITrain.cs +17 -1
Source/Orts.Simulation/Simulation/Physics/Train.cs +78 -1
Source/Orts.Simulation/Simulation/Simulator.cs +31 -5
Source/Orts.Simulation/Simulation/Timetables/TTTrain.cs +28 -1
Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs +13 -0
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change f1681df56d3bf4c47af96fab933f7d3a6891a588
< Auto-merging Source/Documentation/Manual/sound.rst
< Auto-merging Source/Orts.Simulation/Common/Events.cs
< Auto-merging Source/Orts.Simulation/Simulation/AIs/AITrain.cs
< Auto-merging Source/Orts.Simulation/Simulation/Physics/Train.cs
< Auto-merging Source/Orts.Simulation/Simulation/Simulator.cs
< Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs
Merging #1049 Re-organise document storage and access...
Source/Documentation/{ => Online}/CODE.txt +0 -0
Source/Documentation/Online/Use this folder to store.txt +15 -0
Source/Documentation/Use this folder to store.txt +7 -0
Source/Menu/MainForm.cs +9 -1
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 4dd8c4ff2d1fb96bafa69c703d6194cc9ee41504
< Auto-merging Source/Menu/MainForm.cs
Pull requests successfully auto-merged (17):
#570 glTF 2.0 support with PBR lighting
#900 DMI in 3D cab + two more dials
#1030 Refactor settings, in prep for settings exporter
#1045 Bugfix: Empty Start Time for Explore, and other issues loading from Menu Selection and Content Routes
#1052 Content Manager: Add axle count, and lowest derail force
#1062 Train Forces popup Window.
#1064 Add Train Info tab to Help window (F1)
#1066 Log derailment, using TraceInformation.
#892 Signal Function OPP_SIG_ID_TRAINPATH
#1000 Locomotive operation from control car
#1029 Superelevation Follow Up Fixes
#1057 Switchable brake system
#1069 Mouse wheel control only with Alt â Followup for #1051
#1070 Fix a NullReferenceException in TCS scripts
#1055 Route Based TTrack Sounds
#896 First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains
#1049 Re-organise document storage and access
Pull requests not auto-merged (2):
#1007 Russian localization up to 2025 Jan 3-rd
#1067 Traction and dynamic brake retardation
No changes to push into merge branch
> git --no-pager checkout --quiet unstable
Open Rails Code Bot finished at 2025-04-16 00:07:44Z
|
