Merge pull request #61 from hackerspace-ntnu/fix/misc

Fix misc. bugs + code improvements
hackerspace-ntnu · Nov 24, 2021 · 712105c · 712105c
2 parents 867b713 + 930e6e3
commit 712105c
Show file tree

Hide file tree

Showing 107 changed files with 906 additions and 1,263 deletions.
diff --git a/Assets/Materials/Loot.meta b/Assets/Materials/Loot.meta
diff --git a/...CrystalLoot/Loot material components.meta → ...erials/Loot/Loot material components.meta b/...CrystalLoot/Loot material components.meta → ...erials/Loot/Loot material components.meta
diff --git a/...rial components/Crystalv2_Material_AO.png → ...rial components/Crystalv2_Material_AO.png b/...rial components/Crystalv2_Material_AO.png → ...rial components/Crystalv2_Material_AO.png
diff --git a/...components/Crystalv2_Material_AO.png.meta → ...components/Crystalv2_Material_AO.png.meta b/...components/Crystalv2_Material_AO.png.meta → ...components/Crystalv2_Material_AO.png.meta
diff --git a/... components/Crystalv2_Material_Albedo.png → ... components/Crystalv2_Material_Albedo.png b/... components/Crystalv2_Material_Albedo.png → ... components/Crystalv2_Material_Albedo.png
diff --git a/...onents/Crystalv2_Material_Albedo.png.meta → ...onents/Crystalv2_Material_Albedo.png.meta b/...onents/Crystalv2_Material_Albedo.png.meta → ...onents/Crystalv2_Material_Albedo.png.meta
diff --git a/... components/Crystalv2_Material_Height.png → ... components/Crystalv2_Material_Height.png b/... components/Crystalv2_Material_Height.png → ... components/Crystalv2_Material_Height.png
diff --git a/...onents/Crystalv2_Material_Height.png.meta → ...onents/Crystalv2_Material_Height.png.meta b/...onents/Crystalv2_Material_Height.png.meta → ...onents/Crystalv2_Material_Height.png.meta
diff --git a/...omponents/Crystalv2_Material_Metallic.png → ...omponents/Crystalv2_Material_Metallic.png b/...omponents/Crystalv2_Material_Metallic.png → ...omponents/Crystalv2_Material_Metallic.png
diff --git a/...ents/Crystalv2_Material_Metallic.png.meta → ...ents/Crystalv2_Material_Metallic.png.meta b/...ents/Crystalv2_Material_Metallic.png.meta → ...ents/Crystalv2_Material_Metallic.png.meta
diff --git a/... components/Crystalv2_Material_Normal.png → ... components/Crystalv2_Material_Normal.png b/... components/Crystalv2_Material_Normal.png → ... components/Crystalv2_Material_Normal.png
diff --git a/...onents/Crystalv2_Material_Normal.png.meta → ...onents/Crystalv2_Material_Normal.png.meta b/...onents/Crystalv2_Material_Normal.png.meta → ...onents/Crystalv2_Material_Normal.png.meta
diff --git a/...refabs/Loot/CrystalLoot/Loot material.mat → Assets/Materials/Loot/Loot material.mat b/...refabs/Loot/CrystalLoot/Loot material.mat → Assets/Materials/Loot/Loot material.mat
diff --git a/...s/Loot/CrystalLoot/Loot material.mat.meta → Assets/Materials/Loot/Loot material.mat.meta b/...s/Loot/CrystalLoot/Loot material.mat.meta → Assets/Materials/Loot/Loot material.mat.meta
diff --git a/Assets/Materials/Terrain/Scenery.meta b/Assets/Materials/Terrain/Scenery.meta
diff --git a/...s/Prefabs/Terrain/Decor/color palette.png → ...terials/Terrain/Scenery/color palette.png b/...s/Prefabs/Terrain/Decor/color palette.png → ...terials/Terrain/Scenery/color palette.png
diff --git a/...fabs/Terrain/Decor/color palette.png.meta → ...ls/Terrain/Scenery/color palette.png.meta b/...fabs/Terrain/Decor/color palette.png.meta → ...ls/Terrain/Scenery/color palette.png.meta
diff --git a/.../Prefabs/Terrain/Decor/fauna material.mat → ...erials/Terrain/Scenery/fauna material.mat b/.../Prefabs/Terrain/Decor/fauna material.mat → ...erials/Terrain/Scenery/fauna material.mat
diff --git a/...abs/Terrain/Decor/fauna material.mat.meta → ...s/Terrain/Scenery/fauna material.mat.meta b/...abs/Terrain/Decor/fauna material.mat.meta → ...s/Terrain/Scenery/fauna material.mat.meta
diff --git a/Assets/Models/Enemies/Animations/Skeleton.controller b/Assets/Models/Enemies/Animations/Skeleton.controller
@@ -224,31 +224,31 @@ AnimatorController:
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: DeathMode
     m_Type: 1
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: Dead
     m_Type: 4
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: WalkMode
     m_Type: 1
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: Chasing
     m_Type: 4
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer
@@ -363,7 +363,7 @@ BlendTree:
   m_BlendParameterY: Blend
   m_MinThreshold: 0
   m_MaxThreshold: 7
-  m_UseAutomaticThresholds: 0
+  m_UseAutomaticThresholds: 1
   m_NormalizedBlendValues: 0
   m_BlendType: 0
 --- !u!1101 &483655395840417495

diff --git a/Assets/Models/enemy.meta → Assets/Models/Enemies/PlaceholderEnemy.meta b/Assets/Models/enemy.meta → Assets/Models/Enemies/PlaceholderEnemy.meta
diff --git a/Assets/Models/enemy/enemy.blend → ...dels/Enemies/PlaceholderEnemy/enemy.blend b/Assets/Models/enemy/enemy.blend → ...dels/Enemies/PlaceholderEnemy/enemy.blend
diff --git a/Assets/Models/enemy/enemy.blend.meta → ...Enemies/PlaceholderEnemy/enemy.blend.meta b/Assets/Models/enemy/enemy.blend.meta → ...Enemies/PlaceholderEnemy/enemy.blend.meta
diff --git a/Assets/Models/enemy/enemy.fbx → ...Models/Enemies/PlaceholderEnemy/enemy.fbx b/Assets/Models/enemy/enemy.fbx → ...Models/Enemies/PlaceholderEnemy/enemy.fbx
diff --git a/Assets/Models/enemy/enemy.fbx.meta → ...s/Enemies/PlaceholderEnemy/enemy.fbx.meta b/Assets/Models/enemy/enemy.fbx.meta → ...s/Enemies/PlaceholderEnemy/enemy.fbx.meta
diff --git a/Assets/Models/enemy/enemy_texture.png → ...nemies/PlaceholderEnemy/enemy_texture.png b/Assets/Models/enemy/enemy_texture.png → ...nemies/PlaceholderEnemy/enemy_texture.png
diff --git a/Assets/Models/enemy/enemy_texture.png.meta → ...s/PlaceholderEnemy/enemy_texture.png.meta b/Assets/Models/enemy/enemy_texture.png.meta → ...s/PlaceholderEnemy/enemy_texture.png.meta
diff --git a/Assets/Models/Loot.meta b/Assets/Models/Loot.meta
diff --git a/...Prefabs/Loot/CrystalLoot/Loot crystal.fbx → Assets/Models/Loot/Loot crystal.fbx b/...Prefabs/Loot/CrystalLoot/Loot crystal.fbx → Assets/Models/Loot/Loot crystal.fbx
diff --git a/...bs/Loot/CrystalLoot/Loot crystal.fbx.meta → Assets/Models/Loot/Loot crystal.fbx.meta b/...bs/Loot/CrystalLoot/Loot crystal.fbx.meta → Assets/Models/Loot/Loot crystal.fbx.meta
diff --git a/Assets/Prefabs/Base/Base.prefab b/Assets/Prefabs/Base/Base.prefab
@@ -215,9 +215,9 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 5829545455071137389}
-  - component: {fileID: 5829545455071137386}
   - component: {fileID: 5829545455071137385}
   - component: {fileID: 990519977}
+  - component: {fileID: 5829545455071137386}
   - component: {fileID: 990519971}
   m_Layer: 8
   m_Name: Base
@@ -244,19 +244,6 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!65 &5829545455071137386
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5829545455071137399}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 1.4, y: 1.4, z: 1.4}
-  m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &5829545455071137385
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -293,6 +280,19 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   health: 10
   maxHealth: 100
+--- !u!65 &5829545455071137386
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5829545455071137399}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1.4, y: 1.4, z: 1.4}
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!95 &990519971
 Animator:
   serializedVersion: 3

diff --git a/Assets/Prefabs/Base/Explosion.prefab b/Assets/Prefabs/Base/Explosion.prefab
@@ -9,9 +9,9 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 8540785681650497267}
+  - component: {fileID: 8540785681650497266}
   - component: {fileID: 8540785681650497264}
   - component: {fileID: 8540785681650497265}
-  - component: {fileID: 8540785681650497266}
   m_Layer: 0
   m_Name: Explosion
   m_TagString: Untagged
@@ -33,6 +33,51 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
+--- !u!114 &8540785681650497266
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8540785681650497039}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 23da7d395c7d2402b9dea90134beb67f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  explosionCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 2
+      outSlope: 2
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0
+      outWeight: 0
+    - serializedVersion: 3
+      time: 0.4168595
+      value: 2.079442
+      inSlope: 1.6487453
+      outSlope: 1.6487453
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.19291438
+    - serializedVersion: 3
+      time: 0.9791565
+      value: 2.2972221
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0
+      outWeight: 0
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
 --- !u!33 &8540785681650497264
 MeshFilter:
   m_ObjectHideFlags: 0
@@ -82,48 +127,3 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
---- !u!114 &8540785681650497266
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8540785681650497039}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 23da7d395c7d2402b9dea90134beb67f, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  explosionCurve:
-    serializedVersion: 2
-    m_Curve:
-    - serializedVersion: 3
-      time: 0
-      value: 0
-      inSlope: 2
-      outSlope: 2
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0
-      outWeight: 0
-    - serializedVersion: 3
-      time: 0.4168595
-      value: 2.079442
-      inSlope: 1.6487453
-      outSlope: 1.6487453
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0.33333334
-      outWeight: 0.19291438
-    - serializedVersion: 3
-      time: 0.9791565
-      value: 2.2972221
-      inSlope: 0
-      outSlope: 0
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0
-      outWeight: 0
-    m_PreInfinity: 2
-    m_PostInfinity: 2
-    m_RotationOrder: 4
diff --git a/Assets/Prefabs/Enemy/Enemies/PlaceholderEnemy.prefab b/Assets/Prefabs/Enemy/Enemies/PlaceholderEnemy.prefab
@@ -182,11 +182,11 @@ GameObject:
   m_Component:
   - component: {fileID: 5818494558055746955}
   - component: {fileID: 1339947353988727182}
-  - component: {fileID: 490591066213595821}
-  - component: {fileID: 6258525490855855638}
-  - component: {fileID: 1387437967117219409}
   - component: {fileID: 1234598521595535095}
   - component: {fileID: 5307998303341428611}
+  - component: {fileID: 1387437967117219409}
+  - component: {fileID: 490591066213595821}
+  - component: {fileID: 6258525490855855638}
   m_Layer: 11
   m_Name: PlaceholderEnemy
   m_TagString: Untagged
@@ -232,36 +232,34 @@ MonoBehaviour:
   playerAttackDistance: 1
   playerChaseStopDistance: 4
   attackDamage: 1
---- !u!136 &490591066213595821
-CapsuleCollider:
+--- !u!114 &1234598521595535095
+MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6626098340742600497}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
   m_Enabled: 1
-  m_Radius: 0.4
-  m_Height: 1.4
-  m_Direction: 1
-  m_Center: {x: 0, y: 0.8, z: 0}
---- !u!54 &6258525490855855638
-Rigidbody:
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dde39a3ed8a181143bd4f0d992b95909, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  health: 1
+  maxHealth: 1
+--- !u!114 &5307998303341428611
+MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6626098340742600497}
-  serializedVersion: 2
-  m_Mass: 1
-  m_Drag: 0
-  m_AngularDrag: 0.05
-  m_UseGravity: 1
-  m_IsKinematic: 0
-  m_Interpolate: 0
-  m_Constraints: 80
-  m_CollisionDetection: 0
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 36286781665dc37498a44f6eb6d18e9b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  lootPrefab: {fileID: 8630265067307965030, guid: 7a8fb2fa4df12b44b9b6261450ac0d42, type: 3}
+  spawnHeight: 1.5
 --- !u!195 &1387437967117219409
 NavMeshAgent:
   m_ObjectHideFlags: 0
@@ -284,34 +282,36 @@ NavMeshAgent:
   m_BaseOffset: 0
   m_WalkableMask: 4294967295
   m_ObstacleAvoidanceType: 4
---- !u!114 &1234598521595535095
-MonoBehaviour:
+--- !u!136 &490591066213595821
+CapsuleCollider:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6626098340742600497}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
   m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: dde39a3ed8a181143bd4f0d992b95909, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  health: 1
-  maxHealth: 1
---- !u!114 &5307998303341428611
-MonoBehaviour:
+  m_Radius: 0.4
+  m_Height: 1.4
+  m_Direction: 1
+  m_Center: {x: 0, y: 0.8, z: 0}
+--- !u!54 &6258525490855855638
+Rigidbody:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6626098340742600497}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 36286781665dc37498a44f6eb6d18e9b, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  lootPrefab: {fileID: 8630265067307965030, guid: 7a8fb2fa4df12b44b9b6261450ac0d42, type: 3}
-  spawnHeight: 1.5
+  serializedVersion: 2
+  m_Mass: 1
+  m_Drag: 0
+  m_AngularDrag: 0.05
+  m_UseGravity: 1
+  m_IsKinematic: 0
+  m_Interpolate: 0
+  m_Constraints: 80
+  m_CollisionDetection: 0
 --- !u!1 &6681559575030372356
 GameObject:
   m_ObjectHideFlags: 0