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-05-28 21:36: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 markus-GE Open pull requests (14): #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 #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 #145 Advanced Coupler Functionality By: peternewell Branch: new-advanced-coupler Labels: enhancement Allowed to auto-merge? True #183 restored BNSF Scenic Route and updated link to Broad Gauge Productions By: cjakeman Branch: website/update-links Labels: website Allowed to auto-merge? True #188 Setting.IsModeActivity added so Menu remembers choice of activity or . By: cjakeman Branch: bugfix-timetable-choice Labels: Allowed to auto-merge? True #190 Spelling corrections to illustrate code development cycle By: cjakemanMB Branch: bugfix/spelling Labels: Allowed to auto-merge? False #193 Fix 3D cab digit and gauge stuttering on Monogame (round 3) By: YoRyan Branch: mg-cab-stutter3 Labels: Allowed to auto-merge? False #194 Update Diesel Code By: peternewell Branch: new-diesel-modifications-3 Labels: Allowed to auto-merge? True #198 https://trello.com/c/8RK0kuCt/465-enable-rotation-for-digital-2d-cabview-controls By: Csantucci Branch: enable-digital-controls-rotation-in-2D-cabs Labels: enhancement Allowed to auto-merge? True #199 Rewrite Steam Heating Code By: peternewell Branch: new-manual-firing-#2 Labels: Allowed to auto-merge? True Pull requests suitable for auto-merging (10): #40 Monogame upgrade #42 Monogame AnyCPU Prefer32Bit #79 Update version calculation for new unstable versions #105 refactor: Reformat all code with dotnet format #145 Advanced Coupler Functionality #183 restored BNSF Scenic Route and updated link to Broad Gauge Productions #188 Setting.IsModeActivity added so Menu remembers choice of activity or . #194 Update Diesel Code #198 https://trello.com/c/8RK0kuCt/465-enable-rotation-for-digital-2d-cabview-controls #199 Rewrite Steam Heating Code Preparing repository... > git --no-pager fetch --update-head-ok > git --no-pager reset --hard < HEAD is now at b541158c8 Automatic merge of X1.3.1-163-g5c8ab5d13 and 6 pull requests > git --no-pager clean --force -d -x > git --no-pager checkout --quiet --detach 5c8ab5d131cb56bbce573bac26b04bab590e5cb6 Merging #40 Monogame upgrade... > git --no-pager merge --quiet --no-edit --no-ff ccd567122a5b46286251c5ccc769ee93e0ca81ad 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.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 8d06ee963 Merge commit 'ccd567122a5b46286251c5ccc769ee93e0ca81ad' 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 #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/Sound.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 < 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/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/TTDetachWindow.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 < 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 < 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/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.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/AceFile.cs < CONFLICT (content): Merge conflict in Source/Orts.Formats.Msts/AceFile.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 < 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 ea7933194 Merge commit '7d9f14be82ec3bfc3c5ded65bc3503490d96083c' into HEAD > git --no-pager clean --force -d -x Error: git merge --quiet --no-edit --no-ff 6ec4cc05b8c7930950f96b494327b882ce705379 failed: 1 Merging #145 Advanced Coupler Functionality... > git --no-pager merge --quiet --no-edit --no-ff 5ae438e5b3b5ca6f1773c5e0565741cad8a3db19 < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs < Auto-merging Source/RunActivity/Viewer3D/Popups/HUDWindow.cs < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/Popups/HUDWindow.cs < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs < Auto-merging Source/Orts.Simulation/Simulation/Physics/Train.cs < Automatic merge failed; fix conflicts and then commit the result. > git --no-pager reset --hard < HEAD is now at ea7933194 Merge commit '7d9f14be82ec3bfc3c5ded65bc3503490d96083c' into HEAD > git --no-pager clean --force -d -x Error: git merge --quiet --no-edit --no-ff 5ae438e5b3b5ca6f1773c5e0565741cad8a3db19 failed: 1 Merging #183 restored BNSF Scenic Route and updated link to Broad Gauge Productions... > git --no-pager merge --quiet --no-edit --no-ff e6c01f7d189de4b61522a1f995b39481e01240d2 Merging #188 Setting.IsModeActivity added so Menu remembers choice of activity or .... > git --no-pager merge --quiet --no-edit --no-ff cdece3b0e5a50cc2238d50a2ee6d60e845712c74 < Auto-merging Source/ORTS.Settings/UserSettings.cs Merging #194 Update Diesel Code... > git --no-pager merge --quiet --no-edit --no-ff 594be585226308947273463ed82b536144fe9ec4 < 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 Merging #198 https://trello.com/c/8RK0kuCt/465-enable-rotation-for-digital-2d-cabview-controls... > git --no-pager merge --quiet --no-edit --no-ff b85a8f9808441ac8d669c8c043e9926c18ade248 < 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/WindowText.cs < Automatic merge failed; fix conflicts and then commit the result. > git --no-pager reset --hard < HEAD is now at 0c35e4eba Merge commit '594be585226308947273463ed82b536144fe9ec4' into HEAD > git --no-pager clean --force -d -x Error: git merge --quiet --no-edit --no-ff b85a8f9808441ac8d669c8c043e9926c18ade248 failed: 1 Merging #199 Rewrite Steam Heating Code... > git --no-pager merge --quiet --no-edit --no-ff a3561516b4f629047b807df646312d3cb5761619 < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.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 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSDieselLocomotive.cs < Auto-merging Source/Orts.Simulation/Simulation/Confirmer.cs Pull requests successfully auto-merged (6): #40 Monogame upgrade #79 Update version calculation for new unstable versions #183 restored BNSF Scenic Route and updated link to Broad Gauge Productions #188 Setting.IsModeActivity added so Menu remembers choice of activity or . #194 Update Diesel Code #199 Rewrite Steam Heating Code Pull requests not auto-merged (4): #42 Monogame AnyCPU Prefer32Bit #105 refactor: Reformat all code with dotnet format #145 Advanced Coupler Functionality #198 https://trello.com/c/8RK0kuCt/465-enable-rotation-for-digital-2d-cabview-controls No changes to push into merge branch > git --no-pager checkout --quiet unstable Open Rails Code Bot finished at 2020-05-28 21:36:21Z
