Open Rails Code Bot started at 2025-03-26 02:37:15Z
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 (25):
#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 not-for-unstable
Allowed to auto-merge? False
#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
#961 Improvements for Power Supplies
By: cesarBLG
Branch: powersupply-scripts
Draft: False
Labels: enhancement
Allowed to auto-merge? True
#1000 Locomotive operation from control car
By: cesarBLG
Branch: control-car-controls
Draft: True
Labels: enhancement not-for-unstable
Allowed to auto-merge? False
#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
#1015 Enhancements for EP brakes
By: cesarBLG
Branch: electrical-braking-enhancement
Draft: False
Labels: enhancement
Allowed to auto-merge? True
#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
Allowed to auto-merge? False
#1049 Re-organise document storage and access
By: cjakeman
Branch: docs-move-online
Draft: True
Labels: documentation not-for-unstable
Allowed to auto-merge? False
#1052 Content Manager: Add axle count, and lowest derail force
By: rwf-rr
Branch: content-manager-more
Draft: False
Labels:
Allowed to auto-merge? False
#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: True
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
#1063 Better Missing Track Section Error Message
By: SteelFill
Branch: error_messages
Draft: False
Labels: enhancement
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:
Allowed to auto-merge? False
Pull requests suitable for auto-merging (12):
#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
#1062 Train Forces popup Window.
#892 Signal Function OPP_SIG_ID_TRAINPATH
#961 Improvements for Power Supplies
#1015 Enhancements for EP brakes
#1029 Superelevation Follow Up Fixes
#1063 Better Missing Track Section Error Message
#1055 Route Based TTrack Sounds
#896 First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains
#1057 Switchable brake system
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 0eae0ccae Automatic merge of T1.5.1-1630-gf3424409b and 10 pull requests
> git --no-pager clean --force -d -x
> git --no-pager checkout --quiet --detach f3424409b71afff84b0528262e239a9e8816b77a
Merging #900 DMI in 3D cab + two more dials...
Source/Documentation/Manual/cabs.rst +37 -0
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 b54024bec3328d5ec3e2b0f9f86a4ee3d110a460
< 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 047707e77 Merge commit 'b54024bec3328d5ec3e2b0f9f86a4ee3d110a460' 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
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 +429 -0
Source/RunActivity/Viewer3D/Viewer.cs +3 -0
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 3b18c48abbb0f5fff8592449d91b24bc89f5fd56
< Auto-merging Source/Orts.Settings/InputSettings.cs
< Auto-merging Source/Orts.Settings/UserSettings.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 #961 Improvements for Power Supplies...
Source/Documentation/Manual/cabs.rst +45 -5
Source/Documentation/Manual/features-rollingstock.rst +93 -5
Source/Documentation/Manual/physics.rst +148 -5
Source/Orts.Common/Conversions.cs +15 -0
Source/Orts.Formats.Msts/CabViewFile.cs +15 -1
Source/Orts.Parsers.Msts/STFReader.cs +17 -0
Source/Orts.Simulation/Common/Commands.cs +56 -7
Source/Orts.Simulation/Common/Events.cs +13 -2
Source/Orts.Simulation/Common/Scripting/BrakeController.cs +2 -1
Source/Orts.Simulation/Common/Scripting/Commands.cs +60 -1
Source/Orts.Simulation/Common/Scripting/Common.cs +22 -0
Source/Orts.Simulation/Common/Scripting/PowerSupply/CircuitBreaker.cs +8 -0
Source/Orts.Simulation/Common/Scripting/PowerSupply/Controllers/PantographSelector.cs +138 -0
Source/Orts.Simulation/Common/Scripting/PowerSupply/Controllers/PowerLimitationSelector.cs +138 -0
Source/Orts.Simulation/Common/Scripting/PowerSupply/Controllers/VoltageSelector.cs +138 -0
Source/Orts.Simulation/Common/Scripting/PowerSupply/DieselPowerSupply.cs +63 -10
Source/Orts.Simulation/Common/Scripting/PowerSupply/DualModePowerSupply.cs +158 -11
Source/Orts.Simulation/Common/Scripting/PowerSupply/ElectricPowerSupply.cs +124 -12
Source/Orts.Simulation/Common/Scripting/PowerSupply/LocomotivePowerSupply.cs +458 -27
Source/Orts.Simulation/Common/Scripting/PowerSupply/PassengerCarPowerSupply.cs +59 -19
Source/Orts.Simulation/Common/Scripting/PowerSupply/PowerSupply.cs +45 -10
Source/Orts.Simulation/Common/Scripting/PowerSupply/TractionCutOffSubsytem.cs +31 -1
Source/Orts.Simulation/Common/Scripting/TrainControlSystem.cs +43 -5
Source/Orts.Simulation/Simulation/RollingStocks/MSTSControlTrailerCar.cs +2 -3
Source/Orts.Simulation/Simulation/RollingStocks/MSTSDieselLocomotive.cs +35 -20
Source/Orts.Simulation/Simulation/RollingStocks/MSTSElectricLocomotive.cs +32 -9
Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs +29 -3
Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs +1 -3
Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs +1 -3
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/BrakeController.cs +1 -0
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/Battery.cs +157 -0
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/CircuitBreaker.cs +14 -4
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/{ => Controllers}/BatterySwitch.cs +11 -6
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/{ => Controllers}/MasterKey.cs +2 -2
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/Controllers/PantographSelector.cs +232 -0
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/Controllers/PowerLimitationSelector.cs +231 -0
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/Controllers/VoltageSelector.cs +243 -0
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselEngine.cs +0 -1
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselPowerSupply.cs +22 -34
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DualModePowerSupply.cs +107 -27
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/ElectricPowerSupply.cs +69 -31
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/ILocomotivePowerSupply.cs +17 -6
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/IPowerSupply.cs +6 -3
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/LocomotivePowerSupply.cs +89 -189
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/Pantograph.cs +8 -2
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/PassengerCarPowerSupply.cs +105 -103
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/SteamEngine.cs +0 -49
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/SteamPowerSupply.cs +128 -20
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/TractionCutOffRelay.cs +133 -2
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/TrainControlSystem.cs +8 -12
Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs +20 -9
Source/Orts.Simulation/Simulation/Simulator.cs +49 -40
Source/RunActivity/Viewer3D/Popups/HUDWindow.cs +1 -1
Source/RunActivity/Viewer3D/RollingStock/MSTSDieselLocomotiveViewer.cs +2 -2
Source/RunActivity/Viewer3D/RollingStock/MSTSElectricLocomotiveViewer.cs +1 -1
Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs +75 -9
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change ffccb2e86a4c656858e6c7452986b4cec9733fae
< Auto-merging Source/Documentation/Manual/cabs.rst
< Auto-merging Source/Orts.Common/Conversions.cs
< Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs
< Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
< Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
Merging #1015 Enhancements for EP brakes...
Source/Documentation/Manual/physics.rst +33 -17
Source/Orts.Simulation/Simulation/Physics/Train.cs +6 -6
Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs +1 -1
Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs +5 -69
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs +131 -58
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/EPBrakeSystem.cs +98 -15
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/MSTSBrakeSystem.cs +14 -1
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/ManualBraking.cs +17 -8
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/SMEBrakeSystem.cs +4 -4
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/SingleTransferPipe.cs +4 -3
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/StraightVacuumSinglePipe.cs +19 -2
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/VacuumSinglePipe.cs +5 -4
Source/RunActivity/Viewer3D/Popups/CarOperationsWindow.cs +1 -1
Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs +3 -3
Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs +1 -1
Source/RunActivity/Viewer3D/WebServices/SwitchPanel/SwitchOnPanelDefinition.cs +1 -1
Source/RunActivity/Viewer3D/WebServices/SwitchPanel/SwitchOnPanelStatus.cs +1 -1
Source/RunActivity/Viewer3D/WebServices/TrainCarOperationsWebpage.cs +1 -1
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 1ade99e04894c0486769c49c40a6054b78ac7b59
< 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/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/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs
< Auto-merging Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs
< Auto-merging Source/RunActivity/Viewer3D/WebServices/SwitchPanel/SwitchOnPanelStatus.cs
< Auto-merging Source/RunActivity/Viewer3D/WebServices/TrainCarOperationsWebpage.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
Merging #1063 Better Missing Track Section Error Message...
Source/Orts.Simulation/Simulation/Traveller.cs +6 -3
Source/RunActivity/Viewer3D/Processes/GameStateRunActivity.cs +5 -3
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 6c231916ab8861d22f4f5e35c4274aa148696398
Merging #1055 Route Based TTrack Sounds...
Source/Orts.Formats.Msts/RouteFile.cs +8 -1
Source/Orts.Formats.Msts/SoundManagmentFile.cs +26 -2
Source/Orts.Simulation/Simulation/Physics/Train.cs +70 -0
Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs +2 -2
Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs +159 -18
Source/RunActivity/Viewer3D/Sound.cs +106 -26
Source/RunActivity/Viewer3D/Viewer.cs +3 -0
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 2b455944716619baa950f0476a372cec38979694
< 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/Orts.Simulation/Common/Events.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 #1057 Switchable brake system...
Source/Orts.Common/Conversions.cs +1 -1
Source/Orts.Parsers.Msts/STFReader.cs +2 -3
Source/Orts.Simulation/Simulation/Physics/Train.cs +5 -25
Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs +302 -329
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/BrakeSystem.cs +67 -1
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs +423 -90
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/EPBrakeSystem.cs +3 -3
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/MSTSBrakeSystem.cs +2 -4
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/ManualBraking.cs +4 -3
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/SMEBrakeSystem.cs +2 -1
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/SingleTransferPipe.cs +8 -14
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/StraightVacuumSinglePipe.cs +3 -2
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/VacuumSinglePipe.cs +53 -15
Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs +44 -6
Source/Orts.Simulation/Simulation/Simulator.cs +4 -4
Source/RunActivity/Viewer3D/Popups/HUDWindow.cs +3 -0
Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs +46 -1
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change b9ee9cae1aaff6160116b00128d959f19ed687d0
< Auto-merging Source/Orts.Common/Conversions.cs
< Auto-merging Source/Orts.Parsers.Msts/STFReader.cs
< Auto-merging Source/Orts.Simulation/Simulation/Physics/Train.cs
< CONFLICT (content): Merge conflict in 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
< CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs
< Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/EPBrakeSystem.cs
< CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/EPBrakeSystem.cs
< Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/MSTSBrakeSystem.cs
< CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/MSTSBrakeSystem.cs
< Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/ManualBraking.cs
< Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/SMEBrakeSystem.cs
< CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/SMEBrakeSystem.cs
< Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/SingleTransferPipe.cs
< CONFLICT (content): Merge conflict in 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
< CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/VacuumSinglePipe.cs
< Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
< CONFLICT (content): Merge conflict in 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 45062116c Merge commit 'f1681df56d3bf4c47af96fab933f7d3a6891a588' into HEAD
> git --no-pager clean --force -d -x
Error: git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change b9ee9cae1aaff6160116b00128d959f19ed687d0 failed: 1
Pull requests successfully auto-merged (10):
#900 DMI in 3D cab + two more dials
#1030 Refactor settings, in prep for settings exporter
#1062 Train Forces popup Window.
#892 Signal Function OPP_SIG_ID_TRAINPATH
#961 Improvements for Power Supplies
#1015 Enhancements for EP brakes
#1029 Superelevation Follow Up Fixes
#1063 Better Missing Track Section Error Message
#1055 Route Based TTrack Sounds
#896 First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains
Pull requests not auto-merged (2):
#1007 Russian localization up to 2025 Jan 3-rd
#1057 Switchable brake system
No changes to push into merge branch
> git --no-pager checkout --quiet unstable
Open Rails Code Bot finished at 2025-03-26 02:37:34Z
|
