Skip to content

Commit

Permalink
Automatic merge of T1.4-rc6-12-gfab59f576 and 7 pull requests
Browse files Browse the repository at this point in the history
- 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
  • Loading branch information
openrails-bot committed Oct 10, 2021
9 parents 2e50f55 + fab59f5 + 6bc94a9 + a2845f8 + 9d6f01e + d4d3256 + 3aae640 + 8bf4a09 + 1498583 commit c250b63
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion Build.cmd
Expand Up @@ -91,7 +91,9 @@ CALL :recreate "Program" || GOTO :error

REM Build main program.
REM Disable warning CS1591 "Missing XML comment for publicly visible type or member".
MSBuild Source\ORTS.sln /t:Clean;Build /p:Configuration=Release /p:NoWarn=1591 || GOTO :error
SET BuildConfiguration=Release
IF "%Mode%" == "Unstable" SET BuildConfiguration=Debug
MSBuild Source\ORTS.sln /t:Clean;Build /p:Configuration=%BuildConfiguration% /p:NoWarn=1591 || GOTO :error

REM Build contributed Timetable Editor.
PUSHD Source\Contrib\TimetableEditor && CALL Build.cmd && POPD || GOTO :error
Expand Down

0 comments on commit c250b63

Please sign in to comment.