Merge branch 'develop'

Epicguru · Feb 13, 2024 · 76c8d9f · 76c8d9f
2 parents 88ea003 + a601b38
commit 76c8d9f
Show file tree

Hide file tree

Showing 155 changed files with 10,364 additions and 873 deletions.
diff --git a/Animations/Duel_FriendlyEnd.json b/Animations/Duel_FriendlyEnd.json
@@ -1,5 +1,5 @@
 {
-  "ExportTimeUTC": "2023-03-03T21:02:30.5723902Z",
+  "ExportTimeUTC": "2024-02-13T17:46:05.5925725Z",
   "Name": "Duel_FriendlyEnd",
   "Length": 4.33333349,
   "Bounds": {
@@ -20,7 +20,7 @@
   ],
   "Parts": [
     {
-      "ID": 19260,
+      "ID": 21676,
       "Path": "PawnBHolding",
       "Curves": {
         "GameObject.m_IsActive": {
@@ -315,7 +315,7 @@
       "SweepPaths": []
     },
     {
-      "ID": 19504,
+      "ID": 21928,
       "Path": "PawnAHolding",
       "Curves": {
         "Transform.m_LocalPosition.x": {
@@ -834,7 +834,7 @@
       "SweepPaths": []
     },
     {
-      "ID": 19200,
+      "ID": 21616,
       "Path": "BodyB",
       "CustomName": "BodyB",
       "Curves": {
@@ -1518,7 +1518,7 @@
       "SweepPaths": []
     },
     {
-      "ID": 19526,
+      "ID": 21950,
       "Path": "BodyA",
       "CustomName": "BodyA",
       "Curves": {
@@ -2016,10 +2016,10 @@
       "SweepPaths": []
     },
     {
-      "ID": 18974,
+      "ID": 21366,
       "Path": "PawnAHolding/ItemA",
       "CustomName": "ItemA",
-      "ParentID": 19504,
+      "ParentID": 21928,
       "Curves": {
         "AnimatedPart.FlipY": {
           "Keyframes": [
@@ -2310,7 +2310,7 @@
         "AnimatedPart.FrameIndex": 0.0,
         "PawnBody.Direction": 0.0
       },
-      "SplitDrawPivotPartID": 19600,
+      "SplitDrawPivotPartID": 22024,
       "SweepPaths": [
         [
           {
@@ -3052,10 +3052,10 @@
       ]
     },
     {
-      "ID": 19630,
+      "ID": 22054,
       "Path": "PawnBHolding/ItemB",
       "CustomName": "ItemB",
-      "ParentID": 19260,
+      "ParentID": 21676,
       "Curves": {
         "Transform.localEulerAnglesRaw.x": {
           "Keyframes": [
@@ -4149,10 +4149,10 @@
       ]
     },
     {
-      "ID": 19514,
+      "ID": 21938,
       "Path": "PawnBHolding/HandA",
       "CustomName": "HandA2",
-      "ParentID": 19260,
+      "ParentID": 21676,
       "Curves": {
         "Transform.m_LocalPosition.x": {
           "Keyframes": [
@@ -4477,10 +4477,10 @@
       "SweepPaths": []
     },
     {
-      "ID": 19242,
+      "ID": 21658,
       "Path": "PawnBHolding/HandB",
       "CustomName": "HandB2",
-      "ParentID": 19260,
+      "ParentID": 21676,
       "Curves": {
         "Transform.m_LocalPosition.x": {
           "Keyframes": [
@@ -4732,10 +4732,10 @@
       "SweepPaths": []
     },
     {
-      "ID": 19480,
+      "ID": 21904,
       "Path": "PawnAHolding/HandA",
       "CustomName": "HandA",
-      "ParentID": 19504,
+      "ParentID": 21928,
       "Curves": {
         "Transform.localEulerAnglesRaw.x": {
           "Keyframes": [
@@ -5012,10 +5012,10 @@
       "SweepPaths": []
     },
     {
-      "ID": 19798,
+      "ID": 22238,
       "Path": "PawnAHolding/HandB",
       "CustomName": "HandB",
-      "ParentID": 19504,
+      "ParentID": 21928,
       "Curves": {
         "Transform.m_LocalPosition.x": {
           "Keyframes": [
@@ -5223,7 +5223,7 @@
       "SweepPaths": []
     },
     {
-      "ID": 19498,
+      "ID": 21922,
       "Path": "HandGrabSparks",
       "TexturePath": "AM/HandGrabSparks",
       "Curves": {
@@ -5476,10 +5476,10 @@
       "SweepPaths": []
     },
     {
-      "ID": 19062,
+      "ID": 21470,
       "Path": "BodyA/HeadA",
       "CustomName": "HeadA",
-      "ParentID": 19526,
+      "ParentID": 21950,
       "Curves": {},
       "DefaultValues": {
         "GameObject.m_IsActive": 1.0,
@@ -5508,10 +5508,10 @@
       "SweepPaths": []
     },
     {
-      "ID": 19706,
+      "ID": 22136,
       "Path": "BodyB/HeadB",
       "CustomName": "HeadB",
-      "ParentID": 19200,
+      "ParentID": 21616,
       "Curves": {},
       "DefaultValues": {
         "GameObject.m_IsActive": 1.0,
@@ -5540,7 +5540,7 @@
       "SweepPaths": []
     },
     {
-      "ID": 19600,
+      "ID": 22024,
       "Path": "WeaponACutoff",
       "Curves": {},
       "DefaultValues": {
@@ -5568,6 +5568,37 @@
         "PawnBody.Direction": 0.0
       },
       "SweepPaths": []
+    },
+    {
+      "ID": -5395966,
+      "Path": "QuestionMark",
+      "TexturePath": "AM/QuestionMark",
+      "Curves": {},
+      "DefaultValues": {
+        "GameObject.m_IsActive": 0.0,
+        "Transform.m_LocalPosition.x": 0.0,
+        "Transform.m_LocalPosition.y": 0.0,
+        "Transform.m_LocalPosition.z": 0.0,
+        "Transform.localEulerAnglesRaw.x": 0.0,
+        "Transform.localEulerAnglesRaw.y": 0.0,
+        "Transform.localEulerAnglesRaw.z": 0.0,
+        "Transform.m_LocalScale.x": 1.0,
+        "Transform.m_LocalScale.y": 1.0,
+        "Transform.m_LocalScale.z": 1.0,
+        "AnimatedPart.DataA": 0.0,
+        "AnimatedPart.DataB": 0.0,
+        "AnimatedPart.DataC": 0.0,
+        "AnimatedPart.Tint.r": 1.0,
+        "AnimatedPart.Tint.g": 1.0,
+        "AnimatedPart.Tint.b": 1.0,
+        "AnimatedPart.Tint.a": 1.0,
+        "AnimatedPart.FlipX": 0.0,
+        "AnimatedPart.FlipY": 0.0,
+        "AnimatedPart.SplitDrawMode": 0.0,
+        "AnimatedPart.FrameIndex": 0.0,
+        "PawnBody.Direction": 0.0
+      },
+      "SweepPaths": []
     }
   ]
 }