Merge branch 'feature/unique-skill' into develop

Epicguru · Jun 19, 2023 · 52ffb62 · 52ffb62
2 parents 285c859 + b4b7d38
commit 52ffb62
Show file tree

Hide file tree

Showing 157 changed files with 6,723 additions and 1,278 deletions.
diff --git a/Animations/Duel_BowColossal.json b/Animations/Duel_BowColossal.json
@@ -1,11 +1,11 @@
 {
-  "ExportTimeUTC": "2023-03-19T00:07:16.4030055Z",
+  "ExportTimeUTC": "2023-06-17T17:59:13.7871502Z",
   "Name": "Duel_BowColossal",
   "Length": 3.16666675,
   "Events": [],
   "Parts": [
     {
-      "ID": 19726,
+      "ID": 19728,
       "Path": "BodyA",
       "CustomName": "BodyA",
       "Curves": {
@@ -433,7 +433,7 @@
       "SweepPaths": []
     },
     {
-      "ID": 19266,
+      "ID": 19268,
       "Path": "PawnAHolding",
       "Curves": {
         "Transform.m_LocalPosition.x": {
@@ -774,10 +774,10 @@
       "SweepPaths": []
     },
     {
-      "ID": 19708,
+      "ID": 19710,
       "Path": "PawnAHolding/HandA",
       "CustomName": "HandA",
-      "ParentID": 19266,
+      "ParentID": 19268,
       "Curves": {
         "Transform.m_LocalPosition.x": {
           "Keyframes": [
@@ -1082,10 +1082,10 @@
       "SweepPaths": []
     },
     {
-      "ID": 19346,
+      "ID": 19348,
       "Path": "PawnAHolding/HandB",
       "CustomName": "HandB",
-      "ParentID": 19266,
+      "ParentID": 19268,
       "Curves": {
         "Transform.m_LocalPosition.x": {
           "Keyframes": [
@@ -1278,10 +1278,10 @@
       "SweepPaths": []
     },
     {
-      "ID": 19198,
+      "ID": 19200,
       "Path": "PawnAHolding/ItemA",
       "CustomName": "ItemA",
-      "ParentID": 19266,
+      "ParentID": 19268,
       "Curves": {
         "Transform.m_LocalPosition.x": {
           "Keyframes": [
@@ -1560,6 +1560,11 @@
         },
         "AnimatedPart.SplitDrawMode": {
           "Keyframes": [
+            {
+              "inTangent": "Infinity",
+              "outTangent": "Infinity",
+              "tangentMode": 103
+            },
             {
               "time": 0.4,
               "value": 1.0,
@@ -1593,11 +1598,11 @@
         "AnimatedPart.FrameIndex": 0.0,
         "PawnBody.Direction": 0.0
       },
-      "SplitDrawPivotPartID": 19474,
+      "SplitDrawPivotPartID": 19476,
       "SweepPaths": []
     },
     {
-      "ID": 19474,
+      "ID": 19476,
       "Path": "WeaponACutoff",
       "Curves": {
         "Transform.m_LocalPosition.x": {
@@ -1678,10 +1683,10 @@
       "SweepPaths": []
     },
     {
-      "ID": 18968,
+      "ID": 18970,
       "Path": "BodyA/HeadA",
       "CustomName": "HeadA",
-      "ParentID": 19726,
+      "ParentID": 19728,
       "Curves": {},
       "DefaultValues": {
         "GameObject.m_IsActive": 1.0,

diff --git a/Animations/Idle_ColossalSharp_Idle.json b/Animations/Idle_ColossalSharp_Idle.json
@@ -1,11 +1,11 @@
 {
-  "ExportTimeUTC": "2023-03-19T00:07:16.2768728Z",
+  "ExportTimeUTC": "2023-06-17T17:59:13.6982418Z",
   "Name": "Idle_ColossalSharp_Idle",
   "Length": 3.0,
   "Events": [],
   "Parts": [
     {
-      "ID": 19266,
+      "ID": 19268,
       "Path": "PawnAHolding",
       "Curves": {
         "Transform.localEulerAnglesRaw.x": {
@@ -180,7 +180,7 @@
       "SweepPaths": []
     },
     {
-      "ID": 19726,
+      "ID": 19728,
       "Path": "BodyA",
       "CustomName": "BodyA",
       "Curves": {},
@@ -211,10 +211,10 @@
       "SweepPaths": []
     },
     {
-      "ID": 18968,
+      "ID": 18970,
       "Path": "BodyA/HeadA",
       "CustomName": "HeadA",
-      "ParentID": 19726,
+      "ParentID": 19728,
       "Curves": {},
       "DefaultValues": {
         "GameObject.m_IsActive": 1.0,
@@ -243,10 +243,10 @@
       "SweepPaths": []
     },
     {
-      "ID": 19708,
+      "ID": 19710,
       "Path": "PawnAHolding/HandA",
       "CustomName": "HandA",
-      "ParentID": 19266,
+      "ParentID": 19268,
       "Curves": {},
       "DefaultValues": {
         "GameObject.m_IsActive": 1.0,
@@ -275,10 +275,10 @@
       "SweepPaths": []
     },
     {
-      "ID": 19346,
+      "ID": 19348,
       "Path": "PawnAHolding/HandB",
       "CustomName": "HandB",
-      "ParentID": 19266,
+      "ParentID": 19268,
       "Curves": {},
       "DefaultValues": {
         "GameObject.m_IsActive": 1.0,
@@ -307,10 +307,10 @@
       "SweepPaths": []
     },
     {
-      "ID": 19198,
+      "ID": 19200,
       "Path": "PawnAHolding/ItemA",
       "CustomName": "ItemA",
-      "ParentID": 19266,
+      "ParentID": 19268,
       "Curves": {},
       "DefaultValues": {
         "GameObject.m_IsActive": 1.0,
@@ -336,11 +336,11 @@
         "AnimatedPart.FrameIndex": 0.0,
         "PawnBody.Direction": 0.0
       },
-      "SplitDrawPivotPartID": 19474,
+      "SplitDrawPivotPartID": 19476,
       "SweepPaths": []
     },
     {
-      "ID": 19474,
+      "ID": 19476,
       "Path": "WeaponACutoff",
       "Curves": {},
       "DefaultValues": {

diff --git a/Animations/Idle_Colossal_Flavour1.json b/Animations/Idle_Colossal_Flavour1.json
@@ -1,11 +1,11 @@
 {
-  "ExportTimeUTC": "2023-03-19T00:07:16.3269447Z",
+  "ExportTimeUTC": "2023-06-17T17:59:13.7089944Z",
   "Name": "Idle_Colossal_Flavour1",
   "Length": 9.316667,
   "Events": [],
   "Parts": [
     {
-      "ID": 19266,
+      "ID": 19268,
       "Path": "PawnAHolding",
       "Curves": {
         "Transform.m_LocalPosition.x": {
@@ -220,10 +220,10 @@
       "SweepPaths": []
     },
     {
-      "ID": 19198,
+      "ID": 19200,
       "Path": "PawnAHolding/ItemA",
       "CustomName": "ItemA",
-      "ParentID": 19266,
+      "ParentID": 19268,
       "Curves": {
         "Transform.localEulerAnglesRaw.x": {
           "Keyframes": [
@@ -963,14 +963,14 @@
         "AnimatedPart.FrameIndex": 0.0,
         "PawnBody.Direction": 0.0
       },
-      "SplitDrawPivotPartID": 19474,
+      "SplitDrawPivotPartID": 19476,
       "SweepPaths": []
     },
     {
-      "ID": 19708,
+      "ID": 19710,
       "Path": "PawnAHolding/HandA",
       "CustomName": "HandA",
-      "ParentID": 19266,
+      "ParentID": 19268,
       "Curves": {
         "Transform.localEulerAnglesRaw.x": {
           "Keyframes": [
@@ -1757,10 +1757,10 @@
       "SweepPaths": []
     },
     {
-      "ID": 19346,
+      "ID": 19348,
       "Path": "PawnAHolding/HandB",
       "CustomName": "HandB",
-      "ParentID": 19266,
+      "ParentID": 19268,
       "Curves": {
         "Transform.m_LocalPosition.x": {
           "Keyframes": [
@@ -2083,7 +2083,7 @@
       "SweepPaths": []
     },
     {
-      "ID": 19726,
+      "ID": 19728,
       "Path": "BodyA",
       "CustomName": "BodyA",
       "Curves": {},
@@ -2114,10 +2114,10 @@
       "SweepPaths": []
     },
     {
-      "ID": 18968,
+      "ID": 18970,
       "Path": "BodyA/HeadA",
       "CustomName": "HeadA",
-      "ParentID": 19726,
+      "ParentID": 19728,
       "Curves": {},
       "DefaultValues": {
         "GameObject.m_IsActive": 1.0,
@@ -2146,7 +2146,7 @@
       "SweepPaths": []
     },
     {
-      "ID": 19474,
+      "ID": 19476,
       "Path": "WeaponACutoff",
       "Curves": {},
       "DefaultValues": {

diff --git a/Animations/Idle_Colossal_FlavourCheer.json b/Animations/Idle_Colossal_FlavourCheer.json
@@ -1,11 +1,11 @@
 {
-  "ExportTimeUTC": "2023-03-19T00:07:16.3939651Z",
+  "ExportTimeUTC": "2023-06-17T17:59:13.7728449Z",
   "Name": "Idle_Colossal_FlavourCheer",
   "Length": 4.116667,
   "Events": [],
   "Parts": [
     {
-      "ID": 19266,
+      "ID": 19268,
       "Path": "PawnAHolding",
       "Curves": {
         "Transform.m_LocalPosition.x": {
@@ -320,10 +320,10 @@
       "SweepPaths": []
     },
     {
-      "ID": 19708,
+      "ID": 19710,
       "Path": "PawnAHolding/HandA",
       "CustomName": "HandA",
-      "ParentID": 19266,
+      "ParentID": 19268,
       "Curves": {
         "Transform.m_LocalPosition.x": {
           "Keyframes": [
@@ -823,10 +823,10 @@
       "SweepPaths": []
     },
     {
-      "ID": 19346,
+      "ID": 19348,
       "Path": "PawnAHolding/HandB",
       "CustomName": "HandB",
-      "ParentID": 19266,
+      "ParentID": 19268,
       "Curves": {
         "Transform.m_LocalPosition.x": {
           "Keyframes": [
@@ -1103,10 +1103,10 @@
       "SweepPaths": []
     },
     {
-      "ID": 19198,
+      "ID": 19200,
       "Path": "PawnAHolding/ItemA",
       "CustomName": "ItemA",
-      "ParentID": 19266,
+      "ParentID": 19268,
       "Curves": {
         "Transform.m_LocalPosition.x": {
           "Keyframes": [
@@ -1601,11 +1601,11 @@
         "AnimatedPart.FrameIndex": 0.0,
         "PawnBody.Direction": 0.0
       },
-      "SplitDrawPivotPartID": 19474,
+      "SplitDrawPivotPartID": 19476,
       "SweepPaths": []
     },
     {
-      "ID": 19726,
+      "ID": 19728,
       "Path": "BodyA",
       "CustomName": "BodyA",
       "Curves": {},
@@ -1636,10 +1636,10 @@
       "SweepPaths": []
     },
     {
-      "ID": 18968,
+      "ID": 18970,
       "Path": "BodyA/HeadA",
       "CustomName": "HeadA",
-      "ParentID": 19726,
+      "ParentID": 19728,
       "Curves": {},
       "DefaultValues": {
         "GameObject.m_IsActive": 1.0,
@@ -1668,7 +1668,7 @@
       "SweepPaths": []
     },
     {
-      "ID": 19474,
+      "ID": 19476,
       "Path": "WeaponACutoff",
       "Curves": {},
       "DefaultValues": {