Project Summary

Author: Open Rails Team

Language: C#

License: GPL 3.0

Browse: Builds, Log, Triage, Documentation

Last automatic build: U2021.06.23-0551 2021-06-23 06:58:14

Build status:

Last changed: 2021-06-21 02:33:43

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 2021-06-24 07:51:12Z
GitHub organisation: openrails
GitHub team:         development-team
GitHub repository:   openrails
GitHub base branch:  master
GitHub merge branch: unstable
Team members (13):
 Sharpe49
 twpol
 cjakeman
 pzgulyas
 YoRyan
 perpetualKid
 strawberryfield
 cesarBLG
 peternewell
 Csantucci
 wjcurrey
 markus-GE
 mbm-OR
Open pull requests (12):
 #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
 #389 Russian Localization Stage III
   By:     Weter-ORTS
   Branch: Weter-ORTS-patch-1
   Labels: locales
   Allowed to auto-merge? False
 #399 Power supply package
   By:     Sharpe49
   Branch: power-supply
   Labels: enhancement
   Allowed to auto-merge? True
 #408 Updating RailDriver SDK library to prepare for 64bit mode
   By:     perpetualKid
   Branch: RailDriverUpdate
   Labels: refactoring
   Allowed to auto-merge? True
 #412 New TCS function to get speed post information (including warning speed posts)
   By:     Sharpe49
   Branch: tcs-speed-post-features
   Labels: enhancement
   Allowed to auto-merge? True
 #417 Animated Clocks recognized by ClockHands without extern Files
   By:     jonas-or
   Branch: AnimatedClocks_RegByHands
   Labels: enhancement for-unstable help wanted
   Allowed to auto-merge? True
 #420 Delete Russian timetable.rst
   By:     YoRyan
   Branch: delete-timetable-rst
   Labels:
   Allowed to auto-merge? True
 #421 Added a reset command in order to reset a TCS emergency braking triggered by the simulator
   By:     Sharpe49
   Branch: tcs-eb-manuel-reset
   Labels: enhancement
   Allowed to auto-merge? True
 #422 Change alignment of couplers as they travel through curve.
   By:     peternewell
   Branch: advanced-couplers#2
   Labels: enhancement
   Allowed to auto-merge? True
 #427 Correct an Issue with Motive Force being incorrectly reduced by wagon braking force.
   By:     peternewell
   Branch: diesel-adhesion#2
   Labels: bug not-for-unstable
   Allowed to auto-merge? False
 #430 Blueprint https://blueprints.launchpad.net/or/+spec/train-driving-ui-window
   By:     mbm-OR
   Branch: blueprint/train-driving-ui-window
   Labels: enhancement
   Allowed to auto-merge? True
Pull requests suitable for auto-merging (9):
 #79 Update version calculation for new unstable versions
 #399 Power supply package
 #408 Updating RailDriver SDK library to prepare for 64bit mode
 #412 New TCS function to get speed post information (including warning speed posts)
 #417 Animated Clocks recognized by ClockHands without extern Files
 #420 Delete Russian timetable.rst
 #421 Added a reset command in order to reset a TCS emergency braking triggered by the simulator
 #422 Change alignment of couplers as they travel through curve.
 #430 Blueprint https://blueprints.launchpad.net/or/+spec/train-driving-ui-window
Preparing repository...
 > git --no-pager fetch --update-head-ok
 > git --no-pager reset --hard
 < HEAD is now at a2f236e3d Automatic merge of X1.3.1-370-g7df5318c2 and 8 pull requests
 > git --no-pager clean --force -d -x
 > git --no-pager checkout --quiet --detach 7df5318c27d1aeb0f1af51a1124a8cc2ac6b7dc5
Merging #79 Update version calculation for new unstable versions...
 > git --no-pager merge --quiet --no-edit --no-ff 7d9f14be82ec3bfc3c5ded65bc3503490d96083c
 < Auto-merging Build.cmd
Merging #399 Power supply package...
 > git --no-pager merge --quiet --no-edit --no-ff 224d3cac5c14b67b8b4d19600c8d30a162c47c25
 < Removing Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/AbstractPowerSupply.cs
 < Removing Source/Orts.Simulation/Common/Scripting/PowerSupply/AbstractPowerSupply.cs
Merging #408 Updating RailDriver SDK library to prepare for 64bit mode...
 > git --no-pager merge --quiet --no-edit --no-ff e77a86a481c79bc016bbb7f9dcc3a369259bae2d
 < Auto-merging Source/RunActivity/RunActivity.csproj
 < Removing Source/3rdPartyLibs/PIEHidDotNet.dll
Merging #412 New TCS function to get speed post information (including warning speed posts)...
 > git --no-pager merge --quiet --no-edit --no-ff 26e29edea62043c5879fb53bf42514fa6b5683e3
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/TrainControlSystem.cs
 < Auto-merging Source/Orts.Simulation/Simulation/Physics/Train.cs
 < Auto-merging Source/Orts.Simulation/Orts.Simulation.csproj
 < Auto-merging Source/Orts.Simulation/Common/Scripting/TrainControlSystem.cs
Merging #417 Animated Clocks recognized by ClockHands without extern Files...
 > git --no-pager merge --quiet --no-edit --no-ff eca996f5312cd138c3e7f6a60252eccb785c341d
 < Auto-merging Source/Documentation/Manual/features-route.rst
Merging #420 Delete Russian timetable.rst...
 > git --no-pager merge --quiet --no-edit --no-ff 39843b106ce618f6e6d3dab71b3741e3e14509e5
 < Removing Source/Documentation/Manual/ru/timetable.rst
Merging #421 Added a reset command in order to reset a TCS emergency braking triggered by the simulator...
 > git --no-pager merge --quiet --no-edit --no-ff 712bc534866abae4c78f637e54ceee6ee9caa32e
 < Auto-merging Source/RunActivity/Viewer3D/Viewer.cs
 < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
 < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
 < Auto-merging 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/MSTSLocomotive.cs
 < Auto-merging Source/Orts.Simulation/Simulation/Physics/Train.cs
 < Auto-merging Source/Orts.Simulation/Common/Scripting/TrainControlSystem.cs
 < Auto-merging Source/Orts.Simulation/Common/Commands.cs
 < Auto-merging Source/ORTS.Settings/InputSettings.cs
 < Auto-merging Source/ORTS.Common/Input/UserCommand.cs
 < Automatic merge failed; fix conflicts and then commit the result.
 > git --no-pager reset --hard
 < HEAD is now at ded6caa6d Merge commit '39843b106ce618f6e6d3dab71b3741e3e14509e5' into HEAD
 > git --no-pager clean --force -d -x
 Error: git merge --quiet --no-edit --no-ff 712bc534866abae4c78f637e54ceee6ee9caa32e failed: 1
Merging #422 Change alignment of couplers as they travel through curve....
 > git --no-pager merge --quiet --no-edit --no-ff f4831e566b3ae2cea226b57599d4c00520969fa2
 < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
 < Auto-merging Source/Orts.Simulation/Simulation/Physics/Train.cs
Merging #430 Blueprint https://blueprints.launchpad.net/or/+spec/train-driving-ui-window...
 > git --no-pager merge --quiet --no-edit --no-ff 699ec4869ae2cc8bd4910ad8456f24cc7bf4e17c
 < Auto-merging Source/RunActivity/Viewer3D/Viewer.cs
 < Auto-merging Source/RunActivity/RunActivity.csproj
 < Auto-merging Source/ORTS.Settings/InputSettings.cs
 < Auto-merging Source/ORTS.Common/Input/UserCommand.cs
Pull requests successfully auto-merged (8):
 #79 Update version calculation for new unstable versions
 #399 Power supply package
 #408 Updating RailDriver SDK library to prepare for 64bit mode
 #412 New TCS function to get speed post information (including warning speed posts)
 #417 Animated Clocks recognized by ClockHands without extern Files
 #420 Delete Russian timetable.rst
 #422 Change alignment of couplers as they travel through curve.
 #430 Blueprint https://blueprints.launchpad.net/or/+spec/train-driving-ui-window
Pull requests not auto-merged (1):
 #421 Added a reset command in order to reset a TCS emergency braking triggered by the simulator
No changes to push into merge branch
 > git --no-pager checkout --quiet unstable
Open Rails Code Bot finished at 2021-06-24 07:51:25Z

Continuous Integration graphs

Build warnings

Source TODO/FIXME comments

Test results

Static analysis violations


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