Commit 788c1ae
committed
Automatic merge of T1.6-rc6-37-g6dd094783 and 12 pull requests
- Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc)
- Pull request #1104 at 86d38a2: 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 #1130 at 8ae6bb7: Fix F9 points to an incorrect car ID.
- Pull request #1139 at 03c6f8f: Fix for bug https://bugs.launchpad.net/or/+bug/2117357.
- Pull request #1142 at a24747c: Fix light position calculation for deeper hierarchy levels
- Pull request #1082 at 5845a1a: Allow variable water level in glass gauge
- Pull request #1081 at 689494b: Brake cuts power unification
- Pull request #1124 at fab5457: Built-in PBL2 brake controller
- Pull request #1128 at 58de4c3: Particle Emitter OverhaulFile tree
1 file changed
+2
-10
lines changed- Source/RunActivity/Viewer3D/WebServices
1 file changed
+2
-10
lines changedLines changed: 2 additions & 10 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
34 | | - | |
35 | | - | |
36 | 34 | | |
37 | 35 | | |
38 | 36 | | |
| |||
711 | 709 | | |
712 | 710 | | |
713 | 711 | | |
714 | | - | |
715 | | - | |
716 | | - | |
717 | | - | |
| 712 | + | |
718 | 713 | | |
719 | 714 | | |
720 | 715 | | |
| |||
814 | 809 | | |
815 | 810 | | |
816 | 811 | | |
817 | | - | |
818 | | - | |
819 | | - | |
820 | | - | |
| 812 | + | |
821 | 813 | | |
822 | 814 | | |
823 | 815 | | |
| |||
0 commit comments