diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.XML b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.XML index 1d29f72..8308150 100644 --- a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.XML +++ b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.XML @@ -1021,22 +1021,6 @@ The end value to reachThe duration of the tween If TRUE the tween will smoothly snap all values to integers - - EXPERIMENTAL BETA: Tweens a Transform's position BY the given value (as if it was set to relative), - in a way that allows other DOBlendableMove tweens to work together on the same target, - instead than fight each other as multiple DOMove would do. - Also stores the transform as the tween's target so it can be used for filtered operations - The end value to reachThe duration of the tween - If TRUE the tween will smoothly snap all values to integers - - - EXPERIMENTAL BETA: Tweens a Transform's localPosition BY the given value (as if it was set to relative), - in a way that allows other DOBlendableMove tweens to work together on the same target, - instead than fight each other as multiple DOMove would do. - Also stores the transform as the tween's target so it can be used for filtered operations - The end value to reachThe duration of the tween - If TRUE the tween will smoothly snap all values to integers - Tweens a Transform's rotation to the given value. Also stores the transform as the tween's target so it can be used for filtered operations @@ -1179,6 +1163,45 @@ Defaults to 10, but a value of 5 is usually enough if you don't have dramatic long curves between waypoints The color of the path (shown when gizmos are active in the Play panel and the tween is running) + + Tweens a Transform's position BY the given value (as if you chained a SetRelative), + in a way that allows other DOBlendableMove tweens to work together on the same target, + instead than fight each other as multiple DOMove would do. + Also stores the transform as the tween's target so it can be used for filtered operations + The value to tween byThe duration of the tween + If TRUE the tween will smoothly snap all values to integers + + + Tweens a Transform's localPosition BY the given value (as if you chained a SetRelative), + in a way that allows other DOBlendableMove tweens to work together on the same target, + instead than fight each other as multiple DOMove would do. + Also stores the transform as the tween's target so it can be used for filtered operations + The value to tween byThe duration of the tween + If TRUE the tween will smoothly snap all values to integers + + + EXPERIMENTAL METHOD - Tweens a Transform's rotation BY the given value (as if you chained a SetRelative), + in a way that allows other DOBlendableRotate tweens to work together on the same target, + instead than fight each other as multiple DORotate would do. + Also stores the transform as the tween's target so it can be used for filtered operations + The value to tween byThe duration of the tween + Rotation mode + + + EXPERIMENTAL METHOD - Tweens a Transform's lcoalRotation BY the given value (as if you chained a SetRelative), + in a way that allows other DOBlendableRotate tweens to work together on the same target, + instead than fight each other as multiple DORotate would do. + Also stores the transform as the tween's target so it can be used for filtered operations + The value to tween byThe duration of the tween + Rotation mode + + + Tweens a Transform's localScale BY the given value (as if you chained a SetRelative), + in a way that allows other DOBlendableScale tweens to work together on the same target, + instead than fight each other as multiple DOScale would do. + Also stores the transform as the tween's target so it can be used for filtered operations + The value to tween byThe duration of the tween + Completes all tweens that have this target as a reference diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll index f02895f..9f987a5 100644 Binary files a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll and b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll differ diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll.mdb b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll.mdb index 174e7a7..8aa5c64 100644 Binary files a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll.mdb and b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll.mdb differ diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween43.dll b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween43.dll index 5ffc4d8..18ba962 100644 Binary files a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween43.dll and b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween43.dll differ diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween43.dll.mdb b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween43.dll.mdb index 7569079..91b630a 100644 Binary files a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween43.dll.mdb and b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween43.dll.mdb differ diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween46.dll b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween46.dll index f32075b..2b50f7e 100644 Binary files a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween46.dll and b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween46.dll differ diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween46.dll.mdb b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween46.dll.mdb index a8cef3e..e748a5c 100644 Binary files a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween46.dll.mdb and b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween46.dll.mdb differ diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween50.dll b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween50.dll index e97172c..1ccc8d0 100644 Binary files a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween50.dll and b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween50.dll differ diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween50.dll.mdb b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween50.dll.mdb index a1c27de..4c956e6 100644 Binary files a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween50.dll.mdb and b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween50.dll.mdb differ diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll index f933566..03b5d6d 100644 Binary files a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll and b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll differ diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb index 272b08d..c228cff 100644 Binary files a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb and b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb differ diff --git a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.XML b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.XML index 1d29f72..8308150 100644 --- a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.XML +++ b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.XML @@ -1021,22 +1021,6 @@ The end value to reachThe duration of the tween If TRUE the tween will smoothly snap all values to integers - - EXPERIMENTAL BETA: Tweens a Transform's position BY the given value (as if it was set to relative), - in a way that allows other DOBlendableMove tweens to work together on the same target, - instead than fight each other as multiple DOMove would do. - Also stores the transform as the tween's target so it can be used for filtered operations - The end value to reachThe duration of the tween - If TRUE the tween will smoothly snap all values to integers - - - EXPERIMENTAL BETA: Tweens a Transform's localPosition BY the given value (as if it was set to relative), - in a way that allows other DOBlendableMove tweens to work together on the same target, - instead than fight each other as multiple DOMove would do. - Also stores the transform as the tween's target so it can be used for filtered operations - The end value to reachThe duration of the tween - If TRUE the tween will smoothly snap all values to integers - Tweens a Transform's rotation to the given value. Also stores the transform as the tween's target so it can be used for filtered operations @@ -1179,6 +1163,45 @@ Defaults to 10, but a value of 5 is usually enough if you don't have dramatic long curves between waypoints The color of the path (shown when gizmos are active in the Play panel and the tween is running) + + Tweens a Transform's position BY the given value (as if you chained a SetRelative), + in a way that allows other DOBlendableMove tweens to work together on the same target, + instead than fight each other as multiple DOMove would do. + Also stores the transform as the tween's target so it can be used for filtered operations + The value to tween byThe duration of the tween + If TRUE the tween will smoothly snap all values to integers + + + Tweens a Transform's localPosition BY the given value (as if you chained a SetRelative), + in a way that allows other DOBlendableMove tweens to work together on the same target, + instead than fight each other as multiple DOMove would do. + Also stores the transform as the tween's target so it can be used for filtered operations + The value to tween byThe duration of the tween + If TRUE the tween will smoothly snap all values to integers + + + EXPERIMENTAL METHOD - Tweens a Transform's rotation BY the given value (as if you chained a SetRelative), + in a way that allows other DOBlendableRotate tweens to work together on the same target, + instead than fight each other as multiple DORotate would do. + Also stores the transform as the tween's target so it can be used for filtered operations + The value to tween byThe duration of the tween + Rotation mode + + + EXPERIMENTAL METHOD - Tweens a Transform's lcoalRotation BY the given value (as if you chained a SetRelative), + in a way that allows other DOBlendableRotate tweens to work together on the same target, + instead than fight each other as multiple DORotate would do. + Also stores the transform as the tween's target so it can be used for filtered operations + The value to tween byThe duration of the tween + Rotation mode + + + Tweens a Transform's localScale BY the given value (as if you chained a SetRelative), + in a way that allows other DOBlendableScale tweens to work together on the same target, + instead than fight each other as multiple DOScale would do. + Also stores the transform as the tween's target so it can be used for filtered operations + The value to tween byThe duration of the tween + Completes all tweens that have this target as a reference diff --git a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.dll b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.dll index f02895f..9f987a5 100644 Binary files a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.dll and b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.dll differ diff --git a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.dll.mdb b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.dll.mdb index 174e7a7..8aa5c64 100644 Binary files a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.dll.mdb and b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.dll.mdb differ diff --git a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween43.dll b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween43.dll index 5ffc4d8..18ba962 100644 Binary files a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween43.dll and b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween43.dll differ diff --git a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween43.dll.mdb b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween43.dll.mdb index 7569079..91b630a 100644 Binary files a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween43.dll.mdb and b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween43.dll.mdb differ diff --git a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween46.dll b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween46.dll index f32075b..2b50f7e 100644 Binary files a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween46.dll and b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween46.dll differ diff --git a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween46.dll.mdb b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween46.dll.mdb index a8cef3e..e748a5c 100644 Binary files a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween46.dll.mdb and b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween46.dll.mdb differ diff --git a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween50.dll b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween50.dll index e97172c..1ccc8d0 100644 Binary files a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween50.dll and b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween50.dll differ diff --git a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween50.dll.mdb b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween50.dll.mdb index a1c27de..4c956e6 100644 Binary files a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween50.dll.mdb and b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween50.dll.mdb differ diff --git a/UnityTests.Unity4/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll b/UnityTests.Unity4/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll index f933566..03b5d6d 100644 Binary files a/UnityTests.Unity4/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll and b/UnityTests.Unity4/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll differ diff --git a/UnityTests.Unity4/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb b/UnityTests.Unity4/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb index 272b08d..c228cff 100644 Binary files a/UnityTests.Unity4/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb and b/UnityTests.Unity4/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.XML b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.XML index 1d29f72..8308150 100644 --- a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.XML +++ b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.XML @@ -1021,22 +1021,6 @@ The end value to reachThe duration of the tween If TRUE the tween will smoothly snap all values to integers - - EXPERIMENTAL BETA: Tweens a Transform's position BY the given value (as if it was set to relative), - in a way that allows other DOBlendableMove tweens to work together on the same target, - instead than fight each other as multiple DOMove would do. - Also stores the transform as the tween's target so it can be used for filtered operations - The end value to reachThe duration of the tween - If TRUE the tween will smoothly snap all values to integers - - - EXPERIMENTAL BETA: Tweens a Transform's localPosition BY the given value (as if it was set to relative), - in a way that allows other DOBlendableMove tweens to work together on the same target, - instead than fight each other as multiple DOMove would do. - Also stores the transform as the tween's target so it can be used for filtered operations - The end value to reachThe duration of the tween - If TRUE the tween will smoothly snap all values to integers - Tweens a Transform's rotation to the given value. Also stores the transform as the tween's target so it can be used for filtered operations @@ -1179,6 +1163,45 @@ Defaults to 10, but a value of 5 is usually enough if you don't have dramatic long curves between waypoints The color of the path (shown when gizmos are active in the Play panel and the tween is running) + + Tweens a Transform's position BY the given value (as if you chained a SetRelative), + in a way that allows other DOBlendableMove tweens to work together on the same target, + instead than fight each other as multiple DOMove would do. + Also stores the transform as the tween's target so it can be used for filtered operations + The value to tween byThe duration of the tween + If TRUE the tween will smoothly snap all values to integers + + + Tweens a Transform's localPosition BY the given value (as if you chained a SetRelative), + in a way that allows other DOBlendableMove tweens to work together on the same target, + instead than fight each other as multiple DOMove would do. + Also stores the transform as the tween's target so it can be used for filtered operations + The value to tween byThe duration of the tween + If TRUE the tween will smoothly snap all values to integers + + + EXPERIMENTAL METHOD - Tweens a Transform's rotation BY the given value (as if you chained a SetRelative), + in a way that allows other DOBlendableRotate tweens to work together on the same target, + instead than fight each other as multiple DORotate would do. + Also stores the transform as the tween's target so it can be used for filtered operations + The value to tween byThe duration of the tween + Rotation mode + + + EXPERIMENTAL METHOD - Tweens a Transform's lcoalRotation BY the given value (as if you chained a SetRelative), + in a way that allows other DOBlendableRotate tweens to work together on the same target, + instead than fight each other as multiple DORotate would do. + Also stores the transform as the tween's target so it can be used for filtered operations + The value to tween byThe duration of the tween + Rotation mode + + + Tweens a Transform's localScale BY the given value (as if you chained a SetRelative), + in a way that allows other DOBlendableScale tweens to work together on the same target, + instead than fight each other as multiple DOScale would do. + Also stores the transform as the tween's target so it can be used for filtered operations + The value to tween byThe duration of the tween + Completes all tweens that have this target as a reference diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.XML.meta b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.XML.meta index 4b6638a..73b0ff4 100644 --- a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.XML.meta +++ b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.XML.meta @@ -1,4 +1,8 @@ fileFormatVersion: 2 guid: 32d3af87ee00b2540b93b3d175025be1 +timeCreated: 1427447719 +licenseType: Pro TextScriptImporter: userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll index f02895f..9f987a5 100644 Binary files a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll and b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll.mdb b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll.mdb index 174e7a7..8aa5c64 100644 Binary files a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll.mdb and b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll.mdb differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll.mdb.meta b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll.mdb.meta index 51f33fb..ca76239 100644 --- a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll.mdb.meta +++ b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll.mdb.meta @@ -1,4 +1,8 @@ fileFormatVersion: 2 guid: 75fba9607a513b64984db6d29f41986c +timeCreated: 1427447735 +licenseType: Pro DefaultImporter: userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween43.dll b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween43.dll index 5ffc4d8..18ba962 100644 Binary files a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween43.dll and b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween43.dll differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween43.dll.mdb b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween43.dll.mdb index 7569079..91b630a 100644 Binary files a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween43.dll.mdb and b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween43.dll.mdb differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween46.dll b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween46.dll index f32075b..2b50f7e 100644 Binary files a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween46.dll and b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween46.dll differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween46.dll.mdb b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween46.dll.mdb index a8cef3e..e748a5c 100644 Binary files a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween46.dll.mdb and b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween46.dll.mdb differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween50.dll b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween50.dll index e97172c..1ccc8d0 100644 Binary files a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween50.dll and b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween50.dll differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween50.dll.mdb b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween50.dll.mdb index a1c27de..4c956e6 100644 Binary files a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween50.dll.mdb and b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween50.dll.mdb differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll b/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll index f933566..03b5d6d 100644 Binary files a/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll and b/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb b/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb index 272b08d..c228cff 100644 Binary files a/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb and b/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb differ diff --git a/UnityTests.Unity5/Assets/Dice/Materials/d6/d6-alt.mat b/UnityTests.Unity5/Assets/Dice/Materials/d6/d6-alt.mat new file mode 100644 index 0000000..e841db7 Binary files /dev/null and b/UnityTests.Unity5/Assets/Dice/Materials/d6/d6-alt.mat differ diff --git a/UnityTests.Unity5/Assets/Dice/Materials/d6/d6-alt.mat.meta b/UnityTests.Unity5/Assets/Dice/Materials/d6/d6-alt.mat.meta new file mode 100644 index 0000000..3808a97 --- /dev/null +++ b/UnityTests.Unity5/Assets/Dice/Materials/d6/d6-alt.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 8d96bf24046f5a74fbc20d52d55cbc88 +labels: +- d6 +timeCreated: 1427466480 +licenseType: Pro +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/_Tests/BlendableTweens.cs b/UnityTests.Unity5/Assets/_Tests/BlendableTweens.cs index 6eb6a0c..10727a6 100644 --- a/UnityTests.Unity5/Assets/_Tests/BlendableTweens.cs +++ b/UnityTests.Unity5/Assets/_Tests/BlendableTweens.cs @@ -4,29 +4,80 @@ using DG.Tweening; public class BlendableTweens : BrainBase { + public bool addBlendable = true; + public bool from; + public bool fromBlendable; + public bool repeatBlendable = true; + public RotateMode rotationMode; + public Ease ease = Ease.OutQuad; public Transform[] targets; + public Transform nonBlendableT; Vector3[] startPositions; IEnumerator Start() { - startPositions = new Vector3[targets.Length]; + startPositions = new Vector3[2]; startPositions[0] = targets[0].position; - startPositions[1] = targets[1].position + new Vector3(3, 3, 0); yield return new WaitForSeconds(0.6f); - targets[0].DOBlendableMoveBy(new Vector3(3, 3, 0), 3).SetAutoKill(false).Pause(); - targets[0].DOBlendableMoveBy(new Vector3(-3, 0, 0), 1f).SetLoops(3, LoopType.Yoyo).SetAutoKill(false).Pause(); - // Same as above but using From - targets[1].DOBlendableMoveBy(new Vector3(3, 3, 0), 3).From().SetAutoKill(false).Pause(); - targets[1].DOBlendableMoveBy(new Vector3(-3, 0, 0), 1f).SetLoops(3, LoopType.Yoyo).SetAutoKill(false).Pause(); + Vector3 to; + float duration; + int loops; + + // Move + duration = 3; + to = new Vector3(3, 3, 0); + startPositions[1] = targets[0].position + to; + if (from) targets[0].DOBlendableMoveBy(to, duration).From().SetEase(ease).SetAutoKill(false).Pause(); + else targets[0].DOBlendableMoveBy(to, duration).SetEase(ease).SetAutoKill(false).Pause(); + if (addBlendable) { + to = new Vector3(-3, 0, 0); + duration = repeatBlendable ? 1 : 3; + loops = repeatBlendable ? 3 : 1; + if (fromBlendable) targets[0].DOBlendableMoveBy(to, duration).From().SetEase(ease).SetLoops(loops, LoopType.Yoyo).SetAutoKill(false).Pause(); + else targets[0].DOBlendableMoveBy(to, duration).SetEase(ease).SetLoops(loops, LoopType.Yoyo).SetAutoKill(false).Pause(); + } + + // Scale + duration = 3; + to = new Vector3(0, 1, 0); + if (from) targets[1].DOBlendableScaleBy(to, duration).From().SetEase(ease).SetAutoKill(false).Pause(); + else targets[1].DOBlendableScaleBy(to, duration).SetEase(ease).SetAutoKill(false).Pause(); + if (addBlendable) { + to = new Vector3(1, 0, 0); + duration = repeatBlendable ? 1 : 3; + loops = repeatBlendable ? 3 : 1; + if (fromBlendable) targets[1].DOBlendableScaleBy(to, duration).From().SetEase(ease).SetLoops(loops, LoopType.Yoyo).SetAutoKill(false).Pause(); + else targets[1].DOBlendableScaleBy(to, duration).SetEase(ease).SetLoops(loops, LoopType.Yoyo).SetAutoKill(false).Pause(); + } + + // Rotate + duration = 3; + to = new Vector3(0, 90, 0); + if (from) targets[2].DOBlendableRotateBy(to, duration, rotationMode).From().SetEase(ease).SetAutoKill(false).Pause(); + else targets[2].DOBlendableRotateBy(to, duration, rotationMode).SetEase(ease).SetAutoKill(false).Pause(); + if (addBlendable) { + to = new Vector3(90, 0, 0); + duration = repeatBlendable ? 1 : 3; + loops = repeatBlendable ? 3 : 1; + if (fromBlendable) targets[2].DOBlendableRotateBy(to, duration, rotationMode).From().SetEase(ease).SetLoops(loops, LoopType.Yoyo).SetAutoKill(false).Pause(); + else targets[2].DOBlendableRotateBy(to, duration, rotationMode).SetEase(ease).SetLoops(loops, LoopType.Yoyo).SetAutoKill(false).Pause(); + } + // Non blendable for comparisons + duration = 3; + to = new Vector3(0, 90, 0); + if (from) nonBlendableT.DORotate(to, duration, rotationMode).From(true).SetEase(ease).SetAutoKill(false).Pause(); + else nonBlendableT.DORotate(to, duration, rotationMode).SetEase(ease).SetAutoKill(false).Pause(); } void OnGUI() { if (GUILayout.Button("Toggle Pause")) DOTween.TogglePauseAll(); if (GUILayout.Button("Restart")) DOTween.RestartAll(); + if (GUILayout.Button("Rewind")) DOTween.RewindAll(); + if (GUILayout.Button("Complete")) DOTween.CompleteAll(); if (GUILayout.Button("Flip")) DOTween.FlipAll(); } diff --git a/UnityTests.Unity5/Assets/_Tests/BlendableTweens.unity b/UnityTests.Unity5/Assets/_Tests/BlendableTweens.unity index 2846201..da15a78 100644 Binary files a/UnityTests.Unity5/Assets/_Tests/BlendableTweens.unity and b/UnityTests.Unity5/Assets/_Tests/BlendableTweens.unity differ diff --git a/UnityTests.Unity5/Assets/_Tests/TempTests.cs b/UnityTests.Unity5/Assets/_Tests/TempTests.cs index 6b50e01..bcd2da1 100644 --- a/UnityTests.Unity5/Assets/_Tests/TempTests.cs +++ b/UnityTests.Unity5/Assets/_Tests/TempTests.cs @@ -17,12 +17,10 @@ public class TempTests : BrainBase int count; - Tween t; - IEnumerator Start() { yield return new WaitForSeconds(0.6f); - t = target.DOPath(waypoints, 5, PathType.CatmullRom).SetEase(easeType).SetLoops(-1); + target.DOPath(waypoints, 5, PathType.CatmullRom).SetEase(easeType).SetLoops(-1); } } \ No newline at end of file diff --git a/_DOTween.Assembly/DOTween/Core/Extensions.cs b/_DOTween.Assembly/DOTween/Core/Extensions.cs index 335747e..45f3567 100644 --- a/_DOTween.Assembly/DOTween/Core/Extensions.cs +++ b/_DOTween.Assembly/DOTween/Core/Extensions.cs @@ -27,5 +27,13 @@ namespace DG.Tweening.Core t.isFromAllowed = false; return t; } + + // Sets the tween as blendable + internal static TweenerCore Blendable(this TweenerCore t) + where TPlugOptions : struct + { + t.isBlendable = true; + return t; + } } } \ No newline at end of file diff --git a/_DOTween.Assembly/DOTween/DOTween.cs b/_DOTween.Assembly/DOTween/DOTween.cs index 22a498b..c703313 100644 --- a/_DOTween.Assembly/DOTween/DOTween.cs +++ b/_DOTween.Assembly/DOTween/DOTween.cs @@ -21,7 +21,7 @@ namespace DG.Tweening public class DOTween { /// DOTween's version - public static readonly string Version = "1.0.351"; + public static readonly string Version = "1.0.401"; /////////////////////////////////////////////// // Options //////////////////////////////////// diff --git a/_DOTween.Assembly/DOTween/Plugins/IntPlugin.cs b/_DOTween.Assembly/DOTween/Plugins/IntPlugin.cs index 4068cd3..df1167e 100644 --- a/_DOTween.Assembly/DOTween/Plugins/IntPlugin.cs +++ b/_DOTween.Assembly/DOTween/Plugins/IntPlugin.cs @@ -50,6 +50,10 @@ namespace DG.Tweening.Plugins public override void EvaluateAndApply(NoOptions options, Tween t, bool isRelative, DOGetter getter, DOSetter setter, float elapsed, int startValue, int changeValue, float duration, bool usingInversePosition) { if (t.loopType == LoopType.Incremental) startValue += changeValue * (t.isComplete ? t.completedLoops - 1 : t.completedLoops); + if (t.isSequenced && t.sequenceParent.loopType == LoopType.Incremental) { + startValue += changeValue * (t.loopType == LoopType.Incremental ? t.loops : 1) + * (t.sequenceParent.isComplete ? t.sequenceParent.completedLoops - 1 : t.sequenceParent.completedLoops); + } setter((int)Math.Round(startValue + changeValue * EaseManager.Evaluate(t.easeType, t.customEase, elapsed, duration, t.easeOvershootOrAmplitude, t.easePeriod))); } diff --git a/_DOTween.Assembly/DOTween/ShortcutExtensions.cs b/_DOTween.Assembly/DOTween/ShortcutExtensions.cs index 935a978..333f3da 100644 --- a/_DOTween.Assembly/DOTween/ShortcutExtensions.cs +++ b/_DOTween.Assembly/DOTween/ShortcutExtensions.cs @@ -379,40 +379,6 @@ namespace DG.Tweening .SetOptions(AxisConstraint.Z, snapping).SetTarget(target); } - /// EXPERIMENTAL BETA: Tweens a Transform's position BY the given value (as if it was set to relative), - /// in a way that allows other DOBlendableMove tweens to work together on the same target, - /// instead than fight each other as multiple DOMove would do. - /// Also stores the transform as the tween's target so it can be used for filtered operations - /// The end value to reachThe duration of the tween - /// If TRUE the tween will smoothly snap all values to integers - public static Tweener DOBlendableMoveBy(this Transform target, Vector3 byValue, float duration, bool snapping = false) - { - Vector3 to = Vector3.zero; - return DOTween.To(() => to, x => { - Vector3 diff = x - to; - to = x; - target.position += diff; - }, byValue, duration) - .SetOptions(snapping).SetTarget(target); - } - - /// EXPERIMENTAL BETA: Tweens a Transform's localPosition BY the given value (as if it was set to relative), - /// in a way that allows other DOBlendableMove tweens to work together on the same target, - /// instead than fight each other as multiple DOMove would do. - /// Also stores the transform as the tween's target so it can be used for filtered operations - /// The end value to reachThe duration of the tween - /// If TRUE the tween will smoothly snap all values to integers - public static Tweener DOBlendableLocalMoveBy(this Transform target, Vector3 byValue, float duration, bool snapping = false) - { - Vector3 to = Vector3.zero; - return DOTween.To(() => to, x => { - Vector3 diff = x - to; - to = x; - target.localPosition += diff; - }, byValue, duration) - .SetOptions(snapping).SetTarget(target); - } - /// Tweens a Transform's rotation to the given value. /// Also stores the transform as the tween's target so it can be used for filtered operations /// The end value to reachThe duration of the tween @@ -663,6 +629,98 @@ namespace DG.Tweening return t; } + #region Blendables + + /// Tweens a Transform's position BY the given value (as if you chained a SetRelative), + /// in a way that allows other DOBlendableMove tweens to work together on the same target, + /// instead than fight each other as multiple DOMove would do. + /// Also stores the transform as the tween's target so it can be used for filtered operations + /// The value to tween byThe duration of the tween + /// If TRUE the tween will smoothly snap all values to integers + public static Tweener DOBlendableMoveBy(this Transform target, Vector3 byValue, float duration, bool snapping = false) + { + Vector3 to = Vector3.zero; + return DOTween.To(() => to, x => { + Vector3 diff = x - to; + to = x; + target.position += diff; + }, byValue, duration) + .Blendable().SetOptions(snapping).SetTarget(target); + } + + /// Tweens a Transform's localPosition BY the given value (as if you chained a SetRelative), + /// in a way that allows other DOBlendableMove tweens to work together on the same target, + /// instead than fight each other as multiple DOMove would do. + /// Also stores the transform as the tween's target so it can be used for filtered operations + /// The value to tween byThe duration of the tween + /// If TRUE the tween will smoothly snap all values to integers + public static Tweener DOBlendableLocalMoveBy(this Transform target, Vector3 byValue, float duration, bool snapping = false) + { + Vector3 to = Vector3.zero; + return DOTween.To(() => to, x => { + Vector3 diff = x - to; + to = x; + target.localPosition += diff; + }, byValue, duration) + .Blendable().SetOptions(snapping).SetTarget(target); + } + + /// EXPERIMENTAL METHOD - Tweens a Transform's rotation BY the given value (as if you chained a SetRelative), + /// in a way that allows other DOBlendableRotate tweens to work together on the same target, + /// instead than fight each other as multiple DORotate would do. + /// Also stores the transform as the tween's target so it can be used for filtered operations + /// The value to tween byThe duration of the tween + /// Rotation mode + public static Tweener DOBlendableRotateBy(this Transform target, Vector3 byValue, float duration, RotateMode mode = RotateMode.Fast) + { + Quaternion to = target.rotation; + TweenerCore t = DOTween.To(() => to, x => { + Quaternion diff = x * Quaternion.Inverse(to); + to = x; + target.rotation = target.rotation * Quaternion.Inverse(target.rotation) * diff * target.rotation; + }, byValue, duration) + .Blendable().SetTarget(target); + t.plugOptions.rotateMode = mode; + return t; + } + + /// EXPERIMENTAL METHOD - Tweens a Transform's lcoalRotation BY the given value (as if you chained a SetRelative), + /// in a way that allows other DOBlendableRotate tweens to work together on the same target, + /// instead than fight each other as multiple DORotate would do. + /// Also stores the transform as the tween's target so it can be used for filtered operations + /// The value to tween byThe duration of the tween + /// Rotation mode + public static Tweener DOBlendableLocalRotateBy(this Transform target, Vector3 byValue, float duration, RotateMode mode = RotateMode.Fast) + { + Quaternion to = target.rotation; + TweenerCore t = DOTween.To(() => to, x => { + Quaternion diff = x * Quaternion.Inverse(to); + to = x; + target.rotation = target.rotation * Quaternion.Inverse(target.rotation) * diff * target.rotation; + }, byValue, duration) + .Blendable().SetTarget(target); + t.plugOptions.rotateMode = mode; + return t; + } + + /// Tweens a Transform's localScale BY the given value (as if you chained a SetRelative), + /// in a way that allows other DOBlendableScale tweens to work together on the same target, + /// instead than fight each other as multiple DOScale would do. + /// Also stores the transform as the tween's target so it can be used for filtered operations + /// The value to tween byThe duration of the tween + public static Tweener DOBlendableScaleBy(this Transform target, Vector3 byValue, float duration) + { + Vector3 to = Vector3.zero; + return DOTween.To(() => to, x => { + Vector3 diff = x - to; + to = x; + target.localScale += diff; + }, byValue, duration) + .Blendable().SetTarget(target); + } + + #endregion + #endregion // =================================================================================== diff --git a/_DOTween.Assembly/DOTween/Tween.cs b/_DOTween.Assembly/DOTween/Tween.cs index b427449..bdd4f77 100644 --- a/_DOTween.Assembly/DOTween/Tween.cs +++ b/_DOTween.Assembly/DOTween/Tween.cs @@ -54,6 +54,7 @@ namespace DG.Tweening // Fixed after creation internal bool isFrom; // Used to prevent settings like isRelative from being applied on From tweens + internal bool isBlendable; // Set by blendable tweens, prevents isRelative to be applied internal bool isRecyclable; internal bool isSpeedBased; internal bool autoKill; @@ -114,6 +115,7 @@ namespace DG.Tweening target = null; isFrom = false; + isBlendable = false; isSpeedBased = false; duration = 0; loops = 1; diff --git a/_DOTween.Assembly/DOTween/TweenSettingsExtensions.cs b/_DOTween.Assembly/DOTween/TweenSettingsExtensions.cs index 9494e35..38cb5ac 100644 --- a/_DOTween.Assembly/DOTween/TweenSettingsExtensions.cs +++ b/_DOTween.Assembly/DOTween/TweenSettingsExtensions.cs @@ -507,7 +507,8 @@ namespace DG.Tweening if (!t.active || t.creationLocked || !t.isFromAllowed) return t; t.isFrom = true; - t.SetFrom(isRelative); + if (!isRelative) t.SetFrom(false); + else t.SetFrom(!t.isBlendable); return t; } @@ -527,7 +528,7 @@ namespace DG.Tweening /// Has no effect on Sequences or if the tween has already started public static T SetRelative(this T t) where T : Tween { - if (!t.active || t.creationLocked || t.isFrom) return t; + if (!t.active || t.creationLocked || t.isFrom || t.isBlendable) return t; t.isRelative = true; return t; @@ -537,7 +538,7 @@ namespace DG.Tweening /// Has no effect on Sequences or if the tween has already started public static T SetRelative(this T t, bool isRelative) where T : Tween { - if (!t.active || t.creationLocked || t.isFrom) return t; + if (!t.active || t.creationLocked || t.isFrom || t.isBlendable) return t; t.isRelative = isRelative; return t; diff --git a/_DOTween.Assembly/bin/DOTween.XML b/_DOTween.Assembly/bin/DOTween.XML index 1d29f72..8308150 100644 --- a/_DOTween.Assembly/bin/DOTween.XML +++ b/_DOTween.Assembly/bin/DOTween.XML @@ -1021,22 +1021,6 @@ The end value to reachThe duration of the tween If TRUE the tween will smoothly snap all values to integers - - EXPERIMENTAL BETA: Tweens a Transform's position BY the given value (as if it was set to relative), - in a way that allows other DOBlendableMove tweens to work together on the same target, - instead than fight each other as multiple DOMove would do. - Also stores the transform as the tween's target so it can be used for filtered operations - The end value to reachThe duration of the tween - If TRUE the tween will smoothly snap all values to integers - - - EXPERIMENTAL BETA: Tweens a Transform's localPosition BY the given value (as if it was set to relative), - in a way that allows other DOBlendableMove tweens to work together on the same target, - instead than fight each other as multiple DOMove would do. - Also stores the transform as the tween's target so it can be used for filtered operations - The end value to reachThe duration of the tween - If TRUE the tween will smoothly snap all values to integers - Tweens a Transform's rotation to the given value. Also stores the transform as the tween's target so it can be used for filtered operations @@ -1179,6 +1163,45 @@ Defaults to 10, but a value of 5 is usually enough if you don't have dramatic long curves between waypoints The color of the path (shown when gizmos are active in the Play panel and the tween is running) + + Tweens a Transform's position BY the given value (as if you chained a SetRelative), + in a way that allows other DOBlendableMove tweens to work together on the same target, + instead than fight each other as multiple DOMove would do. + Also stores the transform as the tween's target so it can be used for filtered operations + The value to tween byThe duration of the tween + If TRUE the tween will smoothly snap all values to integers + + + Tweens a Transform's localPosition BY the given value (as if you chained a SetRelative), + in a way that allows other DOBlendableMove tweens to work together on the same target, + instead than fight each other as multiple DOMove would do. + Also stores the transform as the tween's target so it can be used for filtered operations + The value to tween byThe duration of the tween + If TRUE the tween will smoothly snap all values to integers + + + EXPERIMENTAL METHOD - Tweens a Transform's rotation BY the given value (as if you chained a SetRelative), + in a way that allows other DOBlendableRotate tweens to work together on the same target, + instead than fight each other as multiple DORotate would do. + Also stores the transform as the tween's target so it can be used for filtered operations + The value to tween byThe duration of the tween + Rotation mode + + + EXPERIMENTAL METHOD - Tweens a Transform's lcoalRotation BY the given value (as if you chained a SetRelative), + in a way that allows other DOBlendableRotate tweens to work together on the same target, + instead than fight each other as multiple DORotate would do. + Also stores the transform as the tween's target so it can be used for filtered operations + The value to tween byThe duration of the tween + Rotation mode + + + Tweens a Transform's localScale BY the given value (as if you chained a SetRelative), + in a way that allows other DOBlendableScale tweens to work together on the same target, + instead than fight each other as multiple DOScale would do. + Also stores the transform as the tween's target so it can be used for filtered operations + The value to tween byThe duration of the tween + Completes all tweens that have this target as a reference diff --git a/_DOTween.Assembly/bin/DOTween.dll b/_DOTween.Assembly/bin/DOTween.dll index f02895f..9f987a5 100644 Binary files a/_DOTween.Assembly/bin/DOTween.dll and b/_DOTween.Assembly/bin/DOTween.dll differ diff --git a/_DOTween.Assembly/bin/DOTween.dll.mdb b/_DOTween.Assembly/bin/DOTween.dll.mdb index 174e7a7..8aa5c64 100644 Binary files a/_DOTween.Assembly/bin/DOTween.dll.mdb and b/_DOTween.Assembly/bin/DOTween.dll.mdb differ diff --git a/_DOTween.Assembly/bin/DOTween43.dll b/_DOTween.Assembly/bin/DOTween43.dll index 5ffc4d8..18ba962 100644 Binary files a/_DOTween.Assembly/bin/DOTween43.dll and b/_DOTween.Assembly/bin/DOTween43.dll differ diff --git a/_DOTween.Assembly/bin/DOTween43.dll.mdb b/_DOTween.Assembly/bin/DOTween43.dll.mdb index 7569079..91b630a 100644 Binary files a/_DOTween.Assembly/bin/DOTween43.dll.mdb and b/_DOTween.Assembly/bin/DOTween43.dll.mdb differ diff --git a/_DOTween.Assembly/bin/DOTween46.dll b/_DOTween.Assembly/bin/DOTween46.dll index f32075b..2b50f7e 100644 Binary files a/_DOTween.Assembly/bin/DOTween46.dll and b/_DOTween.Assembly/bin/DOTween46.dll differ diff --git a/_DOTween.Assembly/bin/DOTween46.dll.mdb b/_DOTween.Assembly/bin/DOTween46.dll.mdb index a8cef3e..e748a5c 100644 Binary files a/_DOTween.Assembly/bin/DOTween46.dll.mdb and b/_DOTween.Assembly/bin/DOTween46.dll.mdb differ diff --git a/_DOTween.Assembly/bin/DOTween50.dll b/_DOTween.Assembly/bin/DOTween50.dll index e97172c..1ccc8d0 100644 Binary files a/_DOTween.Assembly/bin/DOTween50.dll and b/_DOTween.Assembly/bin/DOTween50.dll differ diff --git a/_DOTween.Assembly/bin/DOTween50.dll.mdb b/_DOTween.Assembly/bin/DOTween50.dll.mdb index a1c27de..4c956e6 100644 Binary files a/_DOTween.Assembly/bin/DOTween50.dll.mdb and b/_DOTween.Assembly/bin/DOTween50.dll.mdb differ diff --git a/_DOTween.Assembly/bin/Editor/DOTweenEditor.dll b/_DOTween.Assembly/bin/Editor/DOTweenEditor.dll index f933566..03b5d6d 100644 Binary files a/_DOTween.Assembly/bin/Editor/DOTweenEditor.dll and b/_DOTween.Assembly/bin/Editor/DOTweenEditor.dll differ diff --git a/_DOTween.Assembly/bin/Editor/DOTweenEditor.dll.mdb b/_DOTween.Assembly/bin/Editor/DOTweenEditor.dll.mdb index 272b08d..c228cff 100644 Binary files a/_DOTween.Assembly/bin/Editor/DOTweenEditor.dll.mdb and b/_DOTween.Assembly/bin/Editor/DOTweenEditor.dll.mdb differ