Project Summary

Author: Open Rails Team

Language: C#

License: GPL 3.0

Browse: Builds, Log, Triage, Documentation

Last automatic build: U2020.11.30-0821 2020-11-30 08:28:09

Build status:

Last changed: 2020-11-30 09:24:35

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-11-30 09:51: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 (14):
 #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
 #293 Further TCS handles to get signal data and to set sound events
   By:     Csantucci
   Branch: further-TCS-script-handles
   Labels: enhancement
   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
 #300 Brake pipe overcharge
   By:     cesarBLG
   Branch: brake_overcharge
   Labels: enhancement for-unstable
   Allowed to auto-merge? True
 #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
 #312 Some locomotive related TCS script hooks, see https://blueprints.launchpad.net/or/+spec/locomotive-related-tcs-hooks
   By:     Csantucci
   Branch: locomotive-TCS-hooks
   Labels: enhancement
   Allowed to auto-merge? True
 #314 Play a standardized, pleasing sound when taking a screenshot
   By:     YoRyan
   Branch: nicer-screenshot
   Labels: enhancement
   Allowed to auto-merge? True
 #316 add webpage learn > physics
   By:     cjakeman
   Branch: website-physics
   Labels: website
   Allowed to auto-merge? True
Pull requests suitable for auto-merging (10):
 #79 Update version calculation for new unstable versions
 #230 Work in progress Monogame migration
 #292 SignalScript parsing reports unnecessary exceptions
 #293 Further TCS handles to get signal data and to set sound events
 #300 Brake pipe overcharge
 #306 Write back to the settings store on quit
 #310 Russian translation update
 #312 Some locomotive related TCS script hooks, see https://blueprints.launchpad.net/or/+spec/locomotive-related-tcs-hooks
 #314 Play a standardized, pleasing sound when taking a screenshot
 #316 add webpage learn > physics
Preparing repository...
 > git --no-pager fetch --update-head-ok
 ! From github.com:openrails/openrails
 !  + ed5ff842e...291be00a3 refs/pull/293/merge -> refs/pull/293/merge  (forced update)
 > git --no-pager reset --hard
 < HEAD is now at 969ad252b Automatic merge of X1.3.1-263-g7abeb7d51 and 10 pull requests
 > git --no-pager clean --force -d -x
 > git --no-pager checkout --quiet --detach ad59df38d87a8ff759259ce45f60afe22baa7b9e
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 5a3282e6e5bbc3b5ded6b6ab43446f5b17d84703
 < Auto-merging Source/RunActivity/Viewer3D/Viewer.cs
 < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
 < Auto-merging Source/RunActivity/Viewer3D/Popups/TrackMonitorWindow.cs
 < Auto-merging Source/RunActivity/Viewer3D/Popups/HelpWindow.cs
 < Auto-merging Source/RunActivity/Viewer3D/Popups/HUDWindow.cs
 < 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 6e726e41ff03a53aaec37cd499a176aad28dff3f
 < Auto-merging Source/Orts.Simulation/Simulation/AIs/AITrain.cs
Merging #293 Further TCS handles to get signal data and to set sound events...
 > git --no-pager merge --quiet --no-edit --no-ff b3f6c527343854c34b8daabf2c9d70a4f9a623bc
 < Auto-merging Source/RunActivity/Viewer3D/Viewer.cs
Merging #300 Brake pipe overcharge...
 > git --no-pager merge --quiet --no-edit --no-ff 8d8a916551abe585a7a8496d34b897eda1887275
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
 < Auto-merging Source/Orts.Simulation/Simulation/Physics/Train.cs
 < Auto-merging Source/Documentation/Manual/physics.rst
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 09238e08a Merge commit '8d8a916551abe585a7a8496d34b897eda1887275' 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 faacd9c884e3da20900121d9a3b215ead1a3a19a
Merging #312 Some locomotive related TCS script hooks, see https://blueprints.launchpad.net/or/+spec/locomotive-related-tcs-hooks...
 > git --no-pager merge --quiet --no-edit --no-ff e3e88fa5bdc8a59d3c5fb322e490d2f72648b16a
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/TrainControlSystem.cs
 < Auto-merging Source/Orts.Simulation/Common/Scripting/TrainControlSystem.cs
Merging #314 Play a standardized, pleasing sound when taking a screenshot...
 > git --no-pager merge --quiet --no-edit --no-ff ae448e36988d761d95f06bba1f27fb861358e55f
 < Auto-merging Source/RunActivity/Viewer3D/Viewer.cs
 < Auto-merging Source/RunActivity/RunActivity.csproj
Merging #316 add webpage learn > physics...
 > git --no-pager merge --quiet --no-edit --no-ff 01924afbad4651bdcb49d2f70cf5043d52b6a7ad
Pull requests successfully auto-merged (9):
 #79 Update version calculation for new unstable versions
 #230 Work in progress Monogame migration
 #292 SignalScript parsing reports unnecessary exceptions
 #293 Further TCS handles to get signal data and to set sound events
 #300 Brake pipe overcharge
 #310 Russian translation update
 #312 Some locomotive related TCS script hooks, see https://blueprints.launchpad.net/or/+spec/locomotive-related-tcs-hooks
 #314 Play a standardized, pleasing sound when taking a screenshot
 #316 add webpage learn > physics
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 2020-11-30 09:51:16Z

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.