Commit 462902d
committed
Automatic merge of T1.5.1-585-g2be1faa5d and 12 pull requests
- Pull request #757 at 98dd1a7: Unify RailDriver code implementations
- Pull request #831 at fc94364: poor mans switch panel on tablet
- Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters
- Pull request #841 at ce3bc1f: https://blueprints.launchpad.net/or/+spec/animating-trainset-windows
- Pull request #853 at d05f581: Notify out of focus
- Pull request #855 at b39e5d8: Adds new route from TrainSimulations
- Pull request #857 at 9afc8c3: Adding Air Flow Meters
- Pull request #865 at 776d6df: Dispatcher window improvements
- Pull request #866 at c15333e: Fix Articulation For 0-Axle Train Cars
- Pull request #870 at 5cb32fa: Fix water restore
- Pull request #873 at cf0ed99: Reduce allocations in signal script
- Pull request #874 at d500329: Dynamic brake controller refactoringFile tree
3 files changed
+6
-5
lines changed- Source/RunActivity/Viewer3D
- RollingStock
- WebServices/SwitchPanel
3 files changed
+6
-5
lines changedLines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
327 | 327 | | |
328 | 328 | | |
329 | 329 | | |
330 | | - | |
| 330 | + | |
331 | 331 | | |
332 | 332 | | |
333 | 333 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
154 | 154 | | |
155 | 155 | | |
156 | 156 | | |
157 | | - | |
| 157 | + | |
158 | 158 | | |
159 | 159 | | |
160 | 160 | | |
| |||
163 | 163 | | |
164 | 164 | | |
165 | 165 | | |
166 | | - | |
| 166 | + | |
| 167 | + | |
167 | 168 | | |
168 | 169 | | |
169 | 170 | | |
| |||
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
65 | 65 | | |
66 | 66 | | |
67 | 67 | | |
68 | | - | |
| 68 | + | |
69 | 69 | | |
70 | 70 | | |
71 | 71 | | |
72 | 72 | | |
73 | 73 | | |
74 | 74 | | |
75 | 75 | | |
76 | | - | |
| 76 | + | |
77 | 77 | | |
78 | 78 | | |
79 | 79 | | |
| |||
0 commit comments