Project Summary

Author: Open Rails Team

Language: C#

License: GPL 3.0

Browse: Builds, Log, Triage, Documentation

Last automatic build: U2019.12.04-2036 2019-12-04 20:43:13

Last changed: 2019-12-07 18:07:16

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 2019-12-10 08:06:11Z
GitHub organisation: openrails
GitHub team:         development-team
GitHub repository:   openrails
GitHub base branch:  master
GitHub merge branch: unstable
Team members (7):
 twpol
 cjakeman
 perpetualKid
 strawberryfield
 peternewell
 Csantucci
 Roeterdink
Open pull requests (10):
 #40 Monogame upgrade
   By:     perpetualKid
   Branch: Monogame-Upgrade
   Labels: enhancement
   Allowed to auto-merge? True
 #42 Monogame AnyCPU Prefer32Bit
   By:     perpetualKid
   Branch: Monogame-AnyCPU
   Labels: enhancement
   Allowed to auto-merge? True
 #55 Updated news on website
   By:     cjakeman2
   Branch: update-web-news
   Labels: website
   Allowed to auto-merge? False
 #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
   Allowed to auto-merge? True
 #102 https://blueprints.launchpad.net/or/+spec/stock-visual-effects - chan.
   By:     peternewell
   Branch: master
   Labels: enhancement
   Allowed to auto-merge? True
 #103 Changes to vacuum brakes
   By:     peternewell
   Branch: new-vacuum-brakes
   Labels: enhancement
   Allowed to auto-merge? True
 #105 refactor: Reformat all code with dotnet format
   By:     twpol
   Branch: feature/dotnet-format
   Labels:
   Allowed to auto-merge? True
 #109 Changes to shown power and force values initialised for diesel
   By:     peternewell
   Branch: diesel-modifications
   Labels: enhancement
   Allowed to auto-merge? True
Pull requests suitable for auto-merging (8):
 #40 Monogame upgrade
 #42 Monogame AnyCPU Prefer32Bit
 #79 Update version calculation for new unstable versions
 #95 https://blueprints.launchpad.net/or/+spec/temporary-options-for-activ.
 #102 https://blueprints.launchpad.net/or/+spec/stock-visual-effects - chan.
 #103 Changes to vacuum brakes
 #105 refactor: Reformat all code with dotnet format
 #109 Changes to shown power and force values initialised for diesel
Preparing repository...
 > git --no-pager fetch --update-head-ok
 > git --no-pager reset --hard
 < HEAD is now at b964be135 Automatic merge of X1.3.1-105-gf8eb17cce and 7 pull requests
 > git --no-pager clean --force -d -x
 > git --no-pager checkout --quiet --detach 63e1f8ff5547399fb59823b40ea9275d11729c63
Merging #40 Monogame upgrade...
 > git --no-pager merge --quiet --no-edit --no-ff ebf3d4ded29c3a84d3ecd4879a986fe51a74c911
 < Auto-merging Source/RunActivity/Viewer3D/Weather.cs
 < Auto-merging Source/RunActivity/Viewer3D/Viewer.cs
 < Auto-merging Source/RunActivity/Viewer3D/Shapes.cs
 < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSSteamLocomotiveViewer.cs
 < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
 < Auto-merging Source/RunActivity/Viewer3D/Popups/NoticeWindow.cs
 < Auto-merging Source/RunActivity/Viewer3D/Popups/NextStationWindow.cs
 < Auto-merging Source/RunActivity/Viewer3D/Popups/HUDWindow.cs
 < Auto-merging Source/RunActivity/Viewer3D/ParticleEmitter.cs
 < Auto-merging Source/RunActivity/Viewer3D/Materials.cs
 < Auto-merging Source/Orts.Simulation/Simulation/Timetables/TTTrain.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselEngine.cs
 < Auto-merging Source/Orts.Simulation/Simulation/AIs/AITrain.cs
 < Auto-merging Source/Orts.Simulation/Orts.Simulation.csproj
Merging #42 Monogame AnyCPU Prefer32Bit...
 > git --no-pager merge --quiet --no-edit --no-ff ce90f48293f340504a987d9d0a6885a7e53435f1
 < Auto-merging Source/Updater/Updater.csproj
 < Auto-merging Source/Tests/Tests.csproj
 < Auto-merging Source/RunActivity/RunActivity.csproj
 < Auto-merging Source/Orts.Simulation/Orts.Simulation.csproj
 < Auto-merging Source/Orts.Parsers.OR/Orts.Parsers.OR.csproj
 < Auto-merging Source/Orts.Parsers.Msts/Orts.Parsers.Msts.csproj
 < Auto-merging Source/Orts.Formats.OR/Orts.Formats.OR.csproj
 < Auto-merging Source/Orts.Formats.Msts/Orts.Formats.Msts.csproj
 < Auto-merging Source/ORTS.sln
 < Auto-merging Source/ORTS.Updater/ORTS.Updater.csproj
 < Auto-merging Source/ORTS.Settings/UserSettings.cs
 < Auto-merging Source/ORTS.Settings/ORTS.Settings.csproj
 < Auto-merging Source/ORTS.Menu/ORTS.Menu.csproj
 < Auto-merging Source/ORTS.Common/ORTS.Common.csproj
 < Auto-merging Source/Menu/Options.resx
 < CONFLICT (content): Merge conflict in Source/Menu/Options.resx
 < Auto-merging Source/Menu/Options.cs
 < Auto-merging Source/Menu/Options.Designer.cs
 < CONFLICT (content): Merge conflict in Source/Menu/Options.Designer.cs
 < Auto-merging Source/Menu/Menu.csproj
 < Auto-merging Source/Menu/MainForm.cs
 < Auto-merging Source/Launcher/Program.cs
 < CONFLICT (content): Merge conflict in Source/Launcher/Program.cs
 < Auto-merging Source/Launcher/Launcher.csproj
 < Auto-merging Source/Contrib/TrackViewer/TrackViewer.csproj
 < Auto-merging Source/Contrib/DataValidator/DataValidator.csproj
 < Auto-merging Source/Contrib/DataConverter/DataConverter.csproj
 < Auto-merging Source/Contrib/DataCollector/DataCollector.csproj
 < Auto-merging Source/Contrib/ContentManager/ContentManager.csproj
 < Auto-merging Source/Contrib/ActivityEditor/LibAE/LibAE.csproj
 < Auto-merging Source/Contrib/ActivityEditor/ActivityEditor/ActivityEditor.csproj
 < Auto-merging Source/Contrib/ActivityEditor/AEWizard/AEWizard.csproj
 < Auto-merging Source/ContentChecker/ContentChecker.csproj
 < Automatic merge failed; fix conflicts and then commit the result.
 > git --no-pager reset --hard
 < HEAD is now at bc28e127a Merge commit 'ebf3d4ded29c3a84d3ecd4879a986fe51a74c911' into HEAD
 > git --no-pager clean --force -d -x
 Error: git merge --quiet --no-edit --no-ff ce90f48293f340504a987d9d0a6885a7e53435f1 failed: 1
Merging #79 Update version calculation for new unstable versions...
 > git --no-pager merge --quiet --no-edit --no-ff 7d9f14be82ec3bfc3c5ded65bc3503490d96083c
Merging #95 https://blueprints.launchpad.net/or/+spec/temporary-options-for-activ....
 > git --no-pager merge --quiet --no-edit --no-ff 37101f3908c0fe158c04da4d86a8c057239f1f48
 < Auto-merging Source/Orts.Simulation/Simulation/Simulator.cs
 < Auto-merging Source/Orts.Formats.Msts/Orts.Formats.Msts.csproj
 < Auto-merging Source/Orts.Formats.Msts/ActivityFile.cs
Merging #102 https://blueprints.launchpad.net/or/+spec/stock-visual-effects - chan....
 > git --no-pager merge --quiet --no-edit --no-ff 39a5a0810f907d8a8d8e876aee8ba242daa7787d
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
 < Auto-merging Source/Orts.Simulation/Simulation/Physics/Train.cs
Merging #103 Changes to vacuum brakes...
 > git --no-pager merge --quiet --no-edit --no-ff 7d81a7f42cafdd16d1b2890d0ceffedc17dfdeef
 < Auto-merging Source/RunActivity/Viewer3D/Viewer.cs
 < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSSteamLocomotiveViewer.cs
 < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
 < Auto-merging Source/RunActivity/Viewer3D/Popups/HUDWindow.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
 < Auto-merging Source/Orts.Simulation/Simulation/Physics/Train.cs
 < Auto-merging Source/ORTS.Settings/UserSettings.cs
 < Auto-merging Source/ORTS.Settings/InputSettings.cs
 < Auto-merging Source/ORTS.Common/Input/UserCommand.cs
 < Auto-merging Source/Menu/Options.cs
 < Auto-merging Source/Menu/Options.Designer.cs
Merging #105 refactor: Reformat all code with dotnet format...
 > git --no-pager merge --quiet --no-edit --no-ff 6ec4cc05b8c7930950f96b494327b882ce705379
 < Auto-merging Source/RunActivity/Viewer3D/Weather.cs
 < Auto-merging Source/RunActivity/Viewer3D/Water.cs
 < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/Water.cs
 < Auto-merging Source/RunActivity/Viewer3D/Viewer.cs
 < Auto-merging Source/RunActivity/Viewer3D/Terrain.cs
 < Auto-merging Source/RunActivity/Viewer3D/Sky.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/Scenery.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
 < 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/Precipitation.cs
 < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/Precipitation.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/MessagesWindow.cs
 < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/Popups/MessagesWindow.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/Popups/CompassWindow.cs
 < Auto-merging Source/RunActivity/Viewer3D/ParticleEmitter.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
 < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/MSTSSky.cs
 < Auto-merging Source/RunActivity/Viewer3D/Lights.cs
 < Auto-merging Source/RunActivity/Viewer3D/Forest.cs
 < Auto-merging Source/RunActivity/Viewer3D/DriverMachineInterface.cs
 < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/DriverMachineInterface.cs
 < Auto-merging Source/RunActivity/Viewer3D/Debugging/DebugViewerForm.cs
 < Auto-merging Source/RunActivity/Viewer3D/DDSLib.cs
 < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/DDSLib.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/RollingStocks/TrainCar.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/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
 < 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
 < 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/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/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.Formats.Msts/CabViewFile.cs
 < Auto-merging Source/Orts.Formats.Msts/ActivityFile.cs
 < Auto-merging Source/Orts.Formats.Msts/AceFile.cs
 < CONFLICT (content): Merge conflict in Source/Orts.Formats.Msts/AceFile.cs
 < Auto-merging Source/ORTS.Settings/UserSettings.cs
 < Auto-merging Source/ORTS.Settings/InputSettings.cs
 < Auto-merging Source/Menu/Options.cs
 < Auto-merging Source/Contrib/TrackViewer/UserInterface/OtherPathsWindow.xaml.cs
 < Auto-merging Source/Contrib/TrackViewer/TrackViewer.cs
 < Auto-merging Source/Contrib/TrackViewer/Program.cs
 < Auto-merging Source/Contrib/TrackViewer/Drawing/ShadowDrawArea.cs
 < CONFLICT (content): Merge conflict in Source/Contrib/TrackViewer/Drawing/ShadowDrawArea.cs
 < Auto-merging Source/Contrib/TrackViewer/Drawing/DrawMultiplePaths.cs
 < Auto-merging Source/Contrib/TrackViewer/Drawing/DrawColors.cs
 < Auto-merging Source/Contrib/TrackViewer/Drawing/BasicShapes.cs
 < CONFLICT (content): Merge conflict in Source/Contrib/TrackViewer/Drawing/BasicShapes.cs
 < Auto-merging Source/Contrib/ActivityEditor/ActivityEditor/Engine/Viewer2D.cs
 < Auto-merging Source/Contrib/ActivityEditor/AEWizard/ActivityDescr.cs
 < Auto-merging Source/ContentChecker/Loader.cs
 < Automatic merge failed; fix conflicts and then commit the result.
 > git --no-pager reset --hard
 < HEAD is now at f85a2947a Merge commit '7d81a7f42cafdd16d1b2890d0ceffedc17dfdeef' into HEAD
 > git --no-pager clean --force -d -x
 Error: git merge --quiet --no-edit --no-ff 6ec4cc05b8c7930950f96b494327b882ce705379 failed: 1
Merging #109 Changes to shown power and force values initialised for diesel...
 > git --no-pager merge --quiet --no-edit --no-ff c59d5c8e104968598b4f18072807f57f76405d44
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselEngine.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSDieselLocomotive.cs
Pull requests successfully auto-merged (6):
 #40 Monogame upgrade
 #79 Update version calculation for new unstable versions
 #95 https://blueprints.launchpad.net/or/+spec/temporary-options-for-activ.
 #102 https://blueprints.launchpad.net/or/+spec/stock-visual-effects - chan.
 #103 Changes to vacuum brakes
 #109 Changes to shown power and force values initialised for diesel
Pull requests not auto-merged (2):
 #42 Monogame AnyCPU Prefer32Bit
 #105 refactor: Reformat all code with dotnet format
No changes to push into merge branch
 > git --no-pager checkout --quiet unstable
Open Rails Code Bot finished at 2019-12-10 08:06:26Z

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