Project Summary

Author: Open Rails Team

Language: C#

License: GPL 3.0

Browse: Builds, Log, Triage, Documentation

Last automatic build: U2020.07.07-1721 2020-07-07 18:28:15

Build status:

Last changed: 2020-07-02 06:26:55

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-07-07 23:21:10Z
GitHub organisation: openrails
GitHub team:         development-team
GitHub repository:   openrails
GitHub base branch:  master
GitHub merge branch: unstable
Team members (10):
 Sharpe49
 twpol
 cjakeman
 YoRyan
 perpetualKid
 strawberryfield
 peternewell
 Csantucci
 markus-GE
 mbm-OR
Open pull requests (15):
 #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
 #210 Add ORTS_Battery and ORTS_Powerkey commands
   By:     Paoloserpi78
   Branch: Cab/BatteryPowerkey
   Labels: enhancement for-unstable
   Allowed to auto-merge? True
 #216 Upgrade and replace web server with EmbedIO
   By:     YoRyan
   Branch: webserver2
   Labels: for-unstable
   Allowed to auto-merge? True
 #221 Refactor try-catch blocks in RunActivity
   By:     YoRyan
   Branch: refactor-try-catch
   Labels: for-unstable refactoring
   Allowed to auto-merge? True
 #225 Fix advanced adhesion wheelslip upon resuming from save: https://bugs.launchpad.net/or/+bug/1294410
   By:     YoRyan
   Branch: fix-resume-physics
   Labels: bug
   Allowed to auto-merge? True
 #226 EmbedIO web server graphical track monitor
   By:     YoRyan
   Branch: webserver2-trackmonitor
   Labels: enhancement for-unstable
   Allowed to auto-merge? True
 #227 EmbedIO web server graphical train driving monitor
   By:     YoRyan
   Branch: webserver2-traindriving
   Labels: enhancement for-unstable
   Allowed to auto-merge? True
 #228 adds links to OR on Elvas Tower
   By:     cjakeman
   Branch: website-update
   Labels: website
   Allowed to auto-merge? True
 #229 Fix MSTS-compatible physics reverting to Davis physics: https://bugs.launchpad.net/or/+bug/1886566
   By:     YoRyan
   Branch: fix-legacy-physics
   Labels: bug
   Allowed to auto-merge? True
Pull requests suitable for auto-merging (13):
 #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
 #210 Add ORTS_Battery and ORTS_Powerkey commands
 #216 Upgrade and replace web server with EmbedIO
 #221 Refactor try-catch blocks in RunActivity
 #225 Fix advanced adhesion wheelslip upon resuming from save: https://bugs.launchpad.net/or/+bug/1294410
 #226 EmbedIO web server graphical track monitor
 #227 EmbedIO web server graphical train driving monitor
 #228 adds links to OR on Elvas Tower
 #229 Fix MSTS-compatible physics reverting to Davis physics: https://bugs.launchpad.net/or/+bug/1886566
Preparing repository...
 > git --no-pager fetch --update-head-ok
 > git --no-pager reset --hard
 < HEAD is now at 3223a4ddd Automatic merge of X1.3.1-189-gab83b4ca9 and 9 pull requests
 > git --no-pager clean --force -d -x
 > git --no-pager checkout --quiet --detach ab83b4ca961ad96110cc784d48474df74daacde4
Merging #40 Monogame upgrade...
 > git --no-pager merge --quiet --no-edit --no-ff e81861b0bce9e32d14ad467d37944b82635fcbfb
 < Auto-merging Source/RunActivity/Viewer3D/Viewer.cs
 < Auto-merging Source/RunActivity/Viewer3D/Shapes.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/Debugging/DebugViewerForm.cs
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselEngine.cs
 < Auto-merging Source/ORTS.Settings/UserSettings.cs
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 637cdbf4e Merge commit 'e81861b0bce9e32d14ad467d37944b82635fcbfb' 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/InfoDisplay.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
 < CONFLICT (content): Merge conflict in 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
 < CONFLICT (content): Merge conflict in 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.Parsers.Msts/Interpolator.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/Menu/MainForm.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 5f0f54c69 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 5f0f54c69 Merge commit '7d9f14be82ec3bfc3c5ded65bc3503490d96083c' into HEAD
 > git --no-pager clean --force -d -x
 Error: git merge --quiet --no-edit --no-ff 5ae438e5b3b5ca6f1773c5e0565741cad8a3db19 failed: 1
Merging #210 Add ORTS_Battery and ORTS_Powerkey commands...
 > git --no-pager merge --quiet --no-edit --no-ff f4004bd073e69ad81731d3d3b56edd04760938cb
 < Auto-merging Source/RunActivity/Viewer3D/Viewer.cs
 < CONFLICT (content): Merge conflict in 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/MSTSLocomotive.cs
 < Auto-merging Source/Orts.Simulation/Common/Events.cs
 < Automatic merge failed; fix conflicts and then commit the result.
 > git --no-pager reset --hard
 < HEAD is now at 5f0f54c69 Merge commit '7d9f14be82ec3bfc3c5ded65bc3503490d96083c' into HEAD
 > git --no-pager clean --force -d -x
 Error: git merge --quiet --no-edit --no-ff f4004bd073e69ad81731d3d3b56edd04760938cb failed: 1
Merging #216 Upgrade and replace web server with EmbedIO...
 > git --no-pager merge --quiet --no-edit --no-ff 927a49cfff9da1bc462fe54df6a11306c1ebe8d6
 < Removing Source/RunActivity/Viewer3D/WebServices/Web/js/trackmonitor.js
 < Removing Source/RunActivity/Viewer3D/WebServices/Web/js/hud.js
 < Removing Source/RunActivity/Viewer3D/WebServices/Web/js/ApiTrainInfo.js
 < Removing Source/RunActivity/Viewer3D/WebServices/Web/js/ApiSample.js
 < Removing Source/RunActivity/Viewer3D/WebServices/Web/index - ApiSample.html
 < Removing Source/RunActivity/Viewer3D/WebServices/Web/images/zig-zag.jpg
 < Removing Source/RunActivity/Viewer3D/WebServices/Web/images/waverley.jpg
 < Removing Source/RunActivity/Viewer3D/WebServices/Web/css/trackmonitor.css
 < Removing Source/RunActivity/Viewer3D/WebServices/Web/css/sample.css
 < Removing Source/RunActivity/Viewer3D/WebServices/Web/css/hud.css
 < Removing Source/RunActivity/Viewer3D/WebServices/Web/HUD.html
 < Auto-merging Source/RunActivity/RunActivity.csproj
 < Removing Source/RunActivity/Content/Web/js/trackmonitor.js
 < Removing Source/RunActivity/Content/Web/js/hud.js
 < Removing Source/RunActivity/Content/Web/js/ApiTrainInfo.js
 < Removing Source/RunActivity/Content/Web/js/ApiSample.js
 < Removing Source/RunActivity/Content/Web/index.html
 < Removing Source/RunActivity/Content/Web/index - ApiSample.html
 < Removing Source/RunActivity/Content/Web/images/zig-zag.jpg
 < Removing Source/RunActivity/Content/Web/images/waverley.jpg
 < Removing Source/RunActivity/Content/Web/css/trackmonitor.css
 < Removing Source/RunActivity/Content/Web/css/sample.css
 < Removing Source/RunActivity/Content/Web/HUD.html
 < Auto-merging Build.cmd
Merging #221 Refactor try-catch blocks in RunActivity...
 > git --no-pager merge --quiet --no-edit --no-ff 13ba17f0f31ebe656801b942af85ce809a16b9c3
 < Auto-merging Source/RunActivity/Viewer3D/Weather.cs
 < Auto-merging Source/RunActivity/Viewer3D/Viewer.cs
 < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
 < Auto-merging Source/RunActivity/Viewer3D/Processes/GameStateRunActivity.cs
 < Auto-merging Source/RunActivity/Viewer3D/Processes/Game.cs
 < Auto-merging Source/RunActivity/Viewer3D/Materials.cs
 < Auto-merging Source/RunActivity/Viewer3D/MSTSSky.cs
 < Auto-merging Source/RunActivity/Viewer3D/Debugging/DebugViewerForm.cs
Merging #225 Fix advanced adhesion wheelslip upon resuming from save: https://bugs.launchpad.net/or/+bug/1294410...
 > git --no-pager merge --quiet --no-edit --no-ff bb67fb6e658cfb8e93c26d5fc2fd7b5ce0677a67
 < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
Merging #226 EmbedIO web server graphical track monitor...
 > git --no-pager merge --quiet --no-edit --no-ff e66ced3dfd08f89a6902419db7c95690b927c6a4
 < Auto-merging Source/RunActivity/RunActivity.csproj
Merging #227 EmbedIO web server graphical train driving monitor...
 > git --no-pager merge --quiet --no-edit --no-ff c0543e17eb92a6b844183fd8e4c41eeb5b40a6f9
 < Auto-merging Source/RunActivity/Viewer3D/WebServices/WebServer.cs
 < Auto-merging Source/RunActivity/RunActivity.csproj
Merging #228 adds links to OR on Elvas Tower...
 > git --no-pager merge --quiet --no-edit --no-ff 4343221268553246bac17ea57fb3f519702ea24d
Merging #229 Fix MSTS-compatible physics reverting to Davis physics: https://bugs.launchpad.net/or/+bug/1886566...
 > git --no-pager merge --quiet --no-edit --no-ff e2aba9e969654930eeebe39f978ec3c6ff894b33
Pull requests successfully auto-merged (9):
 #40 Monogame upgrade
 #79 Update version calculation for new unstable versions
 #216 Upgrade and replace web server with EmbedIO
 #221 Refactor try-catch blocks in RunActivity
 #225 Fix advanced adhesion wheelslip upon resuming from save: https://bugs.launchpad.net/or/+bug/1294410
 #226 EmbedIO web server graphical track monitor
 #227 EmbedIO web server graphical train driving monitor
 #228 adds links to OR on Elvas Tower
 #229 Fix MSTS-compatible physics reverting to Davis physics: https://bugs.launchpad.net/or/+bug/1886566
Pull requests not auto-merged (4):
 #42 Monogame AnyCPU Prefer32Bit
 #105 refactor: Reformat all code with dotnet format
 #145 Advanced Coupler Functionality
 #210 Add ORTS_Battery and ORTS_Powerkey commands
No changes to push into merge branch
 > git --no-pager checkout --quiet unstable
Open Rails Code Bot finished at 2020-07-07 23:21:21Z

Continuous Integration graphs

Source TODO/FIXME comments

Test results

Static analysis violations


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