Project Summary

Author: Open Rails Team

Language: C#

License: GPL 3.0

Browse: Builds, Log, Triage, Documentation

Last automatic build: U2021.01.18-0551 2021-01-18 05:58:09

Build status:

Last changed: 2021-01-16 09:53:05

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-01-18 15: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 (13):
 #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
 #230 Work in progress Monogame migration
   By:     twpol
   Branch: monogame/master
   Labels: refactoring
   Allowed to auto-merge? True
 #232 JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
   By:     YoRyan
   Branch: nextgen-consists
   Labels: enhancement not-for-unstable
   Allowed to auto-merge? False
 #292 SignalScript parsing reports unnecessary exceptions
   By:     cjakeman
   Branch: debug-messages
   Labels: refactoring
   Allowed to auto-merge? True
 #297 Timetable trains shown on a map v2
   By:     cjakeman
   Branch: timetable-window2
   Labels: enhancement not-for-unstable
   Allowed to auto-merge? False
 #306 Write back to the settings store on quit
   By:     YoRyan
   Branch: save-ingame-settings
   Labels: enhancement
   Allowed to auto-merge? True
 #310 Russian translation update
   By:     Weter-ORTS
   Branch: master
   Labels: for-unstable locales
   Allowed to auto-merge? True
 #336 Add secret button to access launcher arguments for easier debugging
   By:     YoRyan
   Branch: ez-debug-parameters
   Labels: enhancement
   Allowed to auto-merge? True
 #339 Initial functionality for Eames (straight) vacuum brake.
   By:     peternewell
   Branch: brakes-eames
   Labels: enhancement
   Allowed to auto-merge? True
 #340 Create C# signalling scripting interface
   By:     cesarBLG
   Branch: csharp-signal-script
   Labels: enhancement not-for-unstable
   Allowed to auto-merge? False
 #341 Remove reference to parameter in manual not used
   By:     peternewell
   Branch: manual
   Labels: bug
   Allowed to auto-merge? True
Pull requests suitable for auto-merging (8):
 #79 Update version calculation for new unstable versions
 #230 Work in progress Monogame migration
 #292 SignalScript parsing reports unnecessary exceptions
 #306 Write back to the settings store on quit
 #310 Russian translation update
 #336 Add secret button to access launcher arguments for easier debugging
 #339 Initial functionality for Eames (straight) vacuum brake.
 #341 Remove reference to parameter in manual not used
Preparing repository...
 > git --no-pager fetch --update-head-ok
 > git --no-pager reset --hard
 < HEAD is now at 4713dc37e Automatic merge of X1.3.1-287-g79bbc2a34 and 7 pull requests
 > git --no-pager clean --force -d -x
 > git --no-pager checkout --quiet --detach 79bbc2a34adbc4f111ad8f10efa46f3db75fe4d8
Merging #79 Update version calculation for new unstable versions...
 > git --no-pager merge --quiet --no-edit --no-ff 7d9f14be82ec3bfc3c5ded65bc3503490d96083c
 < Auto-merging Build.cmd
Merging #230 Work in progress Monogame migration...
 > git --no-pager merge --quiet --no-edit --no-ff b7e7695f32f1f40bb8ab6f90f9f8e7ef69c6cf7c
 < Auto-merging Source/RunActivity/Viewer3D/Viewer.cs
 < Auto-merging Source/RunActivity/Viewer3D/Signals.cs
 < Auto-merging Source/RunActivity/Viewer3D/Shaders.cs
 < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSSteamLocomotiveViewer.cs
 < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
 < Auto-merging Source/RunActivity/Viewer3D/Popups/TrackMonitorWindow.cs
 < Auto-merging Source/RunActivity/Viewer3D/Popups/MessagesWindow.cs
 < Auto-merging Source/RunActivity/Viewer3D/Popups/HelpWindow.cs
 < Auto-merging Source/RunActivity/Viewer3D/Popups/HUDWindow.cs
 < Auto-merging Source/RunActivity/Viewer3D/Debugging/DebugViewerForm.cs
 < Auto-merging Source/RunActivity/RunActivity.csproj
 < Auto-merging Source/Orts.Simulation/Simulation/Timetables/TTTrain.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSDieselLocomotive.cs
 < Auto-merging Source/Orts.Simulation/Simulation/Activity.cs
 < Auto-merging Source/Orts.Simulation/Simulation/AIs/AITrain.cs
 < Auto-merging Source/Orts.Simulation/Orts.Simulation.csproj
 < Auto-merging Source/ORTS.Settings/InputSettings.cs
 < Auto-merging Source/ORTS.Common/SystemInfo.cs
 < Auto-merging Source/Contrib/ActivityEditor/ActivityEditor/Engine/Viewer2D.cs
 < Auto-merging Build.cmd
 < Auto-merging .appveyor.yml
Merging #292 SignalScript parsing reports unnecessary exceptions...
 > git --no-pager merge --quiet --no-edit --no-ff 6b8f3b51e025ef7ddd4a9716c090773ed0895e51
 < Auto-merging Source/Orts.Simulation/Simulation/AIs/AITrain.cs
Merging #306 Write back to the settings store on quit...
 > git --no-pager merge --quiet --no-edit --no-ff bee2d638145644afd99e536c27a6063db2ccbe7f
 < 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/RunActivity/Viewer3D/Popups/TrackMonitorWindow.cs
 < Auto-merging Source/ORTS.Settings/UserSettings.cs
 < Automatic merge failed; fix conflicts and then commit the result.
 > git --no-pager reset --hard
 < HEAD is now at c4f6b67e8 Merge commit '6b8f3b51e025ef7ddd4a9716c090773ed0895e51' into HEAD
 > git --no-pager clean --force -d -x
 Error: git merge --quiet --no-edit --no-ff bee2d638145644afd99e536c27a6063db2ccbe7f failed: 1
Merging #310 Russian translation update...
 > git --no-pager merge --quiet --no-edit --no-ff 4f991377f7e6971806f0d20e49829006a53ff6b8
Merging #336 Add secret button to access launcher arguments for easier debugging...
 > git --no-pager merge --quiet --no-edit --no-ff c1ac71b87ebefb248d82783600f2179b76c94f49
Merging #339 Initial functionality for Eames (straight) vacuum brake....
 > git --no-pager merge --quiet --no-edit --no-ff 1586b8a713882c59e3f77da079c65b449b3b8da8
 < Auto-merging Source/RunActivity/Viewer3D/Popups/HUDWindow.cs
 < Auto-merging Source/Orts.Simulation/Orts.Simulation.csproj
Merging #341 Remove reference to parameter in manual not used...
 > git --no-pager merge --quiet --no-edit --no-ff 893ef0a2c3ca18b75cea2973ae178118b8fdc50a
Pull requests successfully auto-merged (7):
 #79 Update version calculation for new unstable versions
 #230 Work in progress Monogame migration
 #292 SignalScript parsing reports unnecessary exceptions
 #310 Russian translation update
 #336 Add secret button to access launcher arguments for easier debugging
 #339 Initial functionality for Eames (straight) vacuum brake.
 #341 Remove reference to parameter in manual not used
Pull requests not auto-merged (1):
 #306 Write back to the settings store on quit
No changes to push into merge branch
 > git --no-pager checkout --quiet unstable
Open Rails Code Bot finished at 2021-01-18 15:51:30Z

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.