Merge branch 'master' of https://git.steelants.cz/PragueGameJam/GlobalGameJame

Assets/Prefabs/camp_fire.prefab

@@ -4984,7 +4984,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 7542439756349961061, guid: 05f9e7c8dc10f7641bb783f57e00471b, type: 3}
+  - {fileID: -4042805660767941618, guid: b5a9b7f0ff35a024b974960e652c8e33, type: 3}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -5063,7 +5063,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 7542439756349961061, guid: 05f9e7c8dc10f7641bb783f57e00471b, type: 3}
+  - {fileID: -4042805660767941618, guid: b5a9b7f0ff35a024b974960e652c8e33, type: 3}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -5142,7 +5142,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 7542439756349961061, guid: 05f9e7c8dc10f7641bb783f57e00471b, type: 3}
+  - {fileID: -4042805660767941618, guid: b5a9b7f0ff35a024b974960e652c8e33, type: 3}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -5458,7 +5458,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 7542439756349961061, guid: 05f9e7c8dc10f7641bb783f57e00471b, type: 3}
+  - {fileID: -4042805660767941618, guid: b5a9b7f0ff35a024b974960e652c8e33, type: 3}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0

Assets/Scenes/PlayScene.unity.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 03f1c44c053777842ae209ed02a9a1dc
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scenes/Test-Haitem.unity

@@ -8502,12 +8502,12 @@ PrefabInstance:
     - target: {fileID: 5981860502065413816, guid: 204c7411afdd01a478b1a1e25607d50c,
         type: 3}
       propertyPath: Priority
-      value: 202
+      value: 128
       objectReference: {fileID: 0}
     - target: {fileID: 5981860502065413816, guid: 204c7411afdd01a478b1a1e25607d50c,
         type: 3}
       propertyPath: m_Volume
-      value: 0.1
+      value: 0.106
       objectReference: {fileID: 0}
     - target: {fileID: 6900128296167351179, guid: 204c7411afdd01a478b1a1e25607d50c,
         type: 3}

Assets/Scripts/PlayerManager.cs

@@ -6,10 +6,10 @@ using UnityEngine.SceneManagement;
 public class PlayerManager : MonoBehaviour
 {
 
-    public float speed = 10;
+    public float speed = 8;
-    public float runSpeed = 25;
+    public float runSpeed = 20;
     public float rotateSpeed = 5;
-    public float mouseSensitive = 200;
+    public float mouseSensitive = 100;
     public float buildRate = 0.5f;
     public float health = 100;
     public float actualHealth = 100;
@@ -45,6 +45,10 @@ public class PlayerManager : MonoBehaviour
     // Update is called once per frame
     void Update()
     {
+        if (Input.GetKeyDown(KeyCode.Escape))
+        {
+            Application.Quit(0);
+        }
         guiManager.Wood.text = barricadeMaterials.ToString();
         guiManager.Ammo.text = ammo.ToString();
         Move();

ProjectSettings/EditorBuildSettings.asset

@@ -4,5 +4,8 @@
 EditorBuildSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 2
-  m_Scenes: []
+  m_Scenes:
+  - enabled: 1
+    path: Assets/Scenes/PlayScene.unity
+    guid: 03f1c44c053777842ae209ed02a9a1dc
   m_configObjects: {}

ProjectSettings/GraphicsSettings.asset

@@ -35,6 +35,9 @@ GraphicsSettings:
   - {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
   m_PreloadedShaders: []
   m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
     type: 0}

ProjectSettings/UnityConnectSettings.asset

@@ -4,7 +4,7 @@
 UnityConnectSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 1
-  m_Enabled: 0
+  m_Enabled: 1
   m_TestMode: 0
   m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events
   m_EventUrl: https://cdp.cloud.unity3d.com/v1/events