Source of /projects/or
# CLASS project_summary_box
# BREAKOUT right
# CLASS heading
Project Summary
Author: "Open Rails Team" <http://openrails.org> property:[dbpedia-owl:developer] xmlns:dbpedia-owl:[http://dbpedia.org/ontology/]
Language: "*C#*" <https://wikipedia.org/wiki/C_Sharp_(programming_language)> property:[dbpedia-owl:language] xmlns:dbpedia-owl:[http://dbpedia.org/ontology/] resource:[http://dbpedia.org/resource/C_Sharp_(programming_language)]
License: "*GPL-3.0-only*" <https://opensource.org/license/gpl-3-0/> rel:[license] property:[dbpedia-owl:license] xmlns:dbpedia-owl:[http://dbpedia.org/ontology/]
Browse: "Builds" <or/builds>, "Log" <or/log>, "Triage" <or/triage>, "Documentation" <or/documentation>, "Repository" <https://git.launchpad.net/or>
Last automatic build: "U2025.04.29-1723 2025-04-29 18:28:09" <or/builds/2025-04-29_18-28-09_U2025.04.29-1723/Open Rails U2025.04.29-1723 2025-04-29 18-28-09.zip>
Build status: <image:or/ci_status.svg>
Last changed: *2025-04-30 21:06:23*
*git clone https:@//git.launchpad.net/or*
# BREAKOUT END
# CLASS cps-page-title-reversed
Silver's Simple Site @- Projects @- Open Rails
**********************************************
# BREAKOUT left
<image:or/logo.png> property:[dbpprop:logo] xmlns:dbpprop:[http://dbpedia.org/property/]
# BREAKOUT END
# property rdfs:comment
# xmlns:rdfs http://www.w3.org/2000/01/rdf-schema#
Open Rails is a train simulator that supports the world's largest range of digital content. Accurate behaviour for steam, diesel and electric traction including trains with multiple locos. Signals which correctly protect the train and permit complex timetabled operations. Multi-user mode in which any timetabled train can be driven in person or by computer.
# CLASS clearfix
-
Preview
=======
# BORDER 1px #000000
# BACKGROUND #000000
# COLOR #FFFFFF
||Open Rails Code Bot started at 2025-04-30 22:37:13Z
||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
|| #1013 Tools for reverse engineering shape and ace files (converting)
|| By: Hirek193
|| Branch: master
|| 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: 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
|| #1072 Content Creation Shortcuts
|| By: SteelFill
|| Branch: creation_automation
|| Draft: True
|| Labels:
|| Allowed to auto-merge? True
|| #1074 Gradient - commit 2024-16-12
|| By: Roeterdink
|| Branch: Gradient
|| Draft: False
|| Labels: enhancement
|| Allowed to auto-merge? True
|| #1076 Allow depart early
|| By: Roeterdink
|| Branch: AllowDepartEarly
|| Draft: False
|| Labels: enhancement
|| Allowed to auto-merge? True
|| #1077 Fix SME brakes not working
|| By: cesarBLG
|| Branch: sme-regression-fix
|| Draft: False
|| Labels: bug
|| Allowed to auto-merge? True
|| #1078 Default PowerSupply script for steam locomotives
|| By: cesarBLG
|| Branch: steam-locomotive-script
|| Draft: False
|| Labels: bug
|| Allowed to auto-merge? True
|| #1079 Adds Polish transations
|| By: cjakeman
|| Branch: translate-po
|| Draft: False
|| Labels: locales
|| Allowed to auto-merge? True
|| #1081 Brake cuts power unification
|| By: cesarBLG
|| Branch: brake-cuts-power
|| Draft: True
|| Labels: enhancement
|| Allowed to auto-merge? True
|| #1082 Allow variable water level in glass gauge
|| By: peternewell
|| Branch: water_gauge#1
|| Draft: False
|| Labels: enhancement for-unstable
|| Allowed to auto-merge? True
|| #1083 Menu contents route name clash
|| By: sweiland-openrails
|| Branch: MenuRouteNameClash
|| Draft: False
|| Labels: bug
|| Allowed to auto-merge? True
||Pull requests suitable for auto-merging (19):
|| #570 glTF 2.0 support with PBR lighting
|| #1062 Train Forces popup Window.
|| #1064 Add Train Info tab to Help window (F1)
|| #1066 Log derailment, using TraceInformation.
|| #1082 Allow variable water level in glass gauge
|| #892 Signal Function OPP_SIG_ID_TRAINPATH
|| #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
|| #1074 Gradient - commit 2024-16-12
|| #1076 Allow depart early
|| #1077 Fix SME brakes not working
|| #1078 Default PowerSupply script for steam locomotives
|| #1079 Adds Polish transations
|| #1083 Menu contents route name clash
|| #1055 Route Based TTrack Sounds
|| #1072 Content Creation Shortcuts
|| #1081 Brake cuts power unification
||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 efef899c9 Automatic merge of T1.5.1-1741-gf80cfb5d1 and 21 pull requests
|| > git --no-pager clean --force -d -x
|| > git --no-pager checkout --quiet --detach a440b33f8df981a8341fd2bf4d50ff2752da226e
||Merging #570 glTF 2.0 support with PBR lighting...
|| Source/3rdPartyLibs/glTFLoader/Build_Instructions.txt +10 -0
|| Source/3rdPartyLibs/glTFLoader/animation.channel.target.schema.json +40 -0
|| Source/3rdPartyLibs/glTFLoader/extras.schema.json +13 -0
|| Source/ORTS.Common/ConsistGenerator.cs +198 -0
|| Source/Orts.Formats.Msts/ConsistFile.cs +11 -0
|| Source/Orts.Settings/UserSettings.cs +4 -0
|| Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs +7 -0
|| Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs +3 -1
|| Source/Orts.Simulation/Simulation/RollingStocks/RollingStock.cs +4 -1
|| Source/Orts.Simulation/Simulation/Simulator.cs +2 -2
|| Source/RunActivity/Content/EnvMapDay/images.txt +3 -0
|| Source/RunActivity/Content/SceneryShader.fx +814 -197
|| Source/RunActivity/Content/ShadowMap.fx +146 -10
|| Source/RunActivity/RunActivity.csproj +27 -0
|| Source/RunActivity/Viewer3D/AnimatedPart.cs +57 -21
|| Source/RunActivity/Viewer3D/Cameras.cs +24 -0
|| Source/RunActivity/Viewer3D/Forest.cs +1 -1
|| Source/RunActivity/Viewer3D/GltfShape.cs +2,073 -0
|| Source/RunActivity/Viewer3D/Lights.cs +83 -36
|| Source/RunActivity/Viewer3D/Materials.cs +434 -85
|| Source/RunActivity/Viewer3D/Processes/RenderProcess.cs +5 -0
|| Source/RunActivity/Viewer3D/RenderFrame.cs +194 -7
|| Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs +1 -2
|| Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs +50 -53
|| Source/RunActivity/Viewer3D/Shaders.cs +165 -28
|| Source/RunActivity/Viewer3D/Shapes.cs +141 -39
|| Source/RunActivity/Viewer3D/Terrain.cs +3 -3
|| Source/RunActivity/Viewer3D/Transfers.cs +1 -2
|| Source/RunActivity/Viewer3D/Water.cs +2 -3
|| > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 362e4e7900dc521f5e7a4868a382f03052b39a39
|| < Auto-merging Source/Orts.Settings/UserSettings.cs
|| < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
|| < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs
|| < Auto-merging Source/Orts.Simulation/Simulation/Simulator.cs
|| < Auto-merging Source/RunActivity/Viewer3D/Materials.cs
|| < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
|| < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs
|| < Auto-merging Source/RunActivity/Viewer3D/Shapes.cs
||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 bbc00137d1bc6c84eb311549177749aeeea0e13b
|| < Auto-merging Source/Orts.Settings/InputSettings.cs
|| < Auto-merging Source/Orts.Settings/UserSettings.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 cb510d61a6b033b9148e21d5b8bae99f32a18a1d
|| < 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 #1082 Allow variable water level in glass gauge...
|| Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs +104 -0
|| > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change a3128ae0b5fc79c21c5036f38037a80835bf01ad
||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 #1057 Switchable brake system...
|| Source/Documentation/Manual/physics.rst +70 -2
|| Source/Orts.Common/Conversions.cs +1 -1
|| Source/Orts.Parsers.Msts/STFReader.cs +2 -3
|| Source/Orts.Simulation/Simulation/AIs/AITrain.cs +1 -0
|| Source/Orts.Simulation/Simulation/Physics/Train.cs +40 -25
|| Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs +435 -647
|| Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/BrakeSystem.cs +76 -1
|| Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs +236 -100
|| Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/EPBrakeSystem.cs +4 -5
|| Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/MSTSBrakeSystem.cs +0 -11
|| Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/ManualBraking.cs +5 -4
|| Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/SMEBrakeSystem.cs +3 -2
|| Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/SingleTransferPipe.cs +10 -15
|| Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/StraightVacuumSinglePipe.cs +6 -5
|| Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/VacuumSinglePipe.cs +73 -16
|| Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs +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 84592f7d8404819c220c8b773c9af76750c7b12e
|| < Auto-merging Source/Documentation/Manual/physics.rst
|| < Auto-merging Source/Orts.Common/Conversions.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/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 +65 -0
|| Source/Orts.Parsers.Msts/STFReader.cs +27 -0
|| Source/Orts.Simulation/Simulation/RollingStocks/MSTSControlTrailerCar.cs +1 -1
|| Source/Orts.Simulation/Simulation/RollingStocks/MSTSDieselLocomotive.cs +66 -172
|| Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs +280 -166
|| 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 +69 -50
|| Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselEngine.cs +4 -10
|| Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselPowerSupply.cs +4 -0
|| 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 13ab98ba823077a42927cf802b7888b383ba7cf7
|| < Auto-merging Source/Documentation/Manual/physics.rst
|| < Auto-merging Source/Orts.Parsers.Msts/STFReader.cs
|| < 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/MSTSSteamLocomotive.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 b4d235457 Merge commit '84592f7d8404819c220c8b773c9af76750c7b12e' into HEAD
|| > git --no-pager clean --force -d -x
|| Error: git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 13ab98ba823077a42927cf802b7888b383ba7cf7 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 99fc9ac21010b517bfba345dfb3c1d8cb2d3ca22
|| < 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 #1074 Gradient - commit 2024-16-12...
|| Source/Orts.Simulation/Simulation/AIs/AITrain.cs +1 -1
|| Source/Orts.Simulation/Simulation/Timetables/ProcessTimetable.cs +55 -0
|| Source/Orts.Simulation/Simulation/Timetables/TTTrain.cs +87 -1
|| > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change e9a66c166e6d9ed110d7087933636efcd60c1b9f
|| < Auto-merging Source/Orts.Simulation/Simulation/AIs/AITrain.cs
|| < Auto-merging Source/Orts.Simulation/Simulation/Timetables/ProcessTimetable.cs
|| < Auto-merging Source/Orts.Simulation/Simulation/Timetables/TTTrain.cs
||Merging #1076 Allow depart early...
|| Source/Orts.Formats.Msts/SignalConfigurationFile.cs +9 -0
|| Source/Orts.Formats.Msts/SignalScripts.cs +1 -0
|| Source/Orts.Simulation/Common/Events.cs +5 -0
|| Source/Orts.Simulation/Simulation/AIs/AITrain.cs +4 -2
|| Source/Orts.Simulation/Simulation/Physics/Train.cs +63 -14
|| Source/Orts.Simulation/Simulation/Signalling/SIGSCRfile.cs +12 -0
|| Source/Orts.Simulation/Simulation/Signalling/SignalHead.cs +13 -0
|| Source/Orts.Simulation/Simulation/Signalling/SignalObject.cs +88 -0
|| Source/Orts.Simulation/Simulation/Simulator.cs +7 -0
|| Source/Orts.Simulation/Simulation/Timetables/ProcessTimetable.cs +136 -27
|| Source/Orts.Simulation/Simulation/Timetables/TTTrain.cs +558 -52
|| Source/RunActivity/Viewer3D/Popups/NextStationWindow.cs +195 -17
|| Source/RunActivity/Viewer3D/Popups/TTRequestStopWindow.cs +123 -0
|| Source/RunActivity/Viewer3D/Viewer.cs +21 -0
|| > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 3bbd5376026833cb5cfaff7a95c31bae0be84200
|| < Auto-merging Source/Orts.Formats.Msts/SignalConfigurationFile.cs
|| < Auto-merging Source/Orts.Formats.Msts/SignalScripts.cs
|| < 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/Signalling/SIGSCRfile.cs
|| < Auto-merging Source/Orts.Simulation/Simulation/Signalling/SignalHead.cs
|| < Auto-merging Source/Orts.Simulation/Simulation/Signalling/SignalObject.cs
|| < Auto-merging Source/Orts.Simulation/Simulation/Simulator.cs
|| < Auto-merging Source/Orts.Simulation/Simulation/Timetables/ProcessTimetable.cs
|| < Auto-merging Source/Orts.Simulation/Simulation/Timetables/TTTrain.cs
|| < Auto-merging Source/RunActivity/Viewer3D/Viewer.cs
||Merging #1077 Fix SME brakes not working...
|| Source/Orts.Simulation/Simulation/Physics/Train.cs +2 -2
|| > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 7e73abd7eaab0c2d01ff61fc4c255f58249ff9f9
|| < Auto-merging Source/Orts.Simulation/Simulation/Physics/Train.cs
||Merging #1078 Default PowerSupply script for steam locomotives...
|| Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs +1 -1
|| Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/ElectricTrainSupplySwitch.cs +4 -3
|| Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/SteamPowerSupply.cs +65 -186
|| > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 9ab642ec320385e632c70ae869ff248b7dc2b89d
|| < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs
||Merging #1079 Adds Polish transations...
|| Source/Locales/Contrib/Contrib.pot +2 -2
|| Source/Locales/Contrib/pl.po +1,992 -0
|| Source/Locales/Menu/Menu.pot +318 -278
|| Source/Locales/Menu/pl.po +1,849 -0
|| Source/Locales/ORTS.Common/ORTS.Common.pot +19 -11
|| Source/Locales/ORTS.Common/pl.po +1,487 -0
|| Source/Locales/ORTS.Menu/ORTS.Menu.pot +2 -2
|| Source/Locales/ORTS.Menu/pl.po +70 -0
|| Source/Locales/ORTS.Settings/ORTS.Settings.pot +2 -2
|| Source/Locales/ORTS.Settings/pl.po +154 -0
|| Source/Locales/Orts.Formats.OR/Orts.Formats.OR.pot +2 -2
|| Source/Locales/Orts.Formats.OR/pl.po +19 -0
|| Source/Locales/Orts.Simulation/Orts.Simulation.pot +787 -753
|| Source/Locales/Orts.Simulation/pl.po +3,405 -0
|| Source/Locales/RunActivity/RunActivity.pot +262 -262
|| Source/Locales/RunActivity/pl.po +3,483 -0
|| Source/Locales/Updater/Updater.pot +2 -2
|| Source/Locales/Updater/pl.po +17 -0
|| > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 5e37059b7e6735afa5709e706f52227d0805f28c
|| < Auto-merging Source/Locales/Contrib/Contrib.pot
|| < Auto-merging Source/Locales/Menu/Menu.pot
|| < Auto-merging Source/Locales/ORTS.Common/ORTS.Common.pot
|| < Auto-merging Source/Locales/ORTS.Menu/ORTS.Menu.pot
|| < Auto-merging Source/Locales/ORTS.Settings/ORTS.Settings.pot
|| < Auto-merging Source/Locales/Orts.Formats.OR/Orts.Formats.OR.pot
|| < Auto-merging Source/Locales/Orts.Simulation/Orts.Simulation.pot
|| < Auto-merging Source/Locales/RunActivity/RunActivity.pot
|| < Auto-merging Source/Locales/Updater/Updater.pot
||Merging #1083 Menu contents route name clash...
|| Source/Menu/ContentForm.Designer.cs +4 -2
|| Source/Menu/ContentForm.cs +99 -6
|| > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 7e6fb604e532fdedce068794fc657b8cf70fa6c3
||Merging #1055 Route Based TTrack Sounds...
|| Build.cmd +6 -9
|| Source/Documentation/Manual/appendices.rst +0 -13
|| Source/Documentation/Manual/cabs.rst +5 -45
|| Source/Documentation/Manual/features-rollingstock.rst +5 -93
|| Source/Documentation/Manual/multiplayer.rst +0 -21
|| Source/Documentation/Manual/physics.rst +22 -181
|| Source/Documentation/Manual/sound.rst +2 -2
|| Source/Locales/Menu/de.po +3 -3
|| Source/Locales/RunActivity/de.po +16 -16
|| Source/Menu/Notifications/NotificationManager.cs +62 -23
|| Source/Menu/Notifications/Notifications.cs +19 -44
|| Source/MultiPlayerServer/Assembly.cs +0 -4
|| Source/MultiPlayerServer/Host.cs +0 -335
|| Source/MultiPlayerServer/MultiPlayerServer.csproj +0 -21
|| Source/MultiPlayerServer/Program.cs +0 -37
|| Source/ORTS.sln +0 -6
|| Source/Orts.Common/Conversions.cs +0 -15
|| Source/Orts.Formats.Msts/CabViewFile.cs +1 -15
|| Source/Orts.Formats.Msts/RouteFile.cs +8 -1
|| Source/Orts.Formats.Msts/SignalConfigurationFile.cs +0 -5
|| Source/Orts.Formats.Msts/SoundManagmentFile.cs +29 -2
|| Source/Orts.Parsers.Msts/STFReader.cs +0 -17
|| Source/Orts.Simulation/Common/Commands.cs +7 -56
|| Source/Orts.Simulation/Common/Events.cs +2 -13
|| Source/Orts.Simulation/Common/Scripting/BrakeController.cs +1 -2
|| Source/Orts.Simulation/Common/Scripting/Commands.cs +1 -60
|| Source/Orts.Simulation/Common/Scripting/Common.cs +0 -22
|| Source/Orts.Simulation/Common/Scripting/PowerSupply/CircuitBreaker.cs +0 -8
|| Source/Orts.Simulation/Common/Scripting/PowerSupply/Controllers/PantographSelector.cs +0 -138
|| Source/Orts.Simulation/Common/Scripting/PowerSupply/Controllers/PowerLimitationSelector.cs +0 -138
|| Source/Orts.Simulation/Common/Scripting/PowerSupply/Controllers/VoltageSelector.cs +0 -138
|| Source/Orts.Simulation/Common/Scripting/PowerSupply/DieselPowerSupply.cs +10 -63
|| Source/Orts.Simulation/Common/Scripting/PowerSupply/DualModePowerSupply.cs +11 -158
|| Source/Orts.Simulation/Common/Scripting/PowerSupply/ElectricPowerSupply.cs +12 -124
|| Source/Orts.Simulation/Common/Scripting/PowerSupply/LocomotivePowerSupply.cs +27 -458
|| Source/Orts.Simulation/Common/Scripting/PowerSupply/PassengerCarPowerSupply.cs +19 -59
|| Source/Orts.Simulation/Common/Scripting/PowerSupply/PowerSupply.cs +10 -45
|| Source/Orts.Simulation/Common/Scripting/PowerSupply/TractionCutOffSubsytem.cs +1 -31
|| Source/Orts.Simulation/Common/Scripting/TrainControlSystem.cs +5 -43
|| Source/Orts.Simulation/Simulation/Physics/Train.cs +106 -13
|| Source/Orts.Simulation/Simulation/RollingStocks/MSTSControlTrailerCar.cs +3 -2
|| Source/Orts.Simulation/Simulation/RollingStocks/MSTSDieselLocomotive.cs +20 -35
|| Source/Orts.Simulation/Simulation/RollingStocks/MSTSElectricLocomotive.cs +9 -32
|| Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs +4 -30
|| Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs +10 -16
|| Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs +76 -8
|| Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs +58 -131
|| Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/EPBrakeSystem.cs +15 -98
|| Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/MSTSBrakeSystem.cs +1 -14
|| Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/ManualBraking.cs +9 -18
|| Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/SMEBrakeSystem.cs +4 -4
|| Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/SingleTransferPipe.cs +3 -4
|| Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/StraightVacuumSinglePipe.cs +2 -19
|| Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/VacuumSinglePipe.cs +4 -5
|| Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/BrakeController.cs +0 -1
|| Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/Battery.cs +0 -157
|| Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/{Controllers => }/BatterySwitch.cs +6 -11
|| Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/CircuitBreaker.cs +4 -14
|| Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/Controllers/PantographSelector.cs +0 -232
|| Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/Controllers/PowerLimitationSelector.cs +0 -231
|| Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/Controllers/VoltageSelector.cs +0 -243
|| Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselEngine.cs +1 -0
|| Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselPowerSupply.cs +34 -22
|| Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DualModePowerSupply.cs +27 -107
|| Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/ElectricPowerSupply.cs +31 -69
|| Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/ILocomotivePowerSupply.cs +6 -17
|| Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/IPowerSupply.cs +3 -6
|| Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/LocomotivePowerSupply.cs +189 -89
|| Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/{Controllers => }/MasterKey.cs +2 -2
|| Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/Pantograph.cs +2 -9
|| Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/PassengerCarPowerSupply.cs +103 -105
|| Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/SteamEngine.cs +49 -0
|| Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/SteamPowerSupply.cs +20 -128
|| Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/TractionCutOffRelay.cs +2 -133
|| Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/TrainControlSystem.cs +12 -8
|| Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs +169 -30
|| Source/Orts.Simulation/Simulation/Simulator.cs +40 -49
|| Source/Orts.Simulation/Simulation/Traveller.cs +3 -6
|| Source/RunActivity/Viewer3D/Cameras.cs +3 -10
|| Source/RunActivity/Viewer3D/Popups/CarOperationsWindow.cs +1 -1
|| Source/RunActivity/Viewer3D/Popups/HUDWindow.cs +1 -1
|| Source/RunActivity/Viewer3D/Popups/OSDCars.cs +2 -8
|| Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs +129 -183
|| Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs +59 -229
|| Source/RunActivity/Viewer3D/Processes/GameStateRunActivity.cs +3 -5
|| Source/RunActivity/Viewer3D/RollingStock/MSTSDieselLocomotiveViewer.cs +2 -2
|| Source/RunActivity/Viewer3D/RollingStock/MSTSElectricLocomotiveViewer.cs +1 -1
|| Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs +11 -90
|| Source/RunActivity/Viewer3D/Shapes.cs +0 -8
|| Source/RunActivity/Viewer3D/Signals.cs +7 -29
|| Source/RunActivity/Viewer3D/Sound.cs +118 -26
|| Source/RunActivity/Viewer3D/Viewer.cs +251 -56
|| Source/RunActivity/Viewer3D/WebServices/SwitchPanel/SwitchOnPanelDefinition.cs +1 -1
|| Source/RunActivity/Viewer3D/WebServices/SwitchPanel/SwitchOnPanelStatus.cs +1 -1
|| Source/RunActivity/Viewer3D/WebServices/TrainCarOperationsWebpage.cs +26 -109
|| > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 377074652c4a21a5a6015e587b1b971bd40a1cf4
|| < Auto-merging Source/Documentation/Manual/cabs.rst
|| < Auto-merging Source/Documentation/Manual/physics.rst
|| < Auto-merging Source/Documentation/Manual/sound.rst
|| < Auto-merging Source/Orts.Common/Conversions.cs
|| < Auto-merging Source/Orts.Formats.Msts/SignalConfigurationFile.cs
|| < Auto-merging Source/Orts.Parsers.Msts/STFReader.cs
|| < Auto-merging Source/Orts.Simulation/Common/Commands.cs
|| < Auto-merging Source/Orts.Simulation/Common/Events.cs
|| < Auto-merging Source/Orts.Simulation/Common/Scripting/PowerSupply/LocomotivePowerSupply.cs
|| < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Common/Scripting/PowerSupply/LocomotivePowerSupply.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/MSTSControlTrailerCar.cs
|| < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/MSTSControlTrailerCar.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
|| < 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
|| < CONFLICT (content): Merge conflict in 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
|| < CONFLICT (content): Merge conflict in 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/SubSystems/PowerSupplies/SteamPowerSupply.cs
|| < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/SteamPowerSupply.cs
|| < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/TrainControlSystem.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/Cameras.cs
|| < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/Cameras.cs
|| < Auto-merging Source/RunActivity/Viewer3D/Popups/CarOperationsWindow.cs
|| < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/Popups/CarOperationsWindow.cs
|| < Auto-merging Source/RunActivity/Viewer3D/Popups/HUDWindow.cs
|| < Auto-merging Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs
|| < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs
|| < Auto-merging Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs
|| < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs
|| < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
|| < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
|| < Auto-merging Source/RunActivity/Viewer3D/Shapes.cs
|| < Auto-merging Source/RunActivity/Viewer3D/Viewer.cs
|| < Auto-merging Source/RunActivity/Viewer3D/WebServices/SwitchPanel/SwitchOnPanelDefinition.cs
|| < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/WebServices/SwitchPanel/SwitchOnPanelDefinition.cs
|| < Auto-merging Source/RunActivity/Viewer3D/WebServices/SwitchPanel/SwitchOnPanelStatus.cs
|| < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/WebServices/SwitchPanel/SwitchOnPanelStatus.cs
|| < Auto-merging Source/RunActivity/Viewer3D/WebServices/TrainCarOperationsWebpage.cs
|| < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/WebServices/TrainCarOperationsWebpage.cs
|| < Automatic merge failed; fix conflicts and then commit the result.
|| > git --no-pager reset --hard
|| < HEAD is now at f9016648b Merge commit '7e6fb604e532fdedce068794fc657b8cf70fa6c3' into HEAD
|| > git --no-pager clean --force -d -x
|| Error: git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 377074652c4a21a5a6015e587b1b971bd40a1cf4 failed: 1
||Merging #1072 Content Creation Shortcuts...
|| Source/Documentation/Manual/features-rollingstock.rst +123 -3
|| Source/Documentation/Manual/physics.rst +66 -41
|| Source/Orts.Common/Conversions.cs +32 -1
|| Source/Orts.Parsers.Msts/STFReader.cs +6 -6
|| Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs +457 -194
|| Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/FreightAnimations.cs +3 -0
|| Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs +26 -17
|| > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 073cb17630e79e831978a53db958fe0c583c8639
|| < Auto-merging Source/Documentation/Manual/physics.rst
|| < Auto-merging Source/Orts.Common/Conversions.cs
|| < CONFLICT (content): Merge conflict in Source/Orts.Common/Conversions.cs
|| < Auto-merging Source/Orts.Parsers.Msts/STFReader.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
|| < Automatic merge failed; fix conflicts and then commit the result.
|| > git --no-pager reset --hard
|| < HEAD is now at f9016648b Merge commit '7e6fb604e532fdedce068794fc657b8cf70fa6c3' into HEAD
|| > git --no-pager clean --force -d -x
|| Error: git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 073cb17630e79e831978a53db958fe0c583c8639 failed: 1
||Merging #1081 Brake cuts power unification...
|| Source/Documentation/Manual/physics.rst +7 -3
|| Source/Orts.Simulation/Common/Scripting/TrainControlSystem.cs +7 -2
|| Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs +3 -4
|| Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs +14 -0
|| Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/VacuumSinglePipe.cs +3 -9
|| Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/TrainControlSystem.cs +3 -3
|| > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 689494b6b368013f482453a41bb0c82c0bbe6ed9
|| < Auto-merging Source/Documentation/Manual/physics.rst
|| < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
|| < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs
|| < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/VacuumSinglePipe.cs
|| < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/TrainControlSystem.cs
||Pull requests successfully auto-merged (16):
|| #570 glTF 2.0 support with PBR lighting
|| #1062 Train Forces popup Window.
|| #1064 Add Train Info tab to Help window (F1)
|| #1066 Log derailment, using TraceInformation.
|| #1082 Allow variable water level in glass gauge
|| #892 Signal Function OPP_SIG_ID_TRAINPATH
|| #1057 Switchable brake system
|| #1069 Mouse wheel control only with Alt â Followup for #1051
|| #1070 Fix a NullReferenceException in TCS scripts
|| #1074 Gradient - commit 2024-16-12
|| #1076 Allow depart early
|| #1077 Fix SME brakes not working
|| #1078 Default PowerSupply script for steam locomotives
|| #1079 Adds Polish transations
|| #1083 Menu contents route name clash
|| #1081 Brake cuts power unification
||Pull requests not auto-merged (3):
|| #1067 Traction and dynamic brake retardation
|| #1055 Route Based TTrack Sounds
|| #1072 Content Creation Shortcuts
||No changes to push into merge branch
|| > git --no-pager checkout --quiet unstable
||Open Rails Code Bot finished at 2025-04-30 22:37:39Z
Continuous Integration graphs
=============================
# CLASS project_graph
# BREAKOUT left
Test results
------------
<image:or/ci_tests.png> [Test results]
# BREAKOUT end
# CLASS project_graph
# BREAKOUT left
Static analysis violations
--------------------------
<image:or/ci_violations.png> [Static analysis violations]
# BREAKOUT end
# CLASS clearfix
-
Powered by the Content Parser System, copyright 2002 - 2025 James G. Ross.
|
