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 2022-08-10 07:06:10Z
GitHub organisation: openrails
GitHub team: development-team
GitHub repository: openrails
GitHub base branch: master
GitHub merge branch: unstable
Team members (13):
Sharpe49
twpol
cjakeman
pzgulyas
YoRyan
perpetualKid
strawberryfield
cesarBLG
peternewell
Csantucci
wjcurrey
markus-GE
mbm-OR
Open pull requests (16):
#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
#527 Brake cuts power refactor and new parameters
By: Sharpe49
Branch: brake-cuts-power-refactor
Labels: enhancement not-for-unstable
Allowed to auto-merge? False
#537 C# signal script extensions
By: Sharpe49
Branch: csharp-script-extensions
Labels: enhancement refactoring
Allowed to auto-merge? True
#541 Initial Virtual File System development
By: pzgulyas
Branch: ziparchive
Labels: enhancement not-for-unstable
Allowed to auto-merge? False
#570 Experimental glTF 2.0 support with PBR lighting
By: pzgulyas
Branch: gltf2
Labels: enhancement
Allowed to auto-merge? True
#630 Sky Color Fix (Addresses Trello Roadmap Card #367 for More accurate sunrise and sunset)
By: DR-Aeronautics
Branch: sky-color
Labels: enhancement good first issue for-unstable
Allowed to auto-merge? True
#644 Wheel creep model for steam locomotives
By: cesarBLG
Branch: adhesion-steam
Labels: enhancement not-for-unstable
Allowed to auto-merge? False
#650 Renewed Russian translation up to testing T1.4-598 version
By: Weter-ORTS
Branch: master
Labels: for-unstable locales
Allowed to auto-merge? True
#652 Add button functions to Raildriver
By: peternewell
Branch: raildriver
Labels: enhancement
Allowed to auto-merge? True
#665 02n: Removes some redundant experimental options
By: cjakeman
Branch: menu-options02n
Labels: enhancement
Allowed to auto-merge? True
#667 Fix typo in Czech translation of menu
By: KRtekTM
Branch: patch-1
Labels:
Allowed to auto-merge? False
#671 Updates manual for Release 1.5
By: cjakeman
Branch: manual-to-v1.5
Labels: documentation
Allowed to auto-merge? True
#674 Mark particle drawer texture for wagons
By: Sharpe49
Branch: fix-wagon-smoke
Labels: bug
Allowed to auto-merge? True
#675 Bug fix for https://bugs.launchpad.net/or/+bug/1983511 When an AI train disappears at end of run, containers remain visible
By: Csantucci
Branch: AIContainers-official
Labels: bug
Allowed to auto-merge? True
#676 adds content hosted on GitHub.com
By: cjakeman
Branch: website-download-content
Labels: website
Allowed to auto-merge? True
#677 Correct double heading bug
By: peternewell
Branch: diesel-mechanic#4
Labels: bug
Allowed to auto-merge? True
Pull requests suitable for auto-merging (11):
#537 C# signal script extensions
#570 Experimental glTF 2.0 support with PBR lighting
#630 Sky Color Fix (Addresses Trello Roadmap Card #367 for More accurate sunrise and sunset)
#650 Renewed Russian translation up to testing T1.4-598 version
#652 Add button functions to Raildriver
#665 02n: Removes some redundant experimental options
#671 Updates manual for Release 1.5
#674 Mark particle drawer texture for wagons
#675 Bug fix for https://bugs.launchpad.net/or/+bug/1983511 When an AI train disappears at end of run, containers remain visible
#676 adds content hosted on GitHub.com
#677 Correct double heading bug
Preparing repository...
> git --no-pager fetch --update-head-ok
> git --no-pager reset --hard
< HEAD is now at cef28a007 Automatic merge of T1.4-645-g9e0e99a77 and 9 pull requests
> git --no-pager clean --force -d -x
> git --no-pager checkout --quiet --detach 9e0e99a773cdbe386eb84919bc6e3eea63e0fb10
Merging #537 C# signal script extensions...
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change d2f0cc8edf3345a4c83b6f02de95c70a9c6c1c88
< Auto-merging Source/Orts.Simulation/MultiPlayer/Message.cs
< Auto-merging Source/Orts.Simulation/Orts.Simulation.csproj
< Auto-merging Source/Orts.Simulation/Simulation/AIs/AITrain.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/RollingStocks/SubSystems/TrainControlSystem.cs
< CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/TrainControlSystem.cs
< Auto-merging Source/Orts.Simulation/Simulation/Signalling/Signals.cs
< CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/Signalling/Signals.cs
< Auto-merging Source/Orts.Simulation/Simulation/Timetables/TTTrain.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/Signals.cs
< Automatic merge failed; fix conflicts and then commit the result.
> git --no-pager reset --hard
< HEAD is now at 9e0e99a77 Merge pull request #569 from Sharpe49/dotnetsdk-project-files-upgrade
> git --no-pager clean --force -d -x
Error: git merge --quiet --no-edit --no-ff -Xignore-space-change d2f0cc8edf3345a4c83b6f02de95c70a9c6c1c88 failed: 1
Merging #570 Experimental glTF 2.0 support with PBR lighting...
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 9bf034e5bb1a7cb468bbc5995d26f01464a40972
< Auto-merging Source/RunActivity/RunActivity.csproj
< Auto-merging Source/RunActivity/Viewer3D/Materials.cs
< Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs
< Auto-merging Source/RunActivity/Viewer3D/Shaders.cs
< CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/Shaders.cs
< Auto-merging Source/RunActivity/Viewer3D/Shapes.cs
< Automatic merge failed; fix conflicts and then commit the result.
> git --no-pager reset --hard
< HEAD is now at 9e0e99a77 Merge pull request #569 from Sharpe49/dotnetsdk-project-files-upgrade
> git --no-pager clean --force -d -x
Error: git merge --quiet --no-edit --no-ff -Xignore-space-change 9bf034e5bb1a7cb468bbc5995d26f01464a40972 failed: 1
Merging #630 Sky Color Fix (Addresses Trello Roadmap Card #367 for More accurate sunrise and sunset)...
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 704731acdea38c11dea032c5ca5233e66654f1d2
Merging #650 Renewed Russian translation up to testing T1.4-598 version...
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 3f8380cae2b887e8e1323678ef98d384ba14909b
Merging #652 Add button functions to Raildriver...
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 918fdb1039596212edd5dd3eefd078987ed5d59e
Merging #665 02n: Removes some redundant experimental options...
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 595641214baeaea581452459354def518df45f89
< Auto-merging Source/RunActivity/Viewer3D/Materials.cs
Merging #671 Updates manual for Release 1.5...
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change c5dcc73c4b9058c07cd507ecc99c3219559050aa
Merging #674 Mark particle drawer texture for wagons...
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change e160e261a11b694cdbb78c6a796e5baea466747f
Merging #675 Bug fix for https://bugs.launchpad.net/or/+bug/1983511 When an AI train disappears at end of run, containers remain visible...
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 96641418f86f6234e22c213a6f13059b6ea5d5c9
Merging #676 adds content hosted on GitHub.com...
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 3ee082227ffb10fca6d2f28e592557daceb34c26
Merging #677 Correct double heading bug...
> git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change a1dc40bfc8038ea125d38e06e65b2ca6bb82440d
Pull requests successfully auto-merged (9):
#630 Sky Color Fix (Addresses Trello Roadmap Card #367 for More accurate sunrise and sunset)
#650 Renewed Russian translation up to testing T1.4-598 version
#652 Add button functions to Raildriver
#665 02n: Removes some redundant experimental options
#671 Updates manual for Release 1.5
#674 Mark particle drawer texture for wagons
#675 Bug fix for https://bugs.launchpad.net/or/+bug/1983511 When an AI train disappears at end of run, containers remain visible
#676 adds content hosted on GitHub.com
#677 Correct double heading bug
Pull requests not auto-merged (2):
#537 C# signal script extensions
#570 Experimental glTF 2.0 support with PBR lighting
No changes to push into merge branch
> git --no-pager checkout --quiet unstable
Open Rails Code Bot finished at 2022-08-10 07:06:21Z
|
|
Continuous Integration graphs
Test results
Static analysis violations
Powered by the Content Parser System, copyright 2002 - 2022 James G. Ross.
|
