Merge branch 'master' into TMPro-Import

README.md

 
 If you feel like taking on some **bugs**, check out the [Issues page](https://github.com/UnityTechnologies/open-project-1/issues) on this very repo. In fact, another thing you could help with is by doing some **QA testing**: download the [latest release](https://github.com/UnityTechnologies/open-project-1/releases) of the game, play it, and report issues in the appropriate page. That's also a great way to be part of this project!
 
+This project is built on **Unity 2019.4 LTS**, whatever latest patch is available.
+
 ## Play the game
 Just want to try the game out? Head to the [release page](https://github.com/UnityTechnologies/open-project-1/releases) and grab the latest version.
 

UOP1_Project/Assets/Scripts/CameraManager.cs

 	public InputReader inputReader;
     public CinemachineFreeLook freeLookVCam;
 
+ 	[Tooltip("General multiplier for camera sensitivity/speed")]
+	[Range(1.0f, 20.0f)]
+	[SerializeField] private float cameraSensitivity = 7.0f;
+
 	private void OnEnable()
 	{
 		inputReader.cameraMoveEvent += OnCameraMove;
 
 	private void OnCameraMove(Vector2 cameraMovement)
 	{
-		freeLookVCam.m_XAxis.m_InputAxisValue = cameraMovement.x * Time.smoothDeltaTime;
-		freeLookVCam.m_YAxis.m_InputAxisValue = cameraMovement.y * Time.smoothDeltaTime;
+		freeLookVCam.m_XAxis.m_InputAxisValue = cameraMovement.x * Time.smoothDeltaTime * cameraSensitivity;
+		freeLookVCam.m_YAxis.m_InputAxisValue = cameraMovement.y * Time.smoothDeltaTime * cameraSensitivity;
 	}
 }

UOP1_Project/Assets/Scripts/Characters/Character.cs

                 turnSmoothTime);
         }
     }
+    
+    private void OnControllerColliderHit(ControllerColliderHit hit)
+    {
+        bool isMovingUpwards = verticalMovement > 0f;
+
+        if (isMovingUpwards)
+        {
+            // Making sure the collision is near the top of the head
+            float permittedDistance = characterController.radius / 2f;
+            float topPositionY = transform.position.y + characterController.height;
+            float distance = Mathf.Abs(hit.point.y - topPositionY);
+
+            if (distance <= permittedDistance)
+            {
+                // Stopping any upwards movement
+                // and having the player fall back down
+
+                isJumping = false;
+                gravityContributionMultiplier = 1f;
+
+                verticalMovement = 0f;
+            }
+        }
+    }
 
     //---- COMMANDS ISSUED BY OTHER SCRIPTS ----
 

UOP1_Project/Packages/manifest.json

 {
   "dependencies": {
-    "com.unity.addressables": "1.8.4",
-    "com.unity.cinemachine": "2.6.0",
+    "com.unity.addressables": "1.8.5",
+    "com.unity.cinemachine": "2.6.3",
-    "com.unity.ide.vscode": "1.2.1",
+    "com.unity.ide.vscode": "1.2.2",
-    "com.unity.polybrush": "1.0.1",
-    "com.unity.probuilder": "4.2.3",
+    "com.unity.polybrush": "1.0.2",
+    "com.unity.probuilder": "4.4.0",
-    "com.unity.timeline": "1.2.15",
+    "com.unity.timeline": "1.2.17",
     "com.unity.ugui": "1.0.0",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",

UOP1_Project/Packages/packages-lock.json

 {
   "dependencies": {
     "com.unity.addressables": {
-      "version": "1.8.4",
+      "version": "1.8.5",
       "depth": 0,
       "source": "registry",
       "dependencies": {
       "url": "https://packages.unity.com"
     },
     "com.unity.cinemachine": {
-      "version": "2.6.0",
+      "version": "2.6.3",
       "depth": 0,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.vscode": {
-      "version": "1.2.1",
+      "version": "1.2.2",
       "depth": 0,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
     "com.unity.polybrush": {
-      "version": "1.0.1",
+      "version": "1.0.2",
-        "com.unity.settings-manager": "1.0.0"
+        "com.unity.settings-manager": "1.0.3"
-      "version": "4.2.3",
+      "version": "4.4.0",
-        "com.unity.settings-manager": "1.0.0"
+        "com.unity.settings-manager": "1.0.3"
       },
       "url": "https://packages.unity.com"
     },
       "url": "https://packages.unity.com"
     },
     "com.unity.test-framework": {
-      "version": "1.1.14",
+      "version": "1.1.16",
       "depth": 1,
       "source": "registry",
       "dependencies": {
       "url": "https://packages.unity.com"
     },
     "com.unity.timeline": {
-      "version": "1.2.15",
+      "version": "1.2.17",
       "depth": 0,
       "source": "registry",
       "dependencies": {},
       "depth": 0,
       "source": "builtin",
       "dependencies": {
-        "com.unity.modules.ui": "1.0.0"
+        "com.unity.modules.ui": "1.0.0",
+        "com.unity.modules.imgui": "1.0.0"
       }
     },
     "com.unity.modules.ai": {

UOP1_Project/ProjectSettings/Packages/com.unity.probuilder/Settings.json

             {
                 "type": "UnityEngine.ProBuilder.SemVer, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
                 "key": "about.identifier",
-                "value": "{\"m_Value\":{\"m_Major\":4,\"m_Minor\":2,\"m_Patch\":3,\"m_Build\":-1,\"m_Type\":\"\",\"m_Metadata\":\"\",\"m_Date\":\"\"}}"
+                "value": "{\"m_Value\":{\"m_Major\":4,\"m_Minor\":4,\"m_Patch\":0,\"m_Build\":-1,\"m_Type\":\"\",\"m_Metadata\":\"\",\"m_Date\":\"\"}}"
-                "value": "{\"m_Value\":{\"m_Major\":4,\"m_Minor\":2,\"m_Patch\":3,\"m_Build\":-1,\"m_Type\":\"\",\"m_Metadata\":\"\",\"m_Date\":\"\"}}"
+                "value": "{\"m_Value\":{\"m_Major\":4,\"m_Minor\":4,\"m_Patch\":0,\"m_Build\":-1,\"m_Type\":\"\",\"m_Metadata\":\"\",\"m_Date\":\"\"}}"
             },
             {
                 "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",

UOP1_Project/ProjectSettings/ProjectVersion.txt

-m_EditorVersion: 2019.4.7f1
-m_EditorVersionWithRevision: 2019.4.7f1 (e992b1a16e65)
+m_EditorVersion: 2019.4.11f1
+m_EditorVersionWithRevision: 2019.4.11f1 (2d9804dddde7)

UOP1_Project/ProjectSettings/QualitySettings.asset

     skinWeights: 2
     textureQuality: 0
     anisotropicTextures: 1
-    antiAliasing: 0
+    antiAliasing: 2
     softParticles: 0
     softVegetation: 1
     realtimeReflectionProbes: 1

CONTRIBUTING.md

+# Contribution Guidelines
+
+Everything you need to know to contribute to Open Project #1 is included in the [Contribution Guidelines](https://docs.google.com/document/d/1PwBF4yQl69RxvVHZ2m2iiy5pYjd9QO-VcuXWDjB7QwA/edit?usp=sharing)
+
+Please read it before contributing or creating a thread on the forums.