Updated timeline package to 1.4.1 / Small Fixes

Unity-Technologies · Aug 6, 2020 · 78d2806 · 78d2806
1 parent f0532bf
commit 78d2806
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 5 deletions.
diff --git a/Assets/Animation/Demo/BridgeTerminal/PinScreen-FindingLandingTargetTimeline.playable b/Assets/Animation/Demo/BridgeTerminal/PinScreen-FindingLandingTargetTimeline.playable
@@ -633,6 +633,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   template:
     StartMessage: ToAttack
+    Instigator: {fileID: 0}
 --- !u!114 &-5942348335755645359
 MonoBehaviour:
   m_ObjectHideFlags: 1

diff --git a/Assets/Animation/Demo/BridgeTerminal/Transition-SolarToPinScreenTimeline.playable b/Assets/Animation/Demo/BridgeTerminal/Transition-SolarToPinScreenTimeline.playable
@@ -1002,7 +1002,7 @@ MonoBehaviour:
     m_Start: 3.6666666666666665
     m_ClipIn: 0
     m_Asset: {fileID: 6166423881510294679}
-    m_Duration: 18.800000000001
+    m_Duration: 18.916666666666664
     m_TimeScale: 1
     m_ParentTrack: {fileID: -8695590200332306588}
     m_EaseInDuration: 0
@@ -3866,7 +3866,7 @@ MonoBehaviour:
   - {fileID: 2291171730400511974}
   - {fileID: 1235312144401788470}
   - {fileID: -9195356824479655913}
-  m_FixedDuration: 22.483333333333334
+  m_FixedDuration: 22.583333333333332
   m_EditorSettings:
     m_Framerate: 60
   m_DurationMode: 1

diff --git a/Assets/Resources/GameManager.prefab b/Assets/Resources/GameManager.prefab
@@ -1084,6 +1084,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   OnGameStart:
+  - {fileID: 8406102476326203897}
   - {fileID: 2207835090993955292}
   - {fileID: 8032891938856187894}
   OnLevelLoaded:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 **Version Tag** : `2019.4.0`
 
 * Updated Unity to 2019.4.3f1
+* Updated Timeline Package to 1.4.1
 * Added Benchmark Mode (Flyby Camera)
 * **Fixes and Changes:**
   * Rebuilt VFX Graphs

diff --git a/Packages/manifest.json b/Packages/manifest.json
@@ -4,7 +4,7 @@
     "com.unity.ide.visualstudio": "1.0.11",
     "com.unity.render-pipelines.high-definition": "7.4.1",
     "com.unity.textmeshpro": "2.0.1",
-    "com.unity.timeline": "1.3.0",
+    "com.unity.timeline": "1.4.1",
     "com.unity.ugui": "1.0.0",
     "net.peeweek.build-frontend": "file:../LocalPackages/net.peeweek.build-frontend",
     "net.peeweek.console": "file:../LocalPackages/net.peeweek.console",

diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
@@ -63,10 +63,15 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.timeline": {
-      "version": "1.3.0",
+      "version": "1.4.1",
       "depth": 0,
       "source": "registry",
-      "dependencies": {},
+      "dependencies": {
+        "com.unity.modules.director": "1.0.0",
+        "com.unity.modules.animation": "1.0.0",
+        "com.unity.modules.audio": "1.0.0",
+        "com.unity.modules.particlesystem": "1.0.0"
+      },
       "url": "https://packages.unity.com"
     },
     "com.unity.ugui": {
@@ -154,6 +159,12 @@
       "source": "builtin",
       "dependencies": {}
     },
+    "com.unity.modules.particlesystem": {
+      "version": "1.0.0",
+      "depth": 1,
+      "source": "builtin",
+      "dependencies": {}
+    },
     "com.unity.modules.physics": {
       "version": "1.0.0",
       "depth": 0,