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-05-27 02:06:13Z 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 #525 TCS extensions By: Sharpe49 Branch: tcs-extensions Labels: enhancement Allowed to auto-merge? True #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 #569 Upgraded project files to .Net SDK project file format By: Sharpe49 Branch: dotnetsdk-project-files-upgrade Labels: enhancement Allowed to auto-merge? True #570 Experimental glTF 2.0 support with PBR lighting By: pzgulyas Branch: gltf2 Labels: enhancement Allowed to auto-merge? True #617 02m: Removed menu option Debrief Evaluation. Now always available. By: cjakeman Branch: menu-options02m Labels: Allowed to auto-merge? True #627 Improve advanced adhesion model By: cesarBLG Branch: enhance-adhesion Labels: enhancement Allowed to auto-merge? True #629 Refined label for downloading Testing Version By: cjakeman Branch: website-download-versions Labels: website 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 #632 Menu options07a - Re-do System Tab By: cjakeman Branch: menu-options07a Labels: enhancement 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 #645 Rebuilded language templates for all modules By: FrannDzs Branch: language-templates Labels: Allowed to auto-merge? False #647 fix: Put all cache files into the designated area away from user files By: twpol Branch: feature/binpat-cache-directory Labels: Allowed to auto-merge? True #649 feat: Add help information to Simulator Tester By: twpol Branch: feature/simulator-test Labels: Allowed to auto-merge? True Pull requests suitable for auto-merging (11): #525 TCS extensions #537 C# signal script extensions #569 Upgraded project files to .Net SDK project file format #570 Experimental glTF 2.0 support with PBR lighting #617 02m: Removed menu option Debrief Evaluation. Now always available. #627 Improve advanced adhesion model #629 Refined label for downloading Testing Version #630 Sky Color Fix (Addresses Trello Roadmap Card #367 for More accurate sunrise and sunset) #632 Menu options07a - Re-do System Tab #647 fix: Put all cache files into the designated area away from user files #649 feat: Add help information to Simulator Tester Preparing repository... > git --no-pager fetch --update-head-ok > git --no-pager reset --hard < HEAD is now at cdc9bbed9 Automatic merge of T1.4-524-g50f43621b and 7 pull requests > git --no-pager clean --force -d -x > git --no-pager checkout --quiet --detach 50f43621bd5e38825c8634fedc6e94db5b7aee46 Merging #525 TCS extensions... > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 614b22208a1d7670f14751b2fc50e379e76a96c7 < Auto-merging Source/Orts.Simulation/Common/Scripting/TrainControlSystem.cs < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/TrainControlSystem.cs < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs 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 bdfa1c4e8 Merge commit '614b22208a1d7670f14751b2fc50e379e76a96c7' into HEAD > git --no-pager clean --force -d -x Error: git merge --quiet --no-edit --no-ff -Xignore-space-change d2f0cc8edf3345a4c83b6f02de95c70a9c6c1c88 failed: 1 Merging #569 Upgraded project files to .Net SDK project file format... > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 9b757a193e005ba0b6530df1b14e7c60045bda94 < Auto-merging Build.cmd < Auto-merging Source/ContentChecker/ContentChecker.csproj < CONFLICT (modify/delete): Source/Contrib/ActivityEditor/AEWizard/AEWizard.csproj deleted in 9b757a193e005ba0b6530df1b14e7c60045bda94 and modified in HEAD. Version HEAD of Source/Contrib/ActivityEditor/AEWizard/AEWizard.csproj left in tree. < Auto-merging Source/Contrib/ActivityEditor/ActivityEditor/ActivityEditor.csproj < Auto-merging Source/Contrib/ActivityEditor/LibAE/LibAE.csproj < Auto-merging Source/Contrib/ContentManager/ContentManager.csproj < Auto-merging Source/Contrib/DataCollector/DataCollector.csproj < Auto-merging Source/Contrib/DataConverter/DataConverter.csproj < Auto-merging Source/Contrib/DataValidator/DataValidator.csproj < Auto-merging Source/Contrib/TrackViewer/TrackViewer.csproj < Auto-merging Source/Menu/Menu.csproj < Auto-merging Source/ORTS.Common/ORTS.Common.csproj < Auto-merging Source/ORTS.Menu/ORTS.Menu.csproj < Auto-merging Source/ORTS.Settings/ORTS.Settings.csproj < Auto-merging Source/ORTS.Updater/ORTS.Updater.csproj < Auto-merging Source/ORTS.sln < Auto-merging Source/Orts.Formats.Msts/Orts.Formats.Msts.csproj < Auto-merging Source/Orts.Formats.OR/Orts.Formats.OR.csproj < Auto-merging Source/Orts.Parsers.Msts/Orts.Parsers.Msts.csproj < Auto-merging Source/Orts.Parsers.OR/Orts.Parsers.OR.csproj < Auto-merging Source/Orts.Simulation/Orts.Simulation.csproj < CONFLICT (modify/delete): Source/Orts.Simulation/packages.config deleted in 9b757a193e005ba0b6530df1b14e7c60045bda94 and modified in HEAD. Version HEAD of Source/Orts.Simulation/packages.config left in tree. < Auto-merging Source/RunActivity/RunActivity.csproj < Auto-merging Source/Tests/Tests.csproj < Auto-merging Source/Updater/Updater.csproj < Automatic merge failed; fix conflicts and then commit the result. > git --no-pager reset --hard < HEAD is now at bdfa1c4e8 Merge commit '614b22208a1d7670f14751b2fc50e379e76a96c7' into HEAD > git --no-pager clean --force -d -x Error: git merge --quiet --no-edit --no-ff -Xignore-space-change 9b757a193e005ba0b6530df1b14e7c60045bda94 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/Shaders.cs < CONFLICT (content): Merge conflict in Source/RunActivity/Viewer3D/Shaders.cs < Automatic merge failed; fix conflicts and then commit the result. > git --no-pager reset --hard < HEAD is now at bdfa1c4e8 Merge commit '614b22208a1d7670f14751b2fc50e379e76a96c7' into HEAD > git --no-pager clean --force -d -x Error: git merge --quiet --no-edit --no-ff -Xignore-space-change 9bf034e5bb1a7cb468bbc5995d26f01464a40972 failed: 1 Merging #617 02m: Removed menu option Debrief Evaluation. Now always available.... > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 950841230b79149dde2c223bfc49182a10dbb66d < Auto-merging Source/Documentation/Manual/driving.rst < Auto-merging Source/Documentation/Manual/options.rst < Auto-merging Source/Documentation/Manual/start.rst < Auto-merging Source/ORTS.Settings/UserSettings.cs < Auto-merging Source/RunActivity/Viewer3D/Processes/GameStateRunActivity.cs < Auto-merging Source/RunActivity/Viewer3D/Viewer.cs Merging #627 Improve advanced adhesion model... > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 95a3398aa22ef62024f4b0a88d0afc602c3b0bac < Auto-merging Source/ORTS.Settings/UserSettings.cs < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSDieselLocomotive.cs < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs < Auto-merging Source/RunActivity/Viewer3D/Popups/HUDWindow.cs Merging #629 Refined label for downloading Testing Version... > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 34abd9c4ad409da693bc830e367faacc2e57ce2a 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 #632 Menu options07a - Re-do System Tab... > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 1ed56020842aa212d733691573dc10941a81c339 < Auto-merging Source/Documentation/Manual/options.rst < Auto-merging Source/Documentation/Manual/start.rst < Auto-merging Source/Menu/MainForm.Designer.cs < Auto-merging Source/Menu/MainForm.cs < CONFLICT (content): Merge conflict in Source/Menu/MainForm.cs < Auto-merging Source/ORTS.Settings/UserSettings.cs < CONFLICT (content): Merge conflict in Source/ORTS.Settings/UserSettings.cs < Automatic merge failed; fix conflicts and then commit the result. > git --no-pager reset --hard < HEAD is now at d95f06606 Merge commit '704731acdea38c11dea032c5ca5233e66654f1d2' into HEAD > git --no-pager clean --force -d -x Error: git merge --quiet --no-edit --no-ff -Xignore-space-change 1ed56020842aa212d733691573dc10941a81c339 failed: 1 Merging #647 fix: Put all cache files into the designated area away from user files... > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 4e3b696d0338b896ba124212afbd08ca62035d67 < Auto-merging Source/ORTS.Settings/UserSettings.cs < Auto-merging Source/RunActivity/Viewer3D/Processes/GameStateRunActivity.cs Merging #649 feat: Add help information to Simulator Tester... > git --no-pager merge --quiet --no-edit --no-ff -Xignore-space-change 3a3df1c0be1b9d4afb0ae3fd74c5c2e4322b755a Pull requests successfully auto-merged (7): #525 TCS extensions #617 02m: Removed menu option Debrief Evaluation. Now always available. #627 Improve advanced adhesion model #629 Refined label for downloading Testing Version #630 Sky Color Fix (Addresses Trello Roadmap Card #367 for More accurate sunrise and sunset) #647 fix: Put all cache files into the designated area away from user files #649 feat: Add help information to Simulator Tester Pull requests not auto-merged (4): #537 C# signal script extensions #569 Upgraded project files to .Net SDK project file format #570 Experimental glTF 2.0 support with PBR lighting #632 Menu options07a - Re-do System Tab No changes to push into merge branch > git --no-pager checkout --quiet unstable Open Rails Code Bot finished at 2022-05-27 02:06:27Z
|
|
Continuous Integration graphs
Build warnings
Source TODO/FIXME comments
Test results
Static analysis violations
Powered by the Content Parser System, copyright 2002 - 2022 James G. Ross.
|