Automatic merge of T1.5.1-957-g4fd63a327 and 17 pull requests

- Pull request #799 at dfc715e: Consolidated wind simulation
- Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters
- Pull request #876 at f92de76: docs: add source for documents previously on website to source Documentation folder
- Pull request #882 at 3ca0eb1: Blueprint/train car operations UI window
- Pull request #891 at 9a1d6b2: Auto save
- Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH
- Pull request #896 at 5866028: First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains
- Pull request #900 at c27f32d: DMI updates
- Pull request #903 at 7af1f91: Downloading route content (Github, zip)
- Pull request #912 at 596a03a: New Triple Valve Features Vol. 2
- Pull request #919 at 26cc6a8: Added mouse wheel support for controls which can be moved by pressing t…
- Pull request #922 at abe2e52: Autopilot for timetable mode
- Pull request #923 at 4c27204: Add curve squeal to route
- Pull request #929 at a406a69: Add support for common circuit breaker variants
- Pull request #939 at 6c8095a: Add KM/HOUR/MIN to Cabview Units
- Pull request #940 at f8b5b15: Browser HUD column alignment improvements
- Pull request #941 at 50378f6: AI Penalty Lights Fix

Author: openrails-bot

Source/RunActivity/Viewer3D/WebServices/Web/HUD/index.js

@@ -86,8 +86,9 @@ function ApiHeadUpDisplay() {
 						DebugWidthTofix = ['primitives','Camera'],
 					// Force information
 						ForceColSpanTo15 = ['Wind Speed'],
-						ForceColSpanTo4 = ['(Simple adhesion model)','Dynamic brake'],
-						ForceColSpanTo3 = ['Axle out force','Loco Adhesion','Wagon Adhesion'],
+						ForceColSpanTo4 = ['(Advanced adhesion model)', '(Simple adhesion model)'],
+						ForceColSpanTo3 = ['Wheel slip (Thres)', 'Conditions', 'Axle drive force', 'Axle brake force', 'Number of substeps', 'Wheel Adh. (Max)',
+							'Axle out force', 'Comp Axle out force', 'Wheel speed (Slip)', 'Wheel ang. pos.', 'Loco Adhesion', 'Wagon Adhesion'],
 					// Brake information
 						BrakeColSpanTo2 = ['PlayerLoco','Brake Sys Vol'];
 
@@ -96,6 +97,7 @@ function ApiHeadUpDisplay() {
 						var colspanmax = false,
 							colspan10 = false,
 							colspan3 = false,
+							colspan2 = false,
 							fixwidth = false,
 							locomotivetype = false;
 
@@ -126,6 +128,10 @@ function ApiHeadUpDisplay() {
 								locomotivetype = true;
 								Str += "<td colspan='2' >" + obj.extraTable.values[next] + "</td>";
 							}
+							else if (colspan2)
+							{
+								Str += "<td class='td_nowrap' colspan='2' >" + obj.extraTable.values[next] + "</td>";
+							}
 							else if (colspan3 || BrakeColSpanTo2.indexOf(obj.extraTable.values[next]) !== -1){
 								Str += "<td colspan='3' >" + obj.extraTable.values[next] + "</td>";
 							}
@@ -144,6 +150,7 @@ function ApiHeadUpDisplay() {
 							}
 							else if (ForceColSpanTo3.indexOf(obj.extraTable.values[next]) !== -1 ){
 								Str += "<td colspan='3' >" + obj.extraTable.values[next] + "</td>";
+								colspan2 = true; // data cells in these row span two columns
 							}
 							else {
 								// Apply colspan if required after first col