Add performance monitoring for diesel mechanic locomotives and new parameters #510
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
twpol
pushed a commit
that referenced
this pull request
Oct 1, 2021
- Pull request #473 at d08e0b9: Further enhancements to Control Car - Pull request #480 at 6bc94a9: Blueprint https://blueprints.launchpad.net/or/+spec/digital-alignment-in-3dcabs - Pull request #503 at 06a5735: Update derailment functionality - Pull request #507 at 80b98a3: Correct an issue with independent brake not working - Pull request #508 at ed80ad6: Blueprint https://blueprints.launchpad.net/or/+spec/odometer-cabview-controls - Pull request #509 at 99611c4: fix: Only use alpha channel from particle textures so colouring works - Pull request #510 at d4d3256: Add performance monitoring for diesel mechanic locomotives and new parameters
twpol
pushed a commit
that referenced
this pull request
Oct 1, 2021
- Pull request #480 at 6bc94a9: Blueprint https://blueprints.launchpad.net/or/+spec/digital-alignment-in-3dcabs - Pull request #503 at 06a5735: Update derailment functionality - Pull request #507 at 80b98a3: Correct an issue with independent brake not working - Pull request #508 at ed80ad6: Blueprint https://blueprints.launchpad.net/or/+spec/odometer-cabview-controls - Pull request #509 at 7fb4ee4: fix: Only use alpha channel from particle textures so colouring works - Pull request #510 at d4d3256: Add performance monitoring for diesel mechanic locomotives and new parameters
twpol
pushed a commit
that referenced
this pull request
Oct 2, 2021
- Pull request #480 at 6bc94a9: Blueprint https://blueprints.launchpad.net/or/+spec/digital-alignment-in-3dcabs - Pull request #503 at 562fe42: Update derailment functionality - Pull request #507 at 80b98a3: Correct an issue with independent brake not working - Pull request #508 at ed80ad6: Blueprint https://blueprints.launchpad.net/or/+spec/odometer-cabview-controls - Pull request #509 at 7fb4ee4: fix: Only use alpha channel from particle textures so colouring works - Pull request #510 at d4d3256: Add performance monitoring for diesel mechanic locomotives and new parameters
twpol
pushed a commit
that referenced
this pull request
Oct 2, 2021
- Pull request #480 at 6bc94a9: Blueprint https://blueprints.launchpad.net/or/+spec/digital-alignment-in-3dcabs - Pull request #503 at 562fe42: Update derailment functionality - Pull request #507 at 80b98a3: Correct an issue with independent brake not working - Pull request #508 at ed80ad6: Blueprint https://blueprints.launchpad.net/or/+spec/odometer-cabview-controls - Pull request #509 at 976d15c: fix: Swap colour bytes from MSTS/XNA order to Monogame/DX order - Pull request #510 at d4d3256: Add performance monitoring for diesel mechanic locomotives and new parameters
twpol
pushed a commit
that referenced
this pull request
Oct 2, 2021
- Pull request #480 at 6bc94a9: Blueprint https://blueprints.launchpad.net/or/+spec/digital-alignment-in-3dcabs - Pull request #503 at 562fe42: Update derailment functionality - Pull request #507 at 80b98a3: Correct an issue with independent brake not working - Pull request #508 at ed80ad6: Blueprint https://blueprints.launchpad.net/or/+spec/odometer-cabview-controls - Pull request #510 at d4d3256: Add performance monitoring for diesel mechanic locomotives and new parameters
twpol
pushed a commit
that referenced
this pull request
Oct 3, 2021
- Pull request #480 at 6bc94a9: Blueprint https://blueprints.launchpad.net/or/+spec/digital-alignment-in-3dcabs - Pull request #503 at 69a70cb: Update derailment functionality - Pull request #507 at 80b98a3: Correct an issue with independent brake not working - Pull request #508 at ed80ad6: Blueprint https://blueprints.launchpad.net/or/+spec/odometer-cabview-controls - Pull request #510 at d4d3256: Add performance monitoring for diesel mechanic locomotives and new parameters - Pull request #512 at 3aae640: Fixed dynamic brake being applied during standstill when dynamic brake blending is enabled
twpol
pushed a commit
that referenced
this pull request
Oct 7, 2021
- Pull request #480 at 6bc94a9: Blueprint https://blueprints.launchpad.net/or/+spec/digital-alignment-in-3dcabs - Pull request #503 at 69a70cb: Update derailment functionality - Pull request #508 at ed80ad6: Blueprint https://blueprints.launchpad.net/or/+spec/odometer-cabview-controls - Pull request #510 at d4d3256: Add performance monitoring for diesel mechanic locomotives and new parameters - Pull request #512 at 3aae640: Fixed dynamic brake being applied during standstill when dynamic brake blending is enabled - Pull request #514 at 8bf4a09: Bug fix for https://bugs.launchpad.net/or/+bug/1946373. The keywords should not be translated.
twpol
pushed a commit
that referenced
this pull request
Oct 8, 2021
- Pull request #480 at 6bc94a9: Blueprint https://blueprints.launchpad.net/or/+spec/digital-alignment-in-3dcabs - Pull request #503 at 69a70cb: Update derailment functionality - Pull request #508 at ed80ad6: Blueprint https://blueprints.launchpad.net/or/+spec/odometer-cabview-controls - Pull request #510 at d4d3256: Add performance monitoring for diesel mechanic locomotives and new parameters - Pull request #512 at 3aae640: Fixed dynamic brake being applied during standstill when dynamic brake blending is enabled - Pull request #514 at 8bf4a09: Bug fix for https://bugs.launchpad.net/or/+bug/1946373. The keywords should not be translated. - Pull request #515 at cd8e29f: Correct issue with compressor not turning off
twpol
pushed a commit
that referenced
this pull request
Oct 9, 2021
- Pull request #480 at 6bc94a9: Blueprint https://blueprints.launchpad.net/or/+spec/digital-alignment-in-3dcabs - Pull request #503 at 69a70cb: Update derailment functionality - Pull request #508 at 9d6f01e: Blueprint https://blueprints.launchpad.net/or/+spec/odometer-cabview-controls - Pull request #510 at d4d3256: Add performance monitoring for diesel mechanic locomotives and new parameters - Pull request #512 at 3aae640: Fixed dynamic brake being applied during standstill when dynamic brake blending is enabled - Pull request #514 at 8bf4a09: Bug fix for https://bugs.launchpad.net/or/+bug/1946373. The keywords should not be translated. - Pull request #515 at cd8e29f: Correct issue with compressor not turning off
twpol
pushed a commit
that referenced
this pull request
Oct 9, 2021
- Pull request #480 at 6bc94a9: Blueprint https://blueprints.launchpad.net/or/+spec/digital-alignment-in-3dcabs - Pull request #503 at a2845f8: Update derailment functionality - Pull request #508 at 9d6f01e: Blueprint https://blueprints.launchpad.net/or/+spec/odometer-cabview-controls - Pull request #510 at d4d3256: Add performance monitoring for diesel mechanic locomotives and new parameters - Pull request #512 at 3aae640: Fixed dynamic brake being applied during standstill when dynamic brake blending is enabled - Pull request #514 at 8bf4a09: Bug fix for https://bugs.launchpad.net/or/+bug/1946373. The keywords should not be translated. - Pull request #515 at cd8e29f: Correct issue with compressor not turning off
twpol
pushed a commit
that referenced
this pull request
Oct 10, 2021
- Pull request #480 at 6bc94a9: Blueprint https://blueprints.launchpad.net/or/+spec/digital-alignment-in-3dcabs - Pull request #503 at a2845f8: Update derailment functionality - Pull request #508 at 9d6f01e: Blueprint https://blueprints.launchpad.net/or/+spec/odometer-cabview-controls - Pull request #510 at d4d3256: Add performance monitoring for diesel mechanic locomotives and new parameters - Pull request #512 at 3aae640: Fixed dynamic brake being applied during standstill when dynamic brake blending is enabled - Pull request #514 at 8bf4a09: Bug fix for https://bugs.launchpad.net/or/+bug/1946373. The keywords should not be translated. - Pull request #516 at 1498583: feat: Build Unstable Version as debug
twpol
pushed a commit
that referenced
this pull request
Oct 10, 2021
- Pull request #480 at 6bc94a9: Blueprint https://blueprints.launchpad.net/or/+spec/digital-alignment-in-3dcabs - Pull request #503 at a2845f8: Update derailment functionality - Pull request #508 at 9d6f01e: Blueprint https://blueprints.launchpad.net/or/+spec/odometer-cabview-controls - Pull request #510 at d4d3256: Add performance monitoring for diesel mechanic locomotives and new parameters - Pull request #512 at 3aae640: Fixed dynamic brake being applied during standstill when dynamic brake blending is enabled - Pull request #514 at 8bf4a09: Bug fix for https://bugs.launchpad.net/or/+bug/1946373. The keywords should not be translated. - Pull request #516 at 1498583: feat: Build Unstable Version as debug - Pull request #517 at dc566d5: Strengthen Contributing guidance
twpol
pushed a commit
that referenced
this pull request
Oct 10, 2021
- Pull request #480 at 6bc94a9: Blueprint https://blueprints.launchpad.net/or/+spec/digital-alignment-in-3dcabs - Pull request #503 at a2845f8: Update derailment functionality - Pull request #508 at 9d6f01e: Blueprint https://blueprints.launchpad.net/or/+spec/odometer-cabview-controls - Pull request #510 at d4d3256: Add performance monitoring for diesel mechanic locomotives and new parameters - Pull request #512 at 3aae640: Fixed dynamic brake being applied during standstill when dynamic brake blending is enabled - Pull request #514 at 8bf4a09: Bug fix for https://bugs.launchpad.net/or/+bug/1946373. The keywords should not be translated. - Pull request #516 at 1498583: feat: Build Unstable Version as debug - Pull request #517 at dc566d5: Strengthen Contributing guidance - Pull request #518 at 59424c1: Added rules to policy page on website
twpol
pushed a commit
that referenced
this pull request
Oct 11, 2021
- Pull request #480 at 6bc94a9: Blueprint https://blueprints.launchpad.net/or/+spec/digital-alignment-in-3dcabs - Pull request #503 at a2845f8: Update derailment functionality - Pull request #508 at 9d6f01e: Blueprint https://blueprints.launchpad.net/or/+spec/odometer-cabview-controls - Pull request #510 at d4d3256: Add performance monitoring for diesel mechanic locomotives and new parameters - Pull request #512 at b76931f: Fixed dynamic brake being applied during standstill when dynamic brake blending is enabled - Pull request #514 at 8bf4a09: Bug fix for https://bugs.launchpad.net/or/+bug/1946373. The keywords should not be translated. - Pull request #516 at 1498583: feat: Build Unstable Version as debug - Pull request #517 at dc566d5: Strengthen Contributing guidance - Pull request #518 at 59424c1: Added rules to policy page on website
twpol
pushed a commit
that referenced
this pull request
Oct 11, 2021
- Pull request #480 at 6bc94a9: Blueprint https://blueprints.launchpad.net/or/+spec/digital-alignment-in-3dcabs - Pull request #503 at a2845f8: Update derailment functionality - Pull request #508 at 21fb5e9: Blueprint https://blueprints.launchpad.net/or/+spec/odometer-cabview-controls - Pull request #510 at d4d3256: Add performance monitoring for diesel mechanic locomotives and new parameters - Pull request #512 at b76931f: Fixed dynamic brake being applied during standstill when dynamic brake blending is enabled - Pull request #514 at 8bf4a09: Bug fix for https://bugs.launchpad.net/or/+bug/1946373. The keywords should not be translated. - Pull request #516 at 1498583: feat: Build Unstable Version as debug - Pull request #517 at dc566d5: Strengthen Contributing guidance - Pull request #518 at 59424c1: Added rules to policy page on website
twpol
pushed a commit
that referenced
this pull request
Oct 11, 2021
- Pull request #480 at 6bc94a9: Blueprint https://blueprints.launchpad.net/or/+spec/digital-alignment-in-3dcabs - Pull request #503 at a2845f8: Update derailment functionality - Pull request #508 at 21fb5e9: Blueprint https://blueprints.launchpad.net/or/+spec/odometer-cabview-controls - Pull request #510 at d4d3256: Add performance monitoring for diesel mechanic locomotives and new parameters - Pull request #512 at b76931f: Fixed dynamic brake being applied during standstill when dynamic brake blending is enabled - Pull request #514 at 383d2a0: Bug fix for https://bugs.launchpad.net/or/+bug/1946373. The keywords should not be translated. - Pull request #516 at 1498583: feat: Build Unstable Version as debug - Pull request #517 at dc566d5: Strengthen Contributing guidance - Pull request #518 at 59424c1: Added rules to policy page on website
twpol
pushed a commit
that referenced
this pull request
Oct 12, 2021
- Pull request #480 at 6bc94a9: Blueprint https://blueprints.launchpad.net/or/+spec/digital-alignment-in-3dcabs - Pull request #503 at 8a7c2af: Update derailment functionality - Pull request #508 at 21fb5e9: Blueprint https://blueprints.launchpad.net/or/+spec/odometer-cabview-controls - Pull request #510 at d4d3256: Add performance monitoring for diesel mechanic locomotives and new parameters - Pull request #512 at b76931f: Fixed dynamic brake being applied during standstill when dynamic brake blending is enabled - Pull request #514 at 383d2a0: Bug fix for https://bugs.launchpad.net/or/+bug/1946373. The keywords should not be translated. - Pull request #516 at 1498583: feat: Build Unstable Version as debug - Pull request #517 at dc566d5: Strengthen Contributing guidance - Pull request #518 at 59424c1: Added rules to policy page on website
twpol
pushed a commit
that referenced
this pull request
Oct 19, 2021
- Pull request #480 at 6bc94a9: Blueprint https://blueprints.launchpad.net/or/+spec/digital-alignment-in-3dcabs - Pull request #503 at 780b0e8: Update derailment functionality - Pull request #510 at d4d3256: Add performance monitoring for diesel mechanic locomotives and new parameters - Pull request #519 at 619ce90: Website changes for Release v1.4
twpol
pushed a commit
that referenced
this pull request
Oct 20, 2021
- Pull request #480 at 6bc94a9: Blueprint https://blueprints.launchpad.net/or/+spec/digital-alignment-in-3dcabs - Pull request #503 at 918960c: Update derailment functionality - Pull request #510 at d4d3256: Add performance monitoring for diesel mechanic locomotives and new parameters - Pull request #519 at 619ce90: Website changes for Release v1.4
twpol
pushed a commit
that referenced
this pull request
Oct 20, 2021
- Pull request #480 at 7815b89: Blueprint https://blueprints.launchpad.net/or/+spec/digital-alignment-in-3dcabs - Pull request #503 at 918960c: Update derailment functionality - Pull request #510 at d4d3256: Add performance monitoring for diesel mechanic locomotives and new parameters - Pull request #519 at 619ce90: Website changes for Release v1.4
twpol
pushed a commit
that referenced
this pull request
Oct 20, 2021
- Pull request #480 at 7815b89: Blueprint https://blueprints.launchpad.net/or/+spec/digital-alignment-in-3dcabs - Pull request #503 at 918960c: Update derailment functionality - Pull request #510 at d4d3256: Add performance monitoring for diesel mechanic locomotives and new parameters - Pull request #519 at fec5a89: Website changes for Release v1.4
twpol
pushed a commit
that referenced
this pull request
Oct 21, 2021
- Pull request #480 at 7815b89: Blueprint https://blueprints.launchpad.net/or/+spec/digital-alignment-in-3dcabs - Pull request #503 at 0e9a259: Update derailment functionality - Pull request #510 at d4d3256: Add performance monitoring for diesel mechanic locomotives and new parameters - Pull request #519 at fec5a89: Website changes for Release v1.4
twpol
pushed a commit
that referenced
this pull request
Oct 23, 2021
- Pull request #480 at 7815b89: Blueprint https://blueprints.launchpad.net/or/+spec/digital-alignment-in-3dcabs - Pull request #503 at 0e9a259: Update derailment functionality - Pull request #510 at d4d3256: Add performance monitoring for diesel mechanic locomotives and new parameters - Pull request #519 at fec5a89: Website changes for Release v1.4 - Pull request #520 at 82fdd3f: Add checks for AirBrakeMaxMainResPipePressure.
twpol
pushed a commit
that referenced
this pull request
Oct 23, 2021
- Pull request #480 at 7815b89: Blueprint https://blueprints.launchpad.net/or/+spec/digital-alignment-in-3dcabs - Pull request #510 at d4d3256: Add performance monitoring for diesel mechanic locomotives and new parameters - Pull request #519 at 94c4637: Website changes for Release v1.4 - Pull request #520 at 82fdd3f: Add checks for AirBrakeMaxMainResPipePressure.
twpol
pushed a commit
that referenced
this pull request
Oct 25, 2021
- Pull request #480 at 7815b89: Blueprint https://blueprints.launchpad.net/or/+spec/digital-alignment-in-3dcabs - Pull request #510 at d4d3256: Add performance monitoring for diesel mechanic locomotives and new parameters - Pull request #519 at 94c4637: Website changes for Release v1.4 - Pull request #520 at 82fdd3f: Add checks for AirBrakeMaxMainResPipePressure. - Pull request #522 at 78c046c: Correct issue with tender water mass
twpol
pushed a commit
that referenced
this pull request
Dec 7, 2021
- Pull request #510 at 7cadc9f: Add performance monitoring for diesel mechanic locomotives and new parameters - Pull request #525 at b5ac1d2: Add SignalTypeName and DrawStateName to SignalFeatures - Pull request #527 at 27f05a1: Brake cuts power refactor and new parameters - Pull request #531 at b2affac: Bug fix for https://bugs.launchpad.net/or/+bug/1950578 Dyn Brake setup state not disappearing in cab - Pull request #533 at 62a1c27: fix for shapes hidden by animations( 0 ) - Pull request #537 at e753905: C# signal script extensions - Pull request #538 at c457f11: Delete binary paths if the ascii version or the tdb was modified. Blueprint: https://blueprints.launchpad.net/or/+spec/binary-timetable-paths - Pull request #542 at 83320ed: adds new webpage, moves Testing out of Download/Programs
|
Hi Peter, The Code Bot https://james-ross.co.uk/projects/or reports a Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/MSTSDieselLocomotive.cs Are you able to sort this out? Thanks, Chris |
Yes I was intending to delete and recreate the PR to overcome this issue. Thanks |
|
You should use the rebase function of git to update your branch and then force push the branch to Github. |
Thanks for the suggestion. For this one I prefer to rebuild it. |
|
PR closed to rebuild and overcome conflicts |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Improve the performance of diesel locomotives -
https://blueprints.launchpad.net/or/+spec/diesel-performance
This covers diesel mechanics and the following thread specifically will deal with any changes.