From bc171eba80bbb1aed6d5ade7f50149904832184d Mon Sep 17 00:00:00 2001
From: PHILIP White <PW259246@falmouth.ac.uk>
Date: Fri, 28 Apr 2023 01:23:18 +0100
Subject: [PATCH] Added Idle Merchant Animations

---
 Content/Animations/GoatWalking.uasset                         | 4 ++--
 Content/Animations/Merchant/Body_high.uasset                  | 3 ---
 Content/Animations/Merchant/Idle1/Dwarf_Idle.uasset           | 3 +++
 .../Merchant/Idle1/Dwarf_Idle_Anim_mixamo_com.uasset          | 3 +++
 .../Animations/Merchant/Idle1/Dwarf_Idle_PhysicsAsset.uasset  | 3 +++
 Content/Animations/Merchant/Idle1/Dwarf_Idle_Skeleton.uasset  | 3 +++
 Content/Animations/Merchant/Idle1/WorldGridMaterial.uasset    | 3 +++
 Content/Animations/Merchant/Idle2/Idle.uasset                 | 3 +++
 Content/Animations/Merchant/Idle2/Idle_Anim_mixamo_com.uasset | 3 +++
 Content/Animations/Merchant/Idle2/Idle_PhysicsAsset.uasset    | 3 +++
 Content/Animations/Merchant/Idle2/Idle_Skeleton.uasset        | 3 +++
 Content/Animations/Merchant/Idle2/WorldGridMaterial.uasset    | 3 +++
 Content/Animations/Merchant/Wave/Waving.uasset                | 3 +++
 .../Animations/Merchant/Wave/Waving_Anim_mixamo_com.uasset    | 3 +++
 Content/Animations/Merchant/Wave/Waving_PhysicsAsset.uasset   | 3 +++
 Content/Animations/Merchant/Wave/Waving_Skeleton.uasset       | 3 +++
 Content/Animations/Merchant/Wave/WorldGridMaterial.uasset     | 3 +++
 Content/Animations/Merchant/wet_stuff_2.uasset                | 3 ---
 Content/Animations/Merchant/wet_stuff_2_Anim.uasset           | 3 ---
 Content/Animations/Merchant/wet_stuff_2_PhysicsAsset.uasset   | 3 ---
 Content/Animations/Merchant/wet_stuff_2_Skeleton.uasset       | 3 ---
 .../Civilian_Quest_Character/M_CivilianQuestCharacter.uasset  | 4 ++--
 Content/Assets/Characters/Merchant/AMerchant.uasset           | 4 ++--
 .../Assets/Characters/Merchant/MerchantMat/MerchantMat.uasset | 4 ++--
 Content/Dialogue/SM_Merchant_Blueprint.uasset                 | 4 ++--
 Content/Levels/Build.umap                                     | 4 ++--
 26 files changed, 57 insertions(+), 27 deletions(-)
 delete mode 100644 Content/Animations/Merchant/Body_high.uasset
 create mode 100644 Content/Animations/Merchant/Idle1/Dwarf_Idle.uasset
 create mode 100644 Content/Animations/Merchant/Idle1/Dwarf_Idle_Anim_mixamo_com.uasset
 create mode 100644 Content/Animations/Merchant/Idle1/Dwarf_Idle_PhysicsAsset.uasset
 create mode 100644 Content/Animations/Merchant/Idle1/Dwarf_Idle_Skeleton.uasset
 create mode 100644 Content/Animations/Merchant/Idle1/WorldGridMaterial.uasset
 create mode 100644 Content/Animations/Merchant/Idle2/Idle.uasset
 create mode 100644 Content/Animations/Merchant/Idle2/Idle_Anim_mixamo_com.uasset
 create mode 100644 Content/Animations/Merchant/Idle2/Idle_PhysicsAsset.uasset
 create mode 100644 Content/Animations/Merchant/Idle2/Idle_Skeleton.uasset
 create mode 100644 Content/Animations/Merchant/Idle2/WorldGridMaterial.uasset
 create mode 100644 Content/Animations/Merchant/Wave/Waving.uasset
 create mode 100644 Content/Animations/Merchant/Wave/Waving_Anim_mixamo_com.uasset
 create mode 100644 Content/Animations/Merchant/Wave/Waving_PhysicsAsset.uasset
 create mode 100644 Content/Animations/Merchant/Wave/Waving_Skeleton.uasset
 create mode 100644 Content/Animations/Merchant/Wave/WorldGridMaterial.uasset
 delete mode 100644 Content/Animations/Merchant/wet_stuff_2.uasset
 delete mode 100644 Content/Animations/Merchant/wet_stuff_2_Anim.uasset
 delete mode 100644 Content/Animations/Merchant/wet_stuff_2_PhysicsAsset.uasset
 delete mode 100644 Content/Animations/Merchant/wet_stuff_2_Skeleton.uasset

diff --git a/Content/Animations/GoatWalking.uasset b/Content/Animations/GoatWalking.uasset
index 9e84525..d6397db 100644
--- a/Content/Animations/GoatWalking.uasset
+++ b/Content/Animations/GoatWalking.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ec40a9c020aef5033121afd051804580b80309881e7d299b77996aa52d712798
-size 47393
+oid sha256:f8a332194bdc5c66846cc9102e75e4dbad9abefc23b6c640f102fc78366da270
+size 47489
diff --git a/Content/Animations/Merchant/Body_high.uasset b/Content/Animations/Merchant/Body_high.uasset
deleted file mode 100644
index 2a98179..0000000
--- a/Content/Animations/Merchant/Body_high.uasset
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:60394755dbbe7a0d8273524041556b4b0bdd1d01cd68186fb1398cdd9ce9d8c2
-size 8112
diff --git a/Content/Animations/Merchant/Idle1/Dwarf_Idle.uasset b/Content/Animations/Merchant/Idle1/Dwarf_Idle.uasset
new file mode 100644
index 0000000..7902713
--- /dev/null
+++ b/Content/Animations/Merchant/Idle1/Dwarf_Idle.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7a44221c04d9902d8e19f5c15ebf3a6c7c7b0b428a5c929c7dcb00496c54ff1f
+size 994363
diff --git a/Content/Animations/Merchant/Idle1/Dwarf_Idle_Anim_mixamo_com.uasset b/Content/Animations/Merchant/Idle1/Dwarf_Idle_Anim_mixamo_com.uasset
new file mode 100644
index 0000000..40c4bf7
--- /dev/null
+++ b/Content/Animations/Merchant/Idle1/Dwarf_Idle_Anim_mixamo_com.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:420eb8d4493e8009f8fe9f972f0621d1a9cb31cbced0edc1dddf69d085c25ab3
+size 711959
diff --git a/Content/Animations/Merchant/Idle1/Dwarf_Idle_PhysicsAsset.uasset b/Content/Animations/Merchant/Idle1/Dwarf_Idle_PhysicsAsset.uasset
new file mode 100644
index 0000000..a38fd9b
--- /dev/null
+++ b/Content/Animations/Merchant/Idle1/Dwarf_Idle_PhysicsAsset.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f911f1b7accbbf58f614c131c0966fbf2215bd9678c28ab4dc084c88cc8d7f91
+size 35195
diff --git a/Content/Animations/Merchant/Idle1/Dwarf_Idle_Skeleton.uasset b/Content/Animations/Merchant/Idle1/Dwarf_Idle_Skeleton.uasset
new file mode 100644
index 0000000..b0fb7c9
--- /dev/null
+++ b/Content/Animations/Merchant/Idle1/Dwarf_Idle_Skeleton.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5c3fa1605053b0cba194a8b4e83bbfac7ebd59409090b891d3cd5d4682ec7e21
+size 18332
diff --git a/Content/Animations/Merchant/Idle1/WorldGridMaterial.uasset b/Content/Animations/Merchant/Idle1/WorldGridMaterial.uasset
new file mode 100644
index 0000000..319cc8a
--- /dev/null
+++ b/Content/Animations/Merchant/Idle1/WorldGridMaterial.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e34278f87ee3e0758ae90819227ef692a46887ad0c38e5743b3ccd0e7d1319bc
+size 7952
diff --git a/Content/Animations/Merchant/Idle2/Idle.uasset b/Content/Animations/Merchant/Idle2/Idle.uasset
new file mode 100644
index 0000000..f4c4c8b
--- /dev/null
+++ b/Content/Animations/Merchant/Idle2/Idle.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d1767b057d7ee80da3bf30ef07e81652356372abdacfea41e705cad4172a1ad0
+size 994483
diff --git a/Content/Animations/Merchant/Idle2/Idle_Anim_mixamo_com.uasset b/Content/Animations/Merchant/Idle2/Idle_Anim_mixamo_com.uasset
new file mode 100644
index 0000000..315c045
--- /dev/null
+++ b/Content/Animations/Merchant/Idle2/Idle_Anim_mixamo_com.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:90c0afb17dbdc308d81551ec5065bab87bf7952581fc69ee980046d968e91b4b
+size 2614934
diff --git a/Content/Animations/Merchant/Idle2/Idle_PhysicsAsset.uasset b/Content/Animations/Merchant/Idle2/Idle_PhysicsAsset.uasset
new file mode 100644
index 0000000..13b8dc3
--- /dev/null
+++ b/Content/Animations/Merchant/Idle2/Idle_PhysicsAsset.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4012f597036a7a03ac1328f0f8b07133f0f7838c3943185ba343bd03c6799c52
+size 35141
diff --git a/Content/Animations/Merchant/Idle2/Idle_Skeleton.uasset b/Content/Animations/Merchant/Idle2/Idle_Skeleton.uasset
new file mode 100644
index 0000000..0aab103
--- /dev/null
+++ b/Content/Animations/Merchant/Idle2/Idle_Skeleton.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d2f5f4f99ccce5da956acd982b134c7e4c6451340a148099da1d5eb5d02015d5
+size 18278
diff --git a/Content/Animations/Merchant/Idle2/WorldGridMaterial.uasset b/Content/Animations/Merchant/Idle2/WorldGridMaterial.uasset
new file mode 100644
index 0000000..827aaad
--- /dev/null
+++ b/Content/Animations/Merchant/Idle2/WorldGridMaterial.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:85dea29ee0e34dfbc7eec83ce3afd57029d3d662d6999483c3f80f8181232153
+size 7943
diff --git a/Content/Animations/Merchant/Wave/Waving.uasset b/Content/Animations/Merchant/Wave/Waving.uasset
new file mode 100644
index 0000000..d0b7d5d
--- /dev/null
+++ b/Content/Animations/Merchant/Wave/Waving.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:652d8ce2ee83546a2d38a630b59002252f26a52d328a6ae5de2e6cf3d971217e
+size 994185
diff --git a/Content/Animations/Merchant/Wave/Waving_Anim_mixamo_com.uasset b/Content/Animations/Merchant/Wave/Waving_Anim_mixamo_com.uasset
new file mode 100644
index 0000000..f2e5b2f
--- /dev/null
+++ b/Content/Animations/Merchant/Wave/Waving_Anim_mixamo_com.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9189e54e4182dfa687c29d6dc8f504721302637c823b5c98f6b01aa3892e60ab
+size 516814
diff --git a/Content/Animations/Merchant/Wave/Waving_PhysicsAsset.uasset b/Content/Animations/Merchant/Wave/Waving_PhysicsAsset.uasset
new file mode 100644
index 0000000..b33bf4b
--- /dev/null
+++ b/Content/Animations/Merchant/Wave/Waving_PhysicsAsset.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a1989a755ccc91741f4cf1f894bc39bb9cce7ec8321bd624793aab63d61986b8
+size 35155
diff --git a/Content/Animations/Merchant/Wave/Waving_Skeleton.uasset b/Content/Animations/Merchant/Wave/Waving_Skeleton.uasset
new file mode 100644
index 0000000..3a3273d
--- /dev/null
+++ b/Content/Animations/Merchant/Wave/Waving_Skeleton.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9a609402dba4fa71992b4b9aeb032b0d41c5d6a2fae6aff392c9f5e093c69787
+size 18292
diff --git a/Content/Animations/Merchant/Wave/WorldGridMaterial.uasset b/Content/Animations/Merchant/Wave/WorldGridMaterial.uasset
new file mode 100644
index 0000000..a9405e9
--- /dev/null
+++ b/Content/Animations/Merchant/Wave/WorldGridMaterial.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2aea02141fe792411fe22ae20128620eef4caab4009143b9f193d3a2fca2bb62
+size 7950
diff --git a/Content/Animations/Merchant/wet_stuff_2.uasset b/Content/Animations/Merchant/wet_stuff_2.uasset
deleted file mode 100644
index cc2566c..0000000
--- a/Content/Animations/Merchant/wet_stuff_2.uasset
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:21ed9bda0d70a193b001114ad5f22886126bc6aa5676fe37b6eb03a04d9a05e1
-size 1121897
diff --git a/Content/Animations/Merchant/wet_stuff_2_Anim.uasset b/Content/Animations/Merchant/wet_stuff_2_Anim.uasset
deleted file mode 100644
index 72e7d55..0000000
--- a/Content/Animations/Merchant/wet_stuff_2_Anim.uasset
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d584bfc051cbe3133f0b3c62479f4c42c772863e2e67ff29ae30ec1ae0c06390
-size 353931
diff --git a/Content/Animations/Merchant/wet_stuff_2_PhysicsAsset.uasset b/Content/Animations/Merchant/wet_stuff_2_PhysicsAsset.uasset
deleted file mode 100644
index 8c288ee..0000000
--- a/Content/Animations/Merchant/wet_stuff_2_PhysicsAsset.uasset
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c2c8fc40b4611554c8d365bce84568053834e18d12148e1ff6db49b5b8e05c18
-size 10550
diff --git a/Content/Animations/Merchant/wet_stuff_2_Skeleton.uasset b/Content/Animations/Merchant/wet_stuff_2_Skeleton.uasset
deleted file mode 100644
index e144a9c..0000000
--- a/Content/Animations/Merchant/wet_stuff_2_Skeleton.uasset
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c49f16fc38c4e5aeb34487c66c7edee802d665cfcf2458d55bc05b9f47d4b0b1
-size 148661
diff --git a/Content/Assets/Characters/Civilian_Quest_Character/M_CivilianQuestCharacter.uasset b/Content/Assets/Characters/Civilian_Quest_Character/M_CivilianQuestCharacter.uasset
index 2fcedc8..b28a6cc 100644
--- a/Content/Assets/Characters/Civilian_Quest_Character/M_CivilianQuestCharacter.uasset
+++ b/Content/Assets/Characters/Civilian_Quest_Character/M_CivilianQuestCharacter.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1371509c89f3bca108031dc13a1cada4db65172391e104ebcb6f828c00448ba5
-size 13905
+oid sha256:2b422539d589316415a4cc99ce89ad6b0bf73e9652afd9f4f728a3f31da775d4
+size 13961
diff --git a/Content/Assets/Characters/Merchant/AMerchant.uasset b/Content/Assets/Characters/Merchant/AMerchant.uasset
index 43d8fa1..7727174 100644
--- a/Content/Assets/Characters/Merchant/AMerchant.uasset
+++ b/Content/Assets/Characters/Merchant/AMerchant.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6af590f6da128baba7c4aa52d989bd4f35179f3662763478e9dd00be84ce12e6
-size 29146
+oid sha256:f393154a0f896dc3f18db5f2fde98c24c0e09b0a5af2353c0791a3dc68ddfaa6
+size 31228
diff --git a/Content/Assets/Characters/Merchant/MerchantMat/MerchantMat.uasset b/Content/Assets/Characters/Merchant/MerchantMat/MerchantMat.uasset
index 50efe8c..4d53e9a 100644
--- a/Content/Assets/Characters/Merchant/MerchantMat/MerchantMat.uasset
+++ b/Content/Assets/Characters/Merchant/MerchantMat/MerchantMat.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3135dc7e625d2f8e8aae5488935f1395229cbe0b7e51491ff15d6fe51f792947
-size 14188
+oid sha256:103e7f6f9ad50ff9367e1a78d23022ccf82eb7559d6b10f9e1b23d42c6386546
+size 14236
diff --git a/Content/Dialogue/SM_Merchant_Blueprint.uasset b/Content/Dialogue/SM_Merchant_Blueprint.uasset
index a94fbbd..fbc69fd 100644
--- a/Content/Dialogue/SM_Merchant_Blueprint.uasset
+++ b/Content/Dialogue/SM_Merchant_Blueprint.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c8558a29f7d81b3b9c2e4ebf82cd6e08f123f9443b85446a4aec5c53459ef138
-size 73675
+oid sha256:c1a05a77e83cdcc946788f34d06958a1c8ee5bdc010408ce4302fb57ba3d72dd
+size 74738
diff --git a/Content/Levels/Build.umap b/Content/Levels/Build.umap
index e059c49..fd16943 100644
--- a/Content/Levels/Build.umap
+++ b/Content/Levels/Build.umap
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4a2ede72f000faff083043774cb704f140df75e68565235d99de200d07c41aa3
-size 3500025
+oid sha256:7dd3e648b3c9ff971d456dbac8784db4eec0dad5f5b31ba1965c74c5c690e839
+size 3493015