Commit 2310da0a authored by Andrew Conn's avatar Andrew Conn

Merge branch 'EnemyMovementHopefullyNotBrokenThisTimeIDK' into 'master'

Enemy movement hopefully not broken this time idk

See merge request !1
parents 1f1abf99 e996ef41

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

[Ll]ibrary/
[Tt]emp/
[Oo]bj/
[Bb]uild/
[Bb]uilds/
Assets/AssetStoreTools*
# Visual Studio cache directory
.vs/
# Autogenerated VS/MD/Consulo solution and project files
ExportedObj/
.consulo/
*.csproj
*.unityproj
*.sln
*.suo
*.tmp
*.user
*.userprefs
*.pidb
*.booproj
*.svd
*.pdb
*.opendb
# Unity3D generated meta files
*.pidb.meta
*.pdb.meta
# Unity3D Generated File On Crash Reports
sysinfo.txt
# Builds
*.apk
*.unitypackage
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
fileFormatVersion: 2
guid: 7a68d011fcd231845b38f1d19a3e37d9
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
......@@ -111,7 +111,7 @@ NavMeshSettings:
accuratePlacement: 0
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
m_NavMeshData: {fileID: 23800000, guid: c61d86efbf5ffcf4ca80e83aedbf045f, type: 2}
--- !u!1 &37405686
GameObject:
m_ObjectHideFlags: 0
......@@ -5315,12 +5315,13 @@ GameObject:
- component: {fileID: 715473159}
- component: {fileID: 715473158}
- component: {fileID: 715473157}
- component: {fileID: 715473161}
m_Layer: 0
m_Name: Cube (3)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_StaticEditorFlags: 8
m_IsActive: 1
--- !u!65 &715473157
BoxCollider:
......@@ -5633,6 +5634,10 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 100000, guid: 5e9e851c0e142814dac026a256ba2ac0, type: 3}
propertyPath: m_TagString
value: Player
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 5e9e851c0e142814dac026a256ba2ac0, type: 3}
propertyPath: m_LocalPosition.x
value: 0
......@@ -5805,12 +5810,13 @@ GameObject:
- component: {fileID: 1110930965}
- component: {fileID: 1110930964}
- component: {fileID: 1110930963}
- component: {fileID: 1110930967}
m_Layer: 0
m_Name: Cube (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_StaticEditorFlags: 8
m_IsActive: 1
--- !u!65 &1110930963
BoxCollider:
......@@ -5884,6 +5890,22 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!208 &1110930967
NavMeshObstacle:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1110930962}
m_Enabled: 1
serializedVersion: 3
m_Shape: 1
m_Extents: {x: 0.5, y: 0.5, z: 0.5}
m_MoveThreshold: 0.1
m_Carve: 0
m_CarveOnlyStationary: 1
m_Center: {x: 0, y: 0, z: 0}
m_TimeToStationary: 0.5
--- !u!1 &1266774781
GameObject:
m_ObjectHideFlags: 0
......@@ -5896,12 +5918,13 @@ GameObject:
- component: {fileID: 1266774784}
- component: {fileID: 1266774783}
- component: {fileID: 1266774782}
- component: {fileID: 1266774786}
m_Layer: 0
m_Name: Cube (2)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_StaticEditorFlags: 8
m_IsActive: 1
--- !u!65 &1266774782
BoxCollider:
......@@ -5975,6 +5998,22 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!208 &1266774786
NavMeshObstacle:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1266774781}
m_Enabled: 1
serializedVersion: 3
m_Shape: 1
m_Extents: {x: 0.5, y: 0.5, z: 0.5}
m_MoveThreshold: 0.1
m_Carve: 0
m_CarveOnlyStationary: 1
m_Center: {x: 0, y: 0, z: 0}
m_TimeToStationary: 0.5
--- !u!1 &1296001795
GameObject:
m_ObjectHideFlags: 0
......@@ -6080,6 +6119,7 @@ GameObject:
- component: {fileID: 1376898703}
- component: {fileID: 1376898702}
- component: {fileID: 1376898706}
- component: {fileID: 1376898707}
m_Layer: 0
m_Name: PlaceholderBoi
m_TagString: Untagged
......@@ -6191,12 +6231,13 @@ GameObject:
- component: {fileID: 1678382739}
- component: {fileID: 1678382738}
- component: {fileID: 1678382737}
- component: {fileID: 1678382741}
m_Layer: 0
m_Name: Floor
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_StaticEditorFlags: 8
m_IsActive: 1
--- !u!65 &1678382737
BoxCollider:
......@@ -6270,6 +6311,22 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!208 &1678382741
NavMeshObstacle:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1678382736}
m_Enabled: 1
serializedVersion: 3
m_Shape: 1
m_Extents: {x: 0.5, y: 0.5, z: 0.5}
m_MoveThreshold: 0.1
m_Carve: 0
m_CarveOnlyStationary: 1
m_Center: {x: 0, y: 0, z: 0}
m_TimeToStationary: 0.5
--- !u!1 &1680332401
GameObject:
m_ObjectHideFlags: 0
......@@ -6282,12 +6339,13 @@ GameObject:
- component: {fileID: 1680332404}
- component: {fileID: 1680332403}