Commit d516007
committed
Automatic merge of T1.5.1-1630-gf3424409b and 9 pull requests
- Pull request #900 at b54024b: DMI in 3D cab + two more dials
- Pull request #1030 at d3ae4a2: Refactor settings, in prep for settings exporter
- Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH
- Pull request #961 at ffccb2e: Improvements for Power Supplies
- Pull request #1015 at 1ade99e: Enhancements for EP brakes
- Pull request #1029 at 31fd7d2: Superelevation Follow Up Fixes
- Pull request #1063 at 6c23191: Better Missing Track Section Error Message
- Pull request #1055 at 1a01818: Route Based TTrack Sounds
- Pull request #896 at f1681df: First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trainsFile tree
2 files changed
+11
-6
lines changed- Source
- Orts.Simulation/Simulation
- RunActivity/Viewer3D/Processes
2 files changed
+11
-6
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
261 | 261 | | |
262 | 262 | | |
263 | 263 | | |
264 | | - | |
| 264 | + | |
265 | 265 | | |
266 | 266 | | |
267 | 267 | | |
| |||
295 | 295 | | |
296 | 296 | | |
297 | 297 | | |
298 | | - | |
| 298 | + | |
299 | 299 | | |
300 | 300 | | |
301 | 301 | | |
| |||
1358 | 1358 | | |
1359 | 1359 | | |
1360 | 1360 | | |
1361 | | - | |
| 1361 | + | |
| 1362 | + | |
| 1363 | + | |
1362 | 1364 | | |
1363 | 1365 | | |
| 1366 | + | |
1364 | 1367 | | |
1365 | 1368 | | |
1366 | 1369 | | |
| |||
Lines changed: 5 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
| 1 | + | |
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| |||
281 | 281 | | |
282 | 282 | | |
283 | 283 | | |
284 | | - | |
285 | | - | |
| 284 | + | |
| 285 | + | |
| 286 | + | |
| 287 | + | |
286 | 288 | | |
287 | 289 | | |
288 | 290 | | |
| |||
0 commit comments