Merge branch 'master' into extras

awbrown90 · web-flow · commit 059a9d313ddb · 2017-02-22T18:46:29.000-07:00
diff --git a/Assets/Standard Assets/Vehicles/Car/Scripts/Steering.cs b/Assets/Standard Assets/Vehicles/Car/Scripts/Steering.cs
@@ -81,7 +81,8 @@ public void UpdateValues()
 
 				// reset
 				mouse_hold = false;
-				H = CrossPlatformInputManager.GetAxis("Horizontal");
+
+				H = CrossPlatformInputManager.GetAxis ("Horizontal");
 
             }
 				

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,8 @@ public void UpdateValues()`
`81`	`81`
`82`	`82`	`// reset`
`83`	`83`	`mouse_hold = false;`
`84`		`- H = CrossPlatformInputManager.GetAxis("Horizontal");`
	`84`	`+`
	`85`	`+ H = CrossPlatformInputManager.GetAxis ("Horizontal");`
`85`	`86`
`86`	`87`	`}`
`87`	`88`