Open Rails Code Bot started at 2025-02-22 08:52:16Z
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 (27):
#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 Experimental 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
Allowed to auto-merge? True
#1007 Russian localization up to 2025 Jan 3-rd
By: Weter-ORTS
Branch: master
Draft: True
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
#1021 Various traincar operations windows fixes
By: sweiland-openrails
Branch: TrainCarOperationsBugfixes
Draft: False
Labels: bug
Allowed to auto-merge? True
#1026 Fix for Multiplayer: remote trains chuff can't be heard https://bugs.launchpad.net/or/+bug/2092771
By: Csantucci
Branch: mp-chuff
Draft: False
Labels: bug
Allowed to auto-merge? True
#1029 DynaTrax Support for Superelevation
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
#1031 Multiplayer Server, forked from Open Rails Ultimate; blueprint https://blueprints.launchpad.net/or/+spec/multiplayer-server
By: Csantucci
Branch: multiplayer-server-official
Draft: False
Labels: enhancement
Allowed to auto-merge? True
#1033 Multiple signal light textures per signal
By: cesarBLG
Branch: multiple-light-textures
Draft: False
Labels: enhancement
Allowed to auto-merge? True
#1036 Trans: update Spanish
By: cjakeman
Branch: translate-es
Draft: False
Labels: locales
Allowed to auto-merge? True
#1039 Fix: Adjusts Menu for longer text (Russian)
By: cjakeman
Branch: adjust-menu-for-russian-text
Draft: False
Labels: bug locales
Allowed to auto-merge? True
#1041 Trans: updated Portuguese translations
By: cjakeman
Branch: translate-pt
Draft: False
Labels: locales
Allowed to auto-merge? True
#1044 Trans: Updated German text
By: cjakeman
Branch: translate-de
Draft: True
Labels: locales
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
#1047 Docs: adds translation docs
By: cjakeman
Branch: docs-add-online-only
Draft: False
Labels: documentation
Allowed to auto-merge? True
Pull requests suitable for auto-merging (18):
#900 DMI in 3D cab + two more dials
#1030 Refactor settings, in prep for settings exporter
#892 Signal Function OPP_SIG_ID_TRAINPATH
#961 Improvements for Power Supplies
#1015 Enhancements for EP brakes
#1021 Various traincar operations windows fixes
#1026 Fix for Multiplayer: remote trains chuff can't be heard https://bugs.launchpad.net/or/+bug/2092771
#1029 DynaTrax Support for Superelevation
#1031 Multiplayer Server, forked from Open Rails Ultimate; blueprint https://blueprints.launchpad.net/or/+spec/multiplayer-server
#1033 Multiple signal light textures per signal
#1036 Trans: update Spanish
#1039 Fix: Adjusts Menu for longer text (Russian)
#1041 Trans: updated Portuguese translations
#1047 Docs: adds translation docs
#1007 Russian localization up to 2025 Jan 3-rd
#896 First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains
#1000 Locomotive operation from control car
#1044 Trans: Updated German text
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 b162d1f2e Automatic merge of T1.5.1-1546-g597dfc744 and 14 pull requests
> git --no-pager clean --force -d -x
> git --no-pager checkout --quiet --detach 597dfc7444a8652bc76782eef31dc7c81e2aec60
Merging #900 DMI in 3D cab + two more dials...
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 a4b1aa5f3e957b5ef19cf48643067df636eb9af1
< 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 #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/UpdateSettings.cs +1 -1
Source/Orts.Settings/UpdateState.cs +3 -1
Source/Orts.Settings/UserSettings.cs +17 -11
Source/Orts.Updater/UpdateManager.cs +1 -1
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change e50068dd68c6991e95db3b0fcfb2f4ea985922f0
< Auto-merging Source/Orts.Settings/UserSettings.cs
< CONFLICT (content): Merge conflict in Source/Orts.Settings/UserSettings.cs
< Automatic merge failed; fix conflicts and then commit the result.
> git --no-pager reset --hard
< HEAD is now at 4a846cf8b Merge commit 'a4b1aa5f3e957b5ef19cf48643067df636eb9af1' into HEAD
> git --no-pager clean --force -d -x
Error: git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change e50068dd68c6991e95db3b0fcfb2f4ea985922f0 failed: 1
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 -6
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 +2 -2
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 eb9c6014f5257db413854da4b378e197ac4c1616
< Auto-merging Source/Documentation/Manual/cabs.rst
< Auto-merging Source/Documentation/Manual/features-rollingstock.rst
< Auto-merging Source/Documentation/Manual/physics.rst
< Auto-merging Source/Orts.Common/Conversions.cs
< Auto-merging Source/Orts.Parsers.Msts/STFReader.cs
< Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.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/TrainCar.cs
< Auto-merging Source/Orts.Simulation/Simulation/Simulator.cs
< Auto-merging Source/RunActivity/Viewer3D/Popups/HUDWindow.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 +91 -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 14c132b3244f1668072257cd8ff996e847d0313f
< 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/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs
< Auto-merging Source/RunActivity/Viewer3D/WebServices/SwitchPanel/SwitchOnPanelStatus.cs
Merging #1021 Various traincar operations windows fixes...
Source/Orts.Simulation/Simulation/Physics/Train.cs +5 -7
Source/RunActivity/Viewer3D/Cameras.cs +6 -2
Source/RunActivity/Viewer3D/Popups/OSDCars.cs +8 -2
Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs +180 -126
Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs +223 -54
Source/RunActivity/Viewer3D/Viewer.cs +6 -12
Source/RunActivity/Viewer3D/WebServices/TrainCarOperationsWebpage.cs +108 -25
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 2a59320004f2b1254b63d89e9cd62a240ac7e284
< Auto-merging Source/Orts.Simulation/Simulation/Physics/Train.cs
< Auto-merging Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs
< Auto-merging Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs
< Auto-merging Source/RunActivity/Viewer3D/WebServices/TrainCarOperationsWebpage.cs
Merging #1026 Fix for Multiplayer: remote trains chuff can't be heard https://bugs.launchpad.net/or/+bug/2092771...
Source/Orts.Simulation/Simulation/Physics/Train.cs +2 -2
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 6a89a97b056e3abb228f60fafa9ca438a836ffd7
< Auto-merging Source/Orts.Simulation/Simulation/Physics/Train.cs
Merging #1029 DynaTrax Support for Superelevation...
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/SuperElevation.cs +22 -7
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 94cc8db180d1780b6b1bf78068ee1f7fc071515d
< 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 #1031 Multiplayer Server, forked from Open Rails Ultimate; blueprint https://blueprints.launchpad.net/or/+spec/multiplayer-server...
Source/MultiPlayerServer/Assembly.cs +4 -0
Source/MultiPlayerServer/Host.cs +335 -0
Source/MultiPlayerServer/MultiPlayerServer.csproj +21 -0
Source/MultiPlayerServer/Program.cs +37 -0
Source/ORTS.sln +6 -0
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 34aa23ac2fbe89d6fcaee93319425e2a3f27f394
Merging #1033 Multiple signal light textures per signal...
Source/Documentation/Manual/appendices.rst +13 -0
Source/Orts.Formats.Msts/SignalConfigurationFile.cs +5 -0
Source/RunActivity/Viewer3D/Signals.cs +29 -7
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 7efd35535a23c4dda622121c5f74cbf240a205c3
Merging #1036 Trans: update Spanish...
Source/Locales/Contrib/Contrib.pot +4 -4
Source/Locales/Menu/Menu.pot +254 -230
Source/Locales/Menu/es.po +1,249 -599
Source/Locales/ORTS.Common/ORTS.Common.pot +2 -2
Source/Locales/ORTS.Menu/ORTS.Menu.pot +2 -2
Source/Locales/ORTS.Menu/es.po +29 -22
Source/Locales/ORTS.Settings/ORTS.Settings.pot +2 -2
Source/Locales/Orts.Formats.OR/Orts.Formats.OR.pot +2 -2
Source/Locales/Orts.Simulation/Orts.Simulation.pot +81 -77
Source/Locales/RunActivity/RunActivity.pot +300 -295
Source/Locales/Updater/Updater.pot +2 -2
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 8c427b01b2a47240ba6c30233aec99268dd687db
Merging #1039 Fix: Adjusts Menu for longer text (Russian)...
Source/Menu/MainForm.Designer.cs +2 -2
Source/Menu/MainForm.resx +3 -0
Source/Menu/Options.Designer.cs +239 -236
Source/Menu/Options.resx +0 -3
Source/Menu/ResumeForm.Designer.cs +81 -79
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 892018cb4a0e8ac8add1de0711abe88ea7318a96
< Auto-merging Source/Menu/Options.Designer.cs
< CONFLICT (content): Merge conflict in Source/Menu/Options.Designer.cs
< Auto-merging Source/Menu/Options.resx
< CONFLICT (content): Merge conflict in Source/Menu/Options.resx
< Automatic merge failed; fix conflicts and then commit the result.
> git --no-pager reset --hard
< HEAD is now at aac619291 Merge commit '8c427b01b2a47240ba6c30233aec99268dd687db' into HEAD
> git --no-pager clean --force -d -x
Error: git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 892018cb4a0e8ac8add1de0711abe88ea7318a96 failed: 1
Merging #1041 Trans: updated Portuguese translations...
Source/Locales/ORTS.Menu/pt-PT.po +7 -7
Source/Locales/ORTS.Menu/pt_PT.po +0 -1,366
Source/Locales/Orts.Formats.OR/pt-PT.po +18 -0
Source/Locales/Orts.Simulation/pt_PT.po +2,962 -0
Source/Locales/Updater/pt-PT.po +17 -0
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 748d6c121aa13ee581bfb680e652b007a5d9bcbc
Merging #1047 Docs: adds translation docs...
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change b7152dc2f9540957120ecfd2a951103e3ffa07e7
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 83b959ae0 Merge commit 'b7152dc2f9540957120ecfd2a951103e3ffa07e7' 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 #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
Merging #1000 Locomotive operation from control car...
Source/Documentation/Manual/cabs.rst +25 -5
Source/Documentation/Manual/features-rollingstock.rst +93 -5
Source/Documentation/Manual/physics.rst +144 -6
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 +57 -8
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/ControlCarPowerSupply.cs +33 -7
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 +135 -33
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 +47 -133
Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs +1 -3
Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs +38 -27
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/BrakeController.cs +1 -0
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/Battery.cs +106 -0
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/CircuitBreaker.cs +14 -4
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/ControlCarPowerSupply.cs +64 -12
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 -6
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 +67 -40
Source/RunActivity/Viewer3D/RollingStock/MSTSControlTrailerCarViewer.cs +78 -0
Source/RunActivity/Viewer3D/RollingStock/MSTSDieselLocomotiveViewer.cs +2 -2
Source/RunActivity/Viewer3D/RollingStock/MSTSElectricLocomotiveViewer.cs +1 -1
Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs +106 -9
Source/RunActivity/Viewer3D/Trains.cs +1 -0
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change d9ab01c2746c87abbdac41d5aebaf96547211ab2
< 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
< CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/Simulator.cs
< Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
< Auto-merging Source/RunActivity/Viewer3D/Trains.cs
< Automatic merge failed; fix conflicts and then commit the result.
> git --no-pager reset --hard
< HEAD is now at d29cb8c11 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 d9ab01c2746c87abbdac41d5aebaf96547211ab2 failed: 1
Merging #1044 Trans: Updated German text...
Source/Locales/Contrib/de.po +796 -498
Source/Locales/Menu/de.po +923 -562
Source/Locales/ORTS.Common/de.po +464 -256
Source/Locales/ORTS.Menu/de.po +9 -10
Source/Locales/ORTS.Settings/de.po +129 -8
Source/Locales/Orts.Formats.OR/de.po +6 -5
Source/Locales/Updater/de.po +4 -4
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 359d57c8f580babcd45d08cba01b7b8e839b24e3
Pull requests successfully auto-merged (14):
#900 DMI in 3D cab + two more dials
#892 Signal Function OPP_SIG_ID_TRAINPATH
#961 Improvements for Power Supplies
#1015 Enhancements for EP brakes
#1021 Various traincar operations windows fixes
#1026 Fix for Multiplayer: remote trains chuff can't be heard https://bugs.launchpad.net/or/+bug/2092771
#1029 DynaTrax Support for Superelevation
#1031 Multiplayer Server, forked from Open Rails Ultimate; blueprint https://blueprints.launchpad.net/or/+spec/multiplayer-server
#1033 Multiple signal light textures per signal
#1036 Trans: update Spanish
#1041 Trans: updated Portuguese translations
#1047 Docs: adds translation docs
#896 First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains
#1044 Trans: Updated German text
Pull requests not auto-merged (4):
#1030 Refactor settings, in prep for settings exporter
#1039 Fix: Adjusts Menu for longer text (Russian)
#1007 Russian localization up to 2025 Jan 3-rd
#1000 Locomotive operation from control car
No changes to push into merge branch
> git --no-pager checkout --quiet unstable
Open Rails Code Bot finished at 2025-02-22 08:52:36Z
|
