Commit ee117d3
committed
Automatic merge of T1.6-59-g2eb7441b0 and 11 pull requests
- Pull request #1156 at f46d5f2: Fix incorrectly disabled options in train operations window
- Pull request #1086 at d8d61eb: Add Settings Exporter tool (copy settings to INI, etc)
- Pull request #1091 at e813c42: Automatic speed control
- Pull request #1104 at 7919243: Handle simple adhesion within the axle module
- Pull request #1115 at 270f22f: Do not activate ETS switch if no suitable cars are attached
- Pull request #1120 at ba3c47f: Automatically Calculate Friction Values if Missing
- Pull request #1121 at 91d2d26: Manually Override Articulation
- Pull request #1124 at e241a0d: Built-in PBL2 brake controller
- Pull request #1157 at 39cd994: Dynamic brake authorization by TCS
- Pull request #1082 at 5845a1a: Allow variable water level in glass gauge
- Pull request #1128 at 1d7643d: Particle Emitter OverhaulFile tree
2 files changed
+5
-2
lines changed- Source/RunActivity/Viewer3D/Popups
2 files changed
+5
-2
lines changedLines changed: 1 addition & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1189 | 1189 | | |
1190 | 1190 | | |
1191 | 1191 | | |
| 1192 | + | |
1192 | 1193 | | |
1193 | 1194 | | |
1194 | 1195 | | |
| |||
Lines changed: 4 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1091 | 1091 | | |
1092 | 1092 | | |
1093 | 1093 | | |
| 1094 | + | |
1094 | 1095 | | |
1095 | 1096 | | |
1096 | 1097 | | |
| |||
1109 | 1110 | | |
1110 | 1111 | | |
1111 | 1112 | | |
1112 | | - | |
| 1113 | + | |
1113 | 1114 | | |
1114 | 1115 | | |
1115 | 1116 | | |
| |||
1122 | 1123 | | |
1123 | 1124 | | |
1124 | 1125 | | |
| 1126 | + | |
1125 | 1127 | | |
1126 | 1128 | | |
1127 | 1129 | | |
| |||
1140 | 1142 | | |
1141 | 1143 | | |
1142 | 1144 | | |
1143 | | - | |
| 1145 | + | |
1144 | 1146 | | |
1145 | 1147 | | |
1146 | 1148 | | |
| |||
0 commit comments