Project Summary

Author: Open Rails Team

Language: C#

License: GPL 3.0

Browse: Builds, Log, Triage, Documentation

Last automatic build: U2020.09.23-0721 2020-09-23 08:28:21

Build status:

Last changed: 2020-09-23 08:29:01

git clone https://git.launchpad.net/or

Silver's Simple Site - Projects - Open Rails

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.


Preview

Open Rails Code Bot started at 2020-09-25 18:36:07Z
GitHub organisation: openrails
GitHub team:         development-team
GitHub repository:   openrails
GitHub base branch:  master
GitHub merge branch: unstable
Team members (11):
 Sharpe49
 twpol
 cjakeman
 YoRyan
 perpetualKid
 strawberryfield
 peternewell
 Csantucci
 wjcurrey
 markus-GE
 mbm-OR
Open pull requests (9):
 #57 Ensure that build fails when tests fail to run
   By:     twpol
   Branch: bugfix/net4-test-runner
   Labels: not-for-unstable
   Allowed to auto-merge? False
 #79 Update version calculation for new unstable versions
   By:     twpol
   Branch: feature/unstable-version-numbers
   Labels:
   Allowed to auto-merge? True
 #95 https://blueprints.launchpad.net/or/+spec/temporary-options-for-activ.
   By:     peternewell
   Branch: activity_options
   Labels: enhancement not-for-unstable
   Allowed to auto-merge? False
 #105 refactor: Reformat all code with dotnet format
   By:     twpol
   Branch: feature/dotnet-format
   Labels:
   Allowed to auto-merge? True
 #230 Work in progress Monogame migration
   By:     twpol
   Branch: monogame/master
   Labels: not-for-unstable refactoring
   Allowed to auto-merge? False
 #232 JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
   By:     YoRyan
   Branch: nextgen-consists
   Labels: enhancement
   Allowed to auto-merge? True
 #267 New strings at Steamer's HUD translated Russian
   By:     Weter-ORTS
   Branch: master
   Labels: for-unstable locales
   Allowed to auto-merge? True
 #275 Adds index of parameters to Manual
   By:     cjakeman
   Branch: manual-index
   Labels: documentation
   Allowed to auto-merge? True
 #280 Manual Brake - Further update
   By:     peternewell
   Branch: manual-brake-1
   Labels: enhancement
   Allowed to auto-merge? True
Pull requests suitable for auto-merging (6):
 #79 Update version calculation for new unstable versions
 #105 refactor: Reformat all code with dotnet format
 #232 JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
 #267 New strings at Steamer's HUD translated Russian
 #275 Adds index of parameters to Manual
 #280 Manual Brake - Further update
Preparing repository...
 > git --no-pager fetch --update-head-ok
 > git --no-pager reset --hard
 < HEAD is now at da5582bd9 Automatic merge of X1.3.1-234-g38212ee58 and 6 pull requests
 > git --no-pager clean --force -d -x
 > git --no-pager checkout --quiet --detach 8ed5f385214793a60e148136a083822932cf0c67
Merging #79 Update version calculation for new unstable versions...
 > git --no-pager merge --quiet --no-edit --no-ff 7d9f14be82ec3bfc3c5ded65bc3503490d96083c
 < Auto-merging Build.cmd
Merging #105 refactor: Reformat all code with dotnet format...
 > git --no-pager merge --quiet --no-edit --no-ff 6ec4cc05b8c7930950f96b494327b882ce705379
 < Auto-merging Source/Tests/Orts.Parsers.OR/TimetableReaderTests.cs
 < CONFLICT (content): Merge conflict in Source/Tests/Orts.Parsers.OR/TimetableReaderTests.cs
 < Auto-merging Source/Tests/Orts.Parsers.Msts/StfReader.cs
 < CONFLICT (content): Merge conflict in Source/Tests/Orts.Parsers.Msts/StfReader.cs
 < Auto-merging Source/RunActivity/Viewer3D/Weather.cs
 < Auto-merging Source/RunActivity/Viewer3D/Viewer.cs
 < Auto-merging Source/RunActivity/Viewer3D/Sound.cs
 < Auto-merging Source/RunActivity/Viewer3D/Signals.cs
 < Auto-merging Source/RunActivity/Viewer3D/Shapes.cs
 < Auto-merging Source/RunActivity/Viewer3D/Shaders.cs
 < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs
 < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSSteamLocomotiveViewer.cs
 < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/RollingStock/MSTSSteamLocomotiveViewer.cs
 < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
 < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
 < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSElectricLocomotiveViewer.cs
 < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSDieselLocomotiveViewer.cs
 < Auto-merging Source/RunActivity/Viewer3D/RenderFrame.cs
 < Auto-merging Source/RunActivity/Viewer3D/Processes/GameStateRunActivity.cs
 < Auto-merging Source/RunActivity/Viewer3D/Popups/WindowText.cs
 < Auto-merging Source/RunActivity/Viewer3D/Popups/WindowManager.cs
 < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/Popups/WindowManager.cs
 < Auto-merging Source/RunActivity/Viewer3D/Popups/Window.cs
 < Auto-merging Source/RunActivity/Viewer3D/Popups/TrackMonitorWindow.cs
 < Auto-merging Source/RunActivity/Viewer3D/Popups/TTDetachWindow.cs
 < Auto-merging Source/RunActivity/Viewer3D/Popups/HelpWindow.cs
 < Auto-merging Source/RunActivity/Viewer3D/Popups/HUDWindow.cs
 < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/Popups/HUDWindow.cs
 < Auto-merging Source/RunActivity/Viewer3D/Materials.cs
 < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/Materials.cs
 < Auto-merging Source/RunActivity/Viewer3D/MSTSSky.cs
 < Auto-merging Source/RunActivity/Viewer3D/InfoDisplay.cs
 < Auto-merging Source/RunActivity/Viewer3D/Debugging/MessageViewer.cs
 < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/Debugging/MessageViewer.cs
 < Auto-merging Source/RunActivity/Viewer3D/Debugging/DebugViewerForm.cs
 < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/Debugging/DebugViewerForm.cs
 < Auto-merging Source/RunActivity/Viewer3D/Commands.cs
 < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/Commands.cs
 < Auto-merging Source/RunActivity/Viewer3D/Cameras.cs
 < Auto-merging Source/Orts.Simulation/Simulation/Turntables.cs
 < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/Turntables.cs
 < Auto-merging Source/Orts.Simulation/Simulation/Timetables/TTTrain.cs
 < Auto-merging Source/Orts.Simulation/Simulation/Timetables/TTPool.cs
 < Auto-merging Source/Orts.Simulation/Simulation/Timetables/ProcessTimetable.cs
 < Auto-merging Source/Orts.Simulation/Simulation/Timetables/PoolInfo.cs
 < Auto-merging Source/Orts.Simulation/Simulation/Simulator.cs
 < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/Simulator.cs
 < Auto-merging Source/Orts.Simulation/Simulation/Signalling/Signals.cs
 < Auto-merging Source/Orts.Simulation/Simulation/Signalling/SIGSCRfile.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/RollingStocks/SubSystems/TrainControlSystem.cs
 < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/TrainControlSystem.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerTransmissions/Axle.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/Pantograph.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselEngine.cs
 < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselEngine.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/CircuitBreaker.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/MSTSNotchController.cs
 < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/MSTSNotchController.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/MSTSBrakeController.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/BrakeController.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/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/MSTSWagon.cs
 < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
 < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSDieselLocomotive.cs
 < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/MSTSDieselLocomotive.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/LevelCrossing.cs
 < Auto-merging Source/Orts.Simulation/Simulation/Confirmer.cs
 < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/Confirmer.cs
 < Auto-merging Source/Orts.Simulation/Simulation/Activity.cs
 < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/Activity.cs
 < Auto-merging Source/Orts.Simulation/Simulation/AIs/AITrain.cs
 < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/AIs/AITrain.cs
 < Auto-merging Source/Orts.Simulation/Simulation/AIs/AIAuxAction.cs
 < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/AIs/AIAuxAction.cs
 < Auto-merging Source/Orts.Simulation/Simulation/AIs/AI.cs
 < Auto-merging Source/Orts.Simulation/MultiPlayer/Message.cs
 < Auto-merging Source/Orts.Simulation/Common/Scripting/ScriptManager.cs
 < Auto-merging Source/Orts.Simulation/Common/Events.cs
 < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Common/Events.cs
 < Auto-merging Source/Orts.Simulation/Common/Commands.cs
 < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Common/Commands.cs
 < Auto-merging Source/Orts.Parsers.Msts/STFReader.cs
 < Auto-merging Source/Orts.Parsers.Msts/Interpolator.cs
 < Auto-merging Source/Orts.Formats.OR/TimetableGroupFile.cs
 < Auto-merging Source/Orts.Formats.OR/TimetableFile.cs
 < Auto-merging Source/Orts.Formats.Msts/SignalConfigurationFile.cs
 < Auto-merging Source/Orts.Formats.Msts/CabViewFile.cs
 < CONFLICT (content): Merge conflict in Source/Orts.Formats.Msts/CabViewFile.cs
 < Auto-merging Source/Orts.Formats.Msts/ActivityFile.cs
 < Auto-merging Source/ORTS.Settings/UserSettings.cs
 < CONFLICT (content): Merge conflict in Source/ORTS.Settings/UserSettings.cs
 < Auto-merging Source/ORTS.Settings/InputSettings.cs
 < CONFLICT (content): Merge conflict in Source/ORTS.Settings/InputSettings.cs
 < Auto-merging Source/Menu/Options.cs
 < Auto-merging Source/Menu/MainForm.cs
 < CONFLICT (content): Merge conflict in Source/Menu/MainForm.cs
 < Auto-merging Source/Contrib/ActivityEditor/ActivityEditor/Engine/Viewer2D.cs
 < CONFLICT (content): Merge conflict in Source/Contrib/ActivityEditor/ActivityEditor/Engine/Viewer2D.cs
 < Auto-merging Source/Contrib/ActivityEditor/ActivityEditor/Engine/ActEditor.cs
 < CONFLICT (content): Merge conflict in Source/Contrib/ActivityEditor/ActivityEditor/Engine/ActEditor.cs
 < Automatic merge failed; fix conflicts and then commit the result.
 > git --no-pager reset --hard
 < HEAD is now at 4b8e32965 Merge commit '7d9f14be82ec3bfc3c5ded65bc3503490d96083c' into HEAD
 > git --no-pager clean --force -d -x
 Error: git merge --quiet --no-edit --no-ff 6ec4cc05b8c7930950f96b494327b882ce705379 failed: 1
Merging #232 JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor...
 > git --no-pager merge --quiet --no-edit --no-ff ee7a3e254ba7a5331499f9f934a0b0ee7519c8ba
 < Auto-merging Source/Orts.Simulation/Simulation/Timetables/ProcessTimetable.cs
 < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/Timetables/ProcessTimetable.cs
 < Auto-merging Source/Orts.Simulation/Orts.Simulation.csproj
 < Auto-merging Source/Menu/MainForm.cs
 < CONFLICT (content): Merge conflict in Source/Menu/MainForm.cs
 < Auto-merging Source/Documentation/Manual/timetable.rst
 < Automatic merge failed; fix conflicts and then commit the result.
 > git --no-pager reset --hard
 < HEAD is now at 4b8e32965 Merge commit '7d9f14be82ec3bfc3c5ded65bc3503490d96083c' into HEAD
 > git --no-pager clean --force -d -x
 Error: git merge --quiet --no-edit --no-ff ee7a3e254ba7a5331499f9f934a0b0ee7519c8ba failed: 1
Merging #267 New strings at Steamer's HUD translated Russian...
 > git --no-pager merge --quiet --no-edit --no-ff b3ab13fa8d6d11f4c006af54c43bf3099ce5cccb
Merging #275 Adds index of parameters to Manual...
 > git --no-pager merge --quiet --no-edit --no-ff dbb7dd9d4a477499dda72adebfaf84f4d3f7f45f
 < Auto-merging Source/Documentation/Manual/physics.rst
Merging #280 Manual Brake - Further update...
 > git --no-pager merge --quiet --no-edit --no-ff 320ae6b9ce6a459974b1c049945303f84f66855f
 < Auto-merging Source/Documentation/Manual/physics.rst
Pull requests successfully auto-merged (4):
 #79 Update version calculation for new unstable versions
 #267 New strings at Steamer's HUD translated Russian
 #275 Adds index of parameters to Manual
 #280 Manual Brake - Further update
Pull requests not auto-merged (2):
 #105 refactor: Reformat all code with dotnet format
 #232 JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
No changes to push into merge branch
 > git --no-pager checkout --quiet unstable
Open Rails Code Bot finished at 2020-09-25 18:36:14Z

Continuous Integration graphs

Build warnings

Source TODO/FIXME comments

Test results

Static analysis violations


Powered by the Content Parser System, copyright 2002 - 2020 James G. Ross.