Source of /projects/or
# CLASS project_summary_box
# BREAKOUT right
# CLASS heading
Project Summary
Author: "Open Rails Team" <http://openrails.org> property:[dbpedia-owl:developer] xmlns:dbpedia-owl:[http://dbpedia.org/ontology/]
Language: "*C#*" <http://wikipedia.org/wiki/C_Sharp_(programming_language)> property:[dbpedia-owl:language] xmlns:dbpedia-owl:[http://dbpedia.org/ontology/] resource:[http://dbpedia.org/resource/C_Sharp_(programming_language)]
License: "*GPL 3.0*" <http://opensource.org/licenses/gpl-3.0.html> rel:[license] property:[dbpedia-owl:license] xmlns:dbpedia-owl:[http://dbpedia.org/ontology/]
Browse: "Builds" <or/builds>, "Log" <or/log>, "Triage" <or/triage>, "Documentation" <or/documentation>
Last automatic build: "U2020.01.22-1051 2020-01-22 10:58:14" <or/builds/2020-01-22_10-58-14_U2020.01.22-1051/Open Rails U2020.01.22-1051 2020-01-22 10-58-14.zip>
Last changed: *2020-01-22 19:35:34*
*git clone https:@//git.launchpad.net/or*
# BREAKOUT END
# CLASS cps-page-title-reversed
Silver's Simple Site @- Projects @- Open Rails
**********************************************
# BREAKOUT left
<image:or/logo.png> property:[dbpprop:logo] xmlns:dbpprop:[http://dbpedia.org/property/]
# BREAKOUT END
# property rdfs:comment
# xmlns:rdfs http://www.w3.org/2000/01/rdf-schema#
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.
# CLASS clearfix
-
Preview
=======
# BORDER 1px #000000
# BACKGROUND #000000
# COLOR #FFFFFF
||Open Rails Code Bot started at 2020-01-23 05:21:05Z
||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 (17):
|| #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
|| #123 Low Speed Resistance Bug
|| By: peternewell
|| Branch: low-speed-resistance
|| Labels:
|| Allowed to auto-merge? True
|| #127 Web server port number
|| By: wjcurrey
|| Branch: WebServerPortNumber
|| Labels:
|| Allowed to auto-merge? False
|| #133 Bug fix for https://bugs.launchpad.net/or/+bug/1858218 Gearbox not managed correctly for AI and autopiloted trains
|| By: Csantucci
|| Branch: AI-gearbox-fix
|| Labels: bug
|| Allowed to auto-merge? True
|| #135 Website/svn to git
|| By: cjakeman
|| Branch: website/svn-to-git
|| Labels: website
|| Allowed to auto-merge? True
|| #137 Harmonize initialization of autopilotable player train with that of standard player trains
|| By: Csantucci
|| Branch: Harmonize-initialization-of-autopiloted-train
|| Labels: bug
|| Allowed to auto-merge? True
|| #138 Bug fix for https://bugs.launchpad.net/or/+bug/1858298 Sound problems when viewer not created in initial conditions
|| By: Csantucci
|| Branch: Add-missing-sounds-at-TrainCarViewer-Creation
|| Labels: bug
|| Allowed to auto-merge? True
|| #139 Bug fix for https://bugs.launchpad.net/or/+bug/1858655 Helpers not throttled to zero when de-MUed
|| By: Csantucci
|| Branch: Helpers-throttled-to-zero
|| Labels: bug
|| Allowed to auto-merge? True
||Pull requests suitable for auto-merging (14):
|| #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
|| #123 Low Speed Resistance Bug
|| #133 Bug fix for https://bugs.launchpad.net/or/+bug/1858218 Gearbox not managed correctly for AI and autopiloted trains
|| #135 Website/svn to git
|| #137 Harmonize initialization of autopilotable player train with that of standard player trains
|| #138 Bug fix for https://bugs.launchpad.net/or/+bug/1858298 Sound problems when viewer not created in initial conditions
|| #139 Bug fix for https://bugs.launchpad.net/or/+bug/1858655 Helpers not throttled to zero when de-MUed
||Preparing repository...
|| > git --no-pager fetch --update-head-ok
|| > git --no-pager reset --hard
|| < HEAD is now at 302d46038 Automatic merge of X1.3.1-117-g57fd518f6 and 12 pull requests
|| > git --no-pager clean --force -d -x
|| > git --no-pager checkout --quiet --detach 230a542bbdbf0ecfe74028c72a564f925f32f1cf
||Merging #40 Monogame upgrade...
|| > git --no-pager merge --quiet --no-edit --no-ff 2cbeb2b7263114b2e3aa5be2e74c1918a5ec6eeb
|| < Auto-merging Source/RunActivity/Viewer3D/Weather.cs
|| < Auto-merging Source/RunActivity/Viewer3D/Viewer.cs
|| < Auto-merging Source/RunActivity/Viewer3D/UserInput.cs
|| < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/UserInput.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/WindowManager.cs
|| < Auto-merging Source/RunActivity/Viewer3D/Popups/WindowControls.cs
|| < Auto-merging Source/RunActivity/Viewer3D/Popups/Window.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
|| < Automatic merge failed; fix conflicts and then commit the result.
|| > git --no-pager reset --hard
|| < HEAD is now at 230a542bb Merge pull request #122 from peternewell/water_scoop_bug
|| > git --no-pager clean --force -d -x
|| Error: git merge --quiet --no-edit --no-ff 2cbeb2b7263114b2e3aa5be2e74c1918a5ec6eeb failed: 1
||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/Viewer3D/Weather.cs
|| < Auto-merging Source/RunActivity/Viewer3D/Viewer.cs
|| < Auto-merging Source/RunActivity/Viewer3D/UserInput.cs
|| < Auto-merging Source/RunActivity/Viewer3D/Shapes.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
|| < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/RollingStock/MSTSDieselLocomotiveViewer.cs
|| < Auto-merging Source/RunActivity/Viewer3D/RenderFrame.cs
|| < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/RenderFrame.cs
|| < Auto-merging Source/RunActivity/Viewer3D/Processes/Game.cs
|| < Auto-merging Source/RunActivity/Viewer3D/Popups/WindowManager.cs
|| < Auto-merging Source/RunActivity/Viewer3D/Popups/WindowControls.cs
|| < Auto-merging Source/RunActivity/Viewer3D/Popups/Window.cs
|| < Auto-merging Source/RunActivity/Viewer3D/Popups/NoticeWindow.cs
|| < Auto-merging Source/RunActivity/Viewer3D/Popups/NextStationWindow.cs
|| < Auto-merging Source/RunActivity/Viewer3D/Popups/HelpWindow.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/RunActivity/Viewer3D/MSTSSky.cs
|| < Auto-merging Source/RunActivity/Viewer3D/Lights.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/SubSystems/PowerSupplies/DieselEngine.cs
|| < Auto-merging Source/Orts.Simulation/Simulation/AIs/AITrain.cs
|| < Auto-merging Source/Orts.Simulation/Orts.Simulation.csproj
|| < Auto-merging Source/Orts.Simulation/Common/Scripting/ScriptManager.cs
|| < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Common/Scripting/ScriptManager.cs
|| < 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
|| < CONFLICT (modify/delete): Source/ORTS.Viewer3D/ORTS.Viewer3D.csproj deleted in HEAD and modified in ce90f48293f340504a987d9d0a6885a7e53435f1. Version ce90f48293f340504a987d9d0a6885a7e53435f1 of Source/ORTS.Viewer3D/ORTS.Viewer3D.csproj left in tree.
|| < Auto-merging Source/ORTS.Updater/ORTS.Updater.csproj
|| < Auto-merging Source/ORTS.Settings/ORTS.Settings.csproj
|| < CONFLICT (modify/delete): Source/ORTS.Parsers/ORTS.Parsers.csproj deleted in HEAD and modified in ce90f48293f340504a987d9d0a6885a7e53435f1. Version ce90f48293f340504a987d9d0a6885a7e53435f1 of Source/ORTS.Parsers/ORTS.Parsers.csproj left in tree.
|| < Auto-merging Source/ORTS.Menu/ORTS.Menu.csproj
|| < Auto-merging Source/ORTS.IO/ORTS.IO.csproj
|| < Auto-merging Source/ORTS.Content/ORTS.Content.csproj
|| < Auto-merging Source/ORTS.Common/ORTS.Common.csproj
|| < Auto-merging Source/Menu/Options.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 230a542bb Merge pull request #122 from peternewell/water_scoop_bug
|| > 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 107bd45f580575b7a354e9d5b14e229ccffb3eaa
|| < Auto-merging Source/Orts.Simulation/Simulation/Simulator.cs
|| < 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/RollingStocks/MSTSWagon.cs
|| < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSDieselLocomotive.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 cc78055d8be72882a72ead77129146d46e1ff0fd
|| < Auto-merging Source/RunActivity/Viewer3D/Viewer.cs
|| < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
|| < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/MSTSNotchController.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/InputSettings.cs
|| < Auto-merging Source/ORTS.Common/Input/UserCommand.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/Viewer.cs
|| < Auto-merging Source/RunActivity/Viewer3D/Sound.cs
|| < Auto-merging Source/RunActivity/Viewer3D/Shapes.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/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/HUDWindow.cs
|| < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/Popups/HUDWindow.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/TrainControlSystem.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/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
|| < 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/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.Settings/UserSettings.cs
|| < Auto-merging Source/ORTS.Settings/InputSettings.cs
|| < Auto-merging Source/Menu/Options.cs
|| < Automatic merge failed; fix conflicts and then commit the result.
|| > git --no-pager reset --hard
|| < HEAD is now at d510d4367 Merge commit 'cc78055d8be72882a72ead77129146d46e1ff0fd' 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 bff106dec9be44cab95141c4e9bcebe70d641b6c
|| < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
|| < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSDieselLocomotive.cs
|| < Auto-merging Source/ORTS.Settings/UserSettings.cs
|| < Auto-merging Source/Menu/Options.cs
|| < Auto-merging Source/Menu/Options.Designer.cs
||Merging #123 Low Speed Resistance Bug...
|| > git --no-pager merge --quiet --no-edit --no-ff 80ab068cb74dd35715840f53c38b6b1f95514498
|| < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs
||Merging #133 Bug fix for https://bugs.launchpad.net/or/+bug/1858218 Gearbox not managed correctly for AI and autopiloted trains...
|| > git --no-pager merge --quiet --no-edit --no-ff f8c5fc1f0b79b5dc4563a71b1c6f38eab6d7d546
|| < 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/AIs/AITrain.cs
||Merging #135 Website/svn to git...
|| > git --no-pager merge --quiet --no-edit --no-ff 1a8430a83035b2028b77b68b66a53596afc9e8ff
||Merging #137 Harmonize initialization of autopilotable player train with that of standard player trains...
|| > git --no-pager merge --quiet --no-edit --no-ff 4f687bd18a891156f7d11cc882e824dcc82e327d
|| < Auto-merging Source/Orts.Simulation/Simulation/Physics/Train.cs
|| < Auto-merging Source/Orts.Simulation/Simulation/AIs/AITrain.cs
||Merging #138 Bug fix for https://bugs.launchpad.net/or/+bug/1858298 Sound problems when viewer not created in initial conditions...
|| > git --no-pager merge --quiet --no-edit --no-ff 2af673d30b8d862c4b98df8508c92114b2bcf4ec
||Merging #139 Bug fix for https://bugs.launchpad.net/or/+bug/1858655 Helpers not throttled to zero when de-MUed...
|| > git --no-pager merge --quiet --no-edit --no-ff 2165f06c3cd1f9bfe386a883bf0efb4647baa15c
|| < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
||Pull requests successfully auto-merged (11):
|| #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
|| #123 Low Speed Resistance Bug
|| #133 Bug fix for https://bugs.launchpad.net/or/+bug/1858218 Gearbox not managed correctly for AI and autopiloted trains
|| #135 Website/svn to git
|| #137 Harmonize initialization of autopilotable player train with that of standard player trains
|| #138 Bug fix for https://bugs.launchpad.net/or/+bug/1858298 Sound problems when viewer not created in initial conditions
|| #139 Bug fix for https://bugs.launchpad.net/or/+bug/1858655 Helpers not throttled to zero when de-MUed
||Pull requests not auto-merged (3):
|| #40 Monogame upgrade
|| #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 2020-01-23 05:21:29Z
Powered by the Content Parser System, copyright 2002 - 2020 James G. Ross.
|
