diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.XML b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.XML
index 2c3ec4d..9a9e868 100644
--- a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.XML
+++ b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.XML
@@ -137,6 +137,17 @@
Public so it can be used by external ease factories
+
+
+ Behaviour in case a tween nested inside a Sequence fails
+
+
+
+ If the Sequence contains other elements, kill the failed tween but preserve the rest
+
+
+ Kill the whole Sequence
+
Additional notices passed to plugins when updating.
@@ -179,6 +190,26 @@
Public only so custom shortcuts can access some of these methods
+
+
+ INTERNAL: used by DO shortcuts and Modules to set special startup mode
+
+
+
+
+ INTERNAL: used by DO shortcuts and Modules to set the tween as blendable
+
+
+
+
+ INTERNAL: used by DO shortcuts and Modules to prevent a tween from using a From setup even if passed
+
+
+
+
+ Used to dispatch commands that need to be captured externally, usually by Modules
+
+
Returns a Vector3 with z = 0
@@ -195,6 +226,37 @@
because the latter fails (in some cases) when assigning a Vector3 to a transform.position and then checking it.
+
+
+ Looks for the type within all possible project assembly names
+
+
+
+ NO-GC METHOD: changes the start value of a tween and rewinds it (without pausing it).
+ Has no effect with tweens that are inside Sequences
+ The new start value
+ If bigger than 0 applies it as the new tween duration
+
+
+ NO-GC METHOD: changes the end value of a tween and rewinds it (without pausing it).
+ Has no effect with tweens that are inside Sequences
+ The new end value
+ If TRUE the start value will become the current target's value, otherwise it will stay the same
+
+
+ NO-GC METHOD: changes the end value of a tween and rewinds it (without pausing it).
+ Has no effect with tweens that are inside Sequences
+ The new end value
+ If bigger than 0 applies it as the new tween duration
+ If TRUE the start value will become the current target's value, otherwise it will stay the same
+
+
+ NO-GC METHOD: changes the start and end value of a tween and rewinds it (without pausing it).
+ Has no effect with tweens that are inside Sequences
+ The new start value
+ The new end value
+ If bigger than 0 applies it as the new tween duration
+
Struct that stores two colors (used for LineRenderer tweens)
@@ -237,6 +299,9 @@
INTERNAL: do not use
+
+ INTERNAL: do not use
+
INTERNAL: do not use
@@ -265,6 +330,10 @@
(like targets becoming null while a tween is playing).
Default: TRUE
+
+ Behaviour in case a tween nested inside a Sequence fails (caught by safe mode).
+ Default: NestedTweenFailureBehaviour.TryToPreserveSequence
+
If TRUE you will get a DOTween report when exiting play mode (only in the Editor).
Useful to know how many max Tweeners and Sequences you reached and optimize your final project accordingly.
@@ -291,6 +360,13 @@
DOTween's log behaviour.
Default: LogBehaviour.ErrorsOnly
+
+ Used to intercept DOTween's logs. If this method isn't NULL, DOTween will call it before writing a log via Unity's own Debug log methods.
+ Return TRUE if you want DOTween to proceed with the log, FALSE otherwise.
+ This method must return a bool and accept two parameters:
+ - LogType: the type of Unity log that DOTween is trying to log
+ - object: the log message that DOTween wants to log
+
If TRUE draws path gizmos in Unity Editor (if the gizmos button is active).
Deactivate this if you want to avoid gizmos overhead while in Unity Editor
@@ -331,6 +407,9 @@
Default period used for eases
Default: 0
+
+ Used internally. Assigned/removed by DOTweenComponent.Create/DestroyInstance
+
Must be called once, before the first ever DOTween call/reference,
@@ -899,6 +978,32 @@
Max Sequences capacity.
Default: 50
+
+
+ Behaviour that can be assigned when chaining a SetLink to a tween
+
+
+
+ Pauses the tween when the link target is disabled
+
+
+ Pauses the tween when the link target is disabled, plays it when it's enabled
+
+
+ Pauses the tween when the link target is disabled, restarts it when it's enabled
+
+
+ Plays the tween when the link target is enabled
+
+
+ Restarts the tween when the link target is enabled
+
+
+ Kills the tween when the link target is disabled
+
+
+ Kills the tween when the link target is destroyed (becomes NULL). This is always active even if another behaviour is chosen
+
Path mode (used to determine correct LookAt orientation)
@@ -927,6 +1032,9 @@
Curved path (which uses Catmull-Rom curves)
+
+ EXPERIMENTAL: Curved path (which uses Cubic Bezier curves, where each point requires two extra control points)
+
Path control point
@@ -1239,16 +1347,6 @@
Methods that extend known Unity objects and allow to directly create and control tweens from their instances
-
- Tweens an AudioSource's volume to the given value.
- Also stores the AudioSource as the tween's target so it can be used for filtered operations
- The end value to reach (0 to 1)The duration of the tween
-
-
- Tweens an AudioSource's pitch to the given value.
- Also stores the AudioSource as the tween's target so it can be used for filtered operations
- The end value to reachThe duration of the tween
-
Tweens a Camera's aspect to the given value.
Also stores the camera as the tween's target so it can be used for filtered operations
@@ -1364,6 +1462,13 @@
The name of the material property to tween (like _Tint or _SpecColor)
The duration of the tween
+
+ Tweens a Material's named color property with the given ID to the given value.
+ Also stores the material as the tween's target so it can be used for filtered operations
+ The end value to reach
+ The ID of the material property to tween (also called nameID in Unity's manual)
+ The duration of the tween
+
Tweens a Material's alpha color to the given value
(will have no effect unless your material supports transparency).
@@ -1378,6 +1483,14 @@
The name of the material property to tween (like _Tint or _SpecColor)
The duration of the tween
+
+ Tweens a Material's alpha color with the given ID to the given value
+ (will have no effect unless your material supports transparency).
+ Also stores the material as the tween's target so it can be used for filtered operations
+ The end value to reach
+ The ID of the material property to tween (also called nameID in Unity's manual)
+ The duration of the tween
+
Tweens a Material's named float property to the given value.
Also stores the material as the tween's target so it can be used for filtered operations
@@ -1385,6 +1498,13 @@
The name of the material property to tween
The duration of the tween
+
+ Tweens a Material's named float property with the given ID to the given value.
+ Also stores the material as the tween's target so it can be used for filtered operations
+ The end value to reach
+ The ID of the material property to tween (also called nameID in Unity's manual)
+ The duration of the tween
+
Tweens a Material's texture offset to the given value.
Also stores the material as the tween's target so it can be used for filtered operations
@@ -1418,80 +1538,12 @@
The name of the material property to tween
The duration of the tween
-
- Tweens a Rigidbody's position to the given value.
- Also stores the rigidbody 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 Rigidbody's X position to the given value.
- Also stores the rigidbody 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 Rigidbody's Y position to the given value.
- Also stores the rigidbody 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 Rigidbody's Z position to the given value.
- Also stores the rigidbody 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 Rigidbody's rotation to the given value.
- Also stores the rigidbody as the tween's target so it can be used for filtered operations
- The end value to reachThe duration of the tween
- Rotation mode
-
-
- Tweens a Rigidbody's rotation so that it will look towards the given position.
- Also stores the rigidbody as the tween's target so it can be used for filtered operations
- The position to look atThe duration of the tween
- Eventual axis constraint for the rotation
- The vector that defines in which direction up is (default: Vector3.up)
-
-
- Tweens a Rigidbody's position to the given value, while also applying a jump effect along the Y axis.
- Returns a Sequence instead of a Tweener.
- Also stores the Rigidbody as the tween's target so it can be used for filtered operations
+
+ Tweens a Material's named Vector property with the given ID to the given value.
+ Also stores the material as the tween's target so it can be used for filtered operations
The end value to reach
- Power of the jump (the max height of the jump is represented by this plus the final Y offset)
- Total number of jumps
+ The ID of the material property to tween (also called nameID in Unity's manual)
The duration of the tween
- If TRUE the tween will smoothly snap all values to integers
-
-
- Tweens a Rigidbody's position through the given path waypoints, using the chosen path algorithm.
- Also stores the Rigidbody as the tween's target so it can be used for filtered operations.
- NOTE: to tween a rigidbody correctly it should be set to kinematic at least while being tweened.
- BEWARE: doesn't work on Windows Phone store (waiting for Unity to fix their own bug).
- If you plan to publish there you should use a regular transform.DOPath.
- The waypoints to go through
- The duration of the tween
- The type of path: Linear (straight path) or CatmullRom (curved CatmullRom path)
- The path mode: 3D, side-scroller 2D, top-down 2D
- The resolution of the path (useless in case of Linear paths): higher resolutions make for more detailed curved paths but are more expensive.
- 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 Rigidbody's localPosition through the given path waypoints, using the chosen path algorithm.
- Also stores the Rigidbody as the tween's target so it can be used for filtered operations
- NOTE: to tween a rigidbody correctly it should be set to kinematic at least while being tweened.
- BEWARE: doesn't work on Windows Phone store (waiting for Unity to fix their own bug).
- If you plan to publish there you should use a regular transform.DOLocalPath.
- The waypoint to go through
- The duration of the tween
- The type of path: Linear (straight path) or CatmullRom (curved CatmullRom path)
- The path mode: 3D, side-scroller 2D, top-down 2D
- The resolution of the path: higher resolutions make for more detailed curved paths but are more expensive.
- 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 TrailRenderer's startWidth/endWidth to the given value.
@@ -1743,6 +1795,22 @@
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)
+
+ IMPORTANT: Unless you really know what you're doing, you should use the overload that accepts a Vector3 array instead.
+ Tweens a Transform's position via the given path.
+ Also stores the transform as the tween's target so it can be used for filtered operations
+ The path to use
+ The duration of the tween
+ The path mode: 3D, side-scroller 2D, top-down 2D
+
+
+ IMPORTANT: Unless you really know what you're doing, you should use the overload that accepts a Vector3 array instead.
+ Tweens a Transform's localPosition via the given path.
+ Also stores the transform as the tween's target so it can be used for filtered operations
+ The path to use
+ The duration of the tween
+ The path mode: 3D, side-scroller 2D, top-down 2D
+
Tweens a Tween's timeScale to the given value.
Also stores the Tween as the tween's target so it can be used for filtered operations
@@ -1771,6 +1839,15 @@
The name of the material property to tween (like _Tint or _SpecColor)
The duration of the tween
+
+ Tweens a Material's named color property with the given ID to the given value,
+ in a way that allows other DOBlendableColor tweens to work together on the same target,
+ instead than fight each other as multiple DOColor would do.
+ Also stores the Material as the tween's target so it can be used for filtered operations
+ The value to tween to
+ The ID of the material property to tween (also called nameID in Unity's manual)
+ The duration of the tween
+
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,
@@ -2126,12 +2203,12 @@
- Sets the autoKill behaviour of the tween.
- Has no effect if the tween has already started
+ Sets the autoKill behaviour of the tween to TRUE.
+ Has no effect if the tween has already started or if it's added to a Sequence
Sets the autoKill behaviour of the tween.
- Has no effect if the tween has already started
+ Has no effect if the tween has already started or if it's added to a Sequence
If TRUE the tween will be automatically killed when complete
@@ -2148,6 +2225,19 @@
Filtering via int is 4X faster than via object, 2X faster than via string (using the alternate object/string overloads)
The int ID to assign to this tween.
+
+ Allows to link this tween to a GameObject
+ so that it will be automatically killed when the GameObject is destroyed.
+ Has no effect if the tween is added to a Sequence
+ The link target (unrelated to the target set via SetTarget)
+
+
+ Allows to link this tween to a GameObject and assign a behaviour depending on it.
+ This will also automatically kill the tween when the GameObject is destroyed.
+ Has no effect if the tween is added to a Sequence
+ The link target (unrelated to the target set via SetTarget)
+ The behaviour to use ( is always evaluated even if you choose another one)
+
Sets the target for the tween, which can then be used as a filter with DOTween's static methods.
IMPORTANT: use it with caution. If you just want to set an ID for the tween use SetId instead.
@@ -2329,6 +2419,24 @@
then immediately sends the target to the previously set endValue.
If TRUE the FROM value will be calculated as relative to the current one
+
+ Changes a TO tween into a FROM tween: sets the tween's starting value to the given one
+ and eventually sets the tween's target to that value immediately.
+ Value to start from
+ If TRUE sets the target to from value immediately, otherwise waits for the tween to start
+
+
+ Changes a TO tween into a FROM tween: sets the tween's starting value to the given one
+ and eventually sets the tween's target to that value immediately.
+ Alpha value to start from (in case of Fade tweens)
+ If TRUE sets the target to from value immediately, otherwise waits for the tween to start
+
+
+ Changes a TO tween into a FROM tween: sets the tween's starting value to the given one
+ and eventually sets the tween's target to that value immediately.
+ Value to start from (in case of Vector tweens that act on a single coordinate or scale tweens)
+ If TRUE sets the target to from value immediately, otherwise waits for the tween to start
+
Sets a delayed startup for the tween.
Has no effect on Sequences or if the tween has already started
@@ -2493,7 +2601,7 @@
Default is -999 so avoid using an ID like that or it will capture all unset intIds
- Tween target (usable for filtering with DOTween static methods). Automatically set by tween creation shorcuts
+ Tween target (usable for filtering with DOTween static methods). Automatically set by tween creation shortcuts
Called when the tween is set in a playing state, after any eventual delay.
@@ -2523,9 +2631,21 @@
Called when a path tween's current waypoint changes
+
+ Tweeners-only (ignored by Sequences), returns TRUE if the tween was set as relative
+
+
+ FALSE when tween is (or should be) despawned - set only by TweenManager
+
Gets and sets the time position (loops included, delays excluded) of the tween
+
+ TRUE after the tween was set in a play state at least once, AFTER any delay is elapsed
+
+
+ Time position within a single loop cycle
+
Animates a single value
diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll
index dd8bf57..ad728e6 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 7e60f1b..c94144a 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/DOTween46.dll b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween46.dll
index 79daf78..e8da221 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 07e7800..db73104 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/Editor/DOTweenEditor.XML b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/Editor/DOTweenEditor.XML
index 6afe743..92ab578 100644
--- a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/Editor/DOTweenEditor.XML
+++ b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/Editor/DOTweenEditor.XML
@@ -4,37 +4,58 @@
DOTweenEditor
-
+
+
+ Starts the update loop of tween in the editor. Has no effect during playMode.
+
+ Eventual callback to call after every update
+
+
+
+ Stops the update loop and clears the onPreviewUpdated callback.
+
+ If TRUE also resets the tweened objects to their original state
+
+
+
+ Readies the tween for editor preview by setting its UpdateType to Manual plus eventual extra settings.
+
+ The tween to ready
+ If TRUE (recommended) removes all callbacks (OnComplete/Rewind/etc)
+ If TRUE prevents the tween from being auto-killed at completion
+ If TRUE starts playing the tween immediately
+
+
Checks that the given editor texture use the correct import settings,
and applies them if they're incorrect.
-
+
- Returns TRUE if addons setup is required.
+ Returns TRUE if setup is required
-
+
Returns TRUE if the file/directory at the given path exists.
Path, relative to Unity's project folder
-
+
Converts the given project-relative path to a full path,
with backward (\) slashes).
-
+
Converts the given full path to a path usable with AssetDatabase methods
(relative to Unity's project folder, and with the correct Unity forward (/) slashes).
-
+
Connects to a asset.
If the asset already exists at the given path, loads it and returns it.
@@ -45,21 +66,33 @@
File path (relative to Unity's project folder)
If TRUE and the requested asset doesn't exist, forces its creation
-
+
Full path for the given loaded assembly, assembly file included
-
+
+
+ Adds the given global define if it's not already present
+
+
+
+
+ Removes the given global define if it's present
+
+
+
+
+ Returns TRUE if the given global define is present in all the
+ or only in the given , depending on passed parameters.
+
+
+ to use. Leave NULL to check in all of them.
+
+
Not used as menu item anymore, but as a utiity function
-
-
- Setups DOTween
-
- If TRUE, no warning window appears in case there is no need for setup
-
diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll
index abd34df..5d48020 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 e0918e3..25820d0 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/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/readme.txt b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/readme.txt
index 3439db1..37ff7ef 100644
--- a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/readme.txt
+++ b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/readme.txt
@@ -1,8 +1,18 @@
-DOTween and DOTween Pro are copyright (c) 2014 Daniele Giardini - Demigiant
+DOTween and DOTween Pro are copyright (c) 2014-2018 Daniele Giardini - Demigiant
+
+// IMPORTANT!!! /////////////////////////////////////////////
+// Upgrading DOTween from versions older than 1.2.000 ///////
+// (or DOTween Pro older than 1.0.000) //////////////////////
+-------------------------------------------------------------
+If you're upgrading your project from a version of DOTween older than 1.2.000 (or DOTween Pro older than 1.0.000) please follow these instructions carefully.
+1) Import the new version in the same folder as the previous one, overwriting old files. A lot of errors will appear but don't worry
+2) Close and reopen Unity (and your project). This is fundamental: skipping this step will cause a bloodbath
+3) Open DOTween's Utility Panel (Tools > Demigiant > DOTween Utility Panel) if it doesn't open automatically, then press "Setup DOTween...": this will run the upgrade setup
+4) From the Add/Remove Modules panel that opens, activate/deactivate Modules for Unity systems and for external assets (Pro version only)
// GET STARTED //////////////////////////////////////////////
-- After importing a new DOTween update, select DOTween's Utility Panel from the Tools menu (if it doesn't open automatically) and press the "Setup DOTween..." button to set up additional features based on your Unity version.
+- After importing a new DOTween update, select DOTween's Utility Panel from the "Tools/Demigiant" menu (if it doesn't open automatically) and press the "Setup DOTween..." button to activate/deactivate Modules. You can also access a Preferences Tab from there to choose default settings for DOTween.
- In your code, add "using DG.Tweening" to each class where you want to use DOTween.
- You're ready to tween. Check out the links below for full documentation and license info.
@@ -12,7 +22,8 @@ DOTween and DOTween Pro are copyright (c) 2014 Daniele Giardini - Demigiant
DOTween website (documentation, examples, etc): http://dotween.demigiant.com
DOTween license: http://dotween.demigiant.com/license.php
DOTween repository (Google Code): https://code.google.com/p/dotween/
+Demigiant website (documentation, examples, etc): http://www.demigiant.com
// NOTES //////////////////////////////////////////////////////
-- DOTween's Utility Panel can be found under "Tools > DOTween Utility Panel" and also contains other useful options, plus a tab to set DOTween's preferences
\ No newline at end of file
+- DOTween's Utility Panel can be found under "Tools > Demigiant > DOTween Utility Panel" and also contains other useful options, plus a tab to set DOTween's preferences
\ No newline at end of file
diff --git a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.XML b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.XML
index 2c3ec4d..9a9e868 100644
--- a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.XML
+++ b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.XML
@@ -137,6 +137,17 @@
Public so it can be used by external ease factories
+
+
+ Behaviour in case a tween nested inside a Sequence fails
+
+
+
+ If the Sequence contains other elements, kill the failed tween but preserve the rest
+
+
+ Kill the whole Sequence
+
Additional notices passed to plugins when updating.
@@ -179,6 +190,26 @@
Public only so custom shortcuts can access some of these methods
+
+
+ INTERNAL: used by DO shortcuts and Modules to set special startup mode
+
+
+
+
+ INTERNAL: used by DO shortcuts and Modules to set the tween as blendable
+
+
+
+
+ INTERNAL: used by DO shortcuts and Modules to prevent a tween from using a From setup even if passed
+
+
+
+
+ Used to dispatch commands that need to be captured externally, usually by Modules
+
+
Returns a Vector3 with z = 0
@@ -195,6 +226,37 @@
because the latter fails (in some cases) when assigning a Vector3 to a transform.position and then checking it.
+
+
+ Looks for the type within all possible project assembly names
+
+
+
+ NO-GC METHOD: changes the start value of a tween and rewinds it (without pausing it).
+ Has no effect with tweens that are inside Sequences
+ The new start value
+ If bigger than 0 applies it as the new tween duration
+
+
+ NO-GC METHOD: changes the end value of a tween and rewinds it (without pausing it).
+ Has no effect with tweens that are inside Sequences
+ The new end value
+ If TRUE the start value will become the current target's value, otherwise it will stay the same
+
+
+ NO-GC METHOD: changes the end value of a tween and rewinds it (without pausing it).
+ Has no effect with tweens that are inside Sequences
+ The new end value
+ If bigger than 0 applies it as the new tween duration
+ If TRUE the start value will become the current target's value, otherwise it will stay the same
+
+
+ NO-GC METHOD: changes the start and end value of a tween and rewinds it (without pausing it).
+ Has no effect with tweens that are inside Sequences
+ The new start value
+ The new end value
+ If bigger than 0 applies it as the new tween duration
+
Struct that stores two colors (used for LineRenderer tweens)
@@ -237,6 +299,9 @@
INTERNAL: do not use
+
+ INTERNAL: do not use
+
INTERNAL: do not use
@@ -265,6 +330,10 @@
(like targets becoming null while a tween is playing).
Default: TRUE
+
+ Behaviour in case a tween nested inside a Sequence fails (caught by safe mode).
+ Default: NestedTweenFailureBehaviour.TryToPreserveSequence
+
If TRUE you will get a DOTween report when exiting play mode (only in the Editor).
Useful to know how many max Tweeners and Sequences you reached and optimize your final project accordingly.
@@ -291,6 +360,13 @@
DOTween's log behaviour.
Default: LogBehaviour.ErrorsOnly
+
+ Used to intercept DOTween's logs. If this method isn't NULL, DOTween will call it before writing a log via Unity's own Debug log methods.
+ Return TRUE if you want DOTween to proceed with the log, FALSE otherwise.
+ This method must return a bool and accept two parameters:
+ - LogType: the type of Unity log that DOTween is trying to log
+ - object: the log message that DOTween wants to log
+
If TRUE draws path gizmos in Unity Editor (if the gizmos button is active).
Deactivate this if you want to avoid gizmos overhead while in Unity Editor
@@ -331,6 +407,9 @@
Default period used for eases
Default: 0
+
+ Used internally. Assigned/removed by DOTweenComponent.Create/DestroyInstance
+
Must be called once, before the first ever DOTween call/reference,
@@ -899,6 +978,32 @@
Max Sequences capacity.
Default: 50
+
+
+ Behaviour that can be assigned when chaining a SetLink to a tween
+
+
+
+ Pauses the tween when the link target is disabled
+
+
+ Pauses the tween when the link target is disabled, plays it when it's enabled
+
+
+ Pauses the tween when the link target is disabled, restarts it when it's enabled
+
+
+ Plays the tween when the link target is enabled
+
+
+ Restarts the tween when the link target is enabled
+
+
+ Kills the tween when the link target is disabled
+
+
+ Kills the tween when the link target is destroyed (becomes NULL). This is always active even if another behaviour is chosen
+
Path mode (used to determine correct LookAt orientation)
@@ -927,6 +1032,9 @@
Curved path (which uses Catmull-Rom curves)
+
+ EXPERIMENTAL: Curved path (which uses Cubic Bezier curves, where each point requires two extra control points)
+
Path control point
@@ -1239,16 +1347,6 @@
Methods that extend known Unity objects and allow to directly create and control tweens from their instances
-
- Tweens an AudioSource's volume to the given value.
- Also stores the AudioSource as the tween's target so it can be used for filtered operations
- The end value to reach (0 to 1)The duration of the tween
-
-
- Tweens an AudioSource's pitch to the given value.
- Also stores the AudioSource as the tween's target so it can be used for filtered operations
- The end value to reachThe duration of the tween
-
Tweens a Camera's aspect to the given value.
Also stores the camera as the tween's target so it can be used for filtered operations
@@ -1364,6 +1462,13 @@
The name of the material property to tween (like _Tint or _SpecColor)
The duration of the tween
+
+ Tweens a Material's named color property with the given ID to the given value.
+ Also stores the material as the tween's target so it can be used for filtered operations
+ The end value to reach
+ The ID of the material property to tween (also called nameID in Unity's manual)
+ The duration of the tween
+
Tweens a Material's alpha color to the given value
(will have no effect unless your material supports transparency).
@@ -1378,6 +1483,14 @@
The name of the material property to tween (like _Tint or _SpecColor)
The duration of the tween
+
+ Tweens a Material's alpha color with the given ID to the given value
+ (will have no effect unless your material supports transparency).
+ Also stores the material as the tween's target so it can be used for filtered operations
+ The end value to reach
+ The ID of the material property to tween (also called nameID in Unity's manual)
+ The duration of the tween
+
Tweens a Material's named float property to the given value.
Also stores the material as the tween's target so it can be used for filtered operations
@@ -1385,6 +1498,13 @@
The name of the material property to tween
The duration of the tween
+
+ Tweens a Material's named float property with the given ID to the given value.
+ Also stores the material as the tween's target so it can be used for filtered operations
+ The end value to reach
+ The ID of the material property to tween (also called nameID in Unity's manual)
+ The duration of the tween
+
Tweens a Material's texture offset to the given value.
Also stores the material as the tween's target so it can be used for filtered operations
@@ -1418,80 +1538,12 @@
The name of the material property to tween
The duration of the tween
-
- Tweens a Rigidbody's position to the given value.
- Also stores the rigidbody 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 Rigidbody's X position to the given value.
- Also stores the rigidbody 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 Rigidbody's Y position to the given value.
- Also stores the rigidbody 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 Rigidbody's Z position to the given value.
- Also stores the rigidbody 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 Rigidbody's rotation to the given value.
- Also stores the rigidbody as the tween's target so it can be used for filtered operations
- The end value to reachThe duration of the tween
- Rotation mode
-
-
- Tweens a Rigidbody's rotation so that it will look towards the given position.
- Also stores the rigidbody as the tween's target so it can be used for filtered operations
- The position to look atThe duration of the tween
- Eventual axis constraint for the rotation
- The vector that defines in which direction up is (default: Vector3.up)
-
-
- Tweens a Rigidbody's position to the given value, while also applying a jump effect along the Y axis.
- Returns a Sequence instead of a Tweener.
- Also stores the Rigidbody as the tween's target so it can be used for filtered operations
+
+ Tweens a Material's named Vector property with the given ID to the given value.
+ Also stores the material as the tween's target so it can be used for filtered operations
The end value to reach
- Power of the jump (the max height of the jump is represented by this plus the final Y offset)
- Total number of jumps
+ The ID of the material property to tween (also called nameID in Unity's manual)
The duration of the tween
- If TRUE the tween will smoothly snap all values to integers
-
-
- Tweens a Rigidbody's position through the given path waypoints, using the chosen path algorithm.
- Also stores the Rigidbody as the tween's target so it can be used for filtered operations.
- NOTE: to tween a rigidbody correctly it should be set to kinematic at least while being tweened.
- BEWARE: doesn't work on Windows Phone store (waiting for Unity to fix their own bug).
- If you plan to publish there you should use a regular transform.DOPath.
- The waypoints to go through
- The duration of the tween
- The type of path: Linear (straight path) or CatmullRom (curved CatmullRom path)
- The path mode: 3D, side-scroller 2D, top-down 2D
- The resolution of the path (useless in case of Linear paths): higher resolutions make for more detailed curved paths but are more expensive.
- 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 Rigidbody's localPosition through the given path waypoints, using the chosen path algorithm.
- Also stores the Rigidbody as the tween's target so it can be used for filtered operations
- NOTE: to tween a rigidbody correctly it should be set to kinematic at least while being tweened.
- BEWARE: doesn't work on Windows Phone store (waiting for Unity to fix their own bug).
- If you plan to publish there you should use a regular transform.DOLocalPath.
- The waypoint to go through
- The duration of the tween
- The type of path: Linear (straight path) or CatmullRom (curved CatmullRom path)
- The path mode: 3D, side-scroller 2D, top-down 2D
- The resolution of the path: higher resolutions make for more detailed curved paths but are more expensive.
- 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 TrailRenderer's startWidth/endWidth to the given value.
@@ -1743,6 +1795,22 @@
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)
+
+ IMPORTANT: Unless you really know what you're doing, you should use the overload that accepts a Vector3 array instead.
+ Tweens a Transform's position via the given path.
+ Also stores the transform as the tween's target so it can be used for filtered operations
+ The path to use
+ The duration of the tween
+ The path mode: 3D, side-scroller 2D, top-down 2D
+
+
+ IMPORTANT: Unless you really know what you're doing, you should use the overload that accepts a Vector3 array instead.
+ Tweens a Transform's localPosition via the given path.
+ Also stores the transform as the tween's target so it can be used for filtered operations
+ The path to use
+ The duration of the tween
+ The path mode: 3D, side-scroller 2D, top-down 2D
+
Tweens a Tween's timeScale to the given value.
Also stores the Tween as the tween's target so it can be used for filtered operations
@@ -1771,6 +1839,15 @@
The name of the material property to tween (like _Tint or _SpecColor)
The duration of the tween
+
+ Tweens a Material's named color property with the given ID to the given value,
+ in a way that allows other DOBlendableColor tweens to work together on the same target,
+ instead than fight each other as multiple DOColor would do.
+ Also stores the Material as the tween's target so it can be used for filtered operations
+ The value to tween to
+ The ID of the material property to tween (also called nameID in Unity's manual)
+ The duration of the tween
+
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,
@@ -2126,12 +2203,12 @@
- Sets the autoKill behaviour of the tween.
- Has no effect if the tween has already started
+ Sets the autoKill behaviour of the tween to TRUE.
+ Has no effect if the tween has already started or if it's added to a Sequence
Sets the autoKill behaviour of the tween.
- Has no effect if the tween has already started
+ Has no effect if the tween has already started or if it's added to a Sequence
If TRUE the tween will be automatically killed when complete
@@ -2148,6 +2225,19 @@
Filtering via int is 4X faster than via object, 2X faster than via string (using the alternate object/string overloads)
The int ID to assign to this tween.
+
+ Allows to link this tween to a GameObject
+ so that it will be automatically killed when the GameObject is destroyed.
+ Has no effect if the tween is added to a Sequence
+ The link target (unrelated to the target set via SetTarget)
+
+
+ Allows to link this tween to a GameObject and assign a behaviour depending on it.
+ This will also automatically kill the tween when the GameObject is destroyed.
+ Has no effect if the tween is added to a Sequence
+ The link target (unrelated to the target set via SetTarget)
+ The behaviour to use ( is always evaluated even if you choose another one)
+
Sets the target for the tween, which can then be used as a filter with DOTween's static methods.
IMPORTANT: use it with caution. If you just want to set an ID for the tween use SetId instead.
@@ -2329,6 +2419,24 @@
then immediately sends the target to the previously set endValue.
If TRUE the FROM value will be calculated as relative to the current one
+
+ Changes a TO tween into a FROM tween: sets the tween's starting value to the given one
+ and eventually sets the tween's target to that value immediately.
+ Value to start from
+ If TRUE sets the target to from value immediately, otherwise waits for the tween to start
+
+
+ Changes a TO tween into a FROM tween: sets the tween's starting value to the given one
+ and eventually sets the tween's target to that value immediately.
+ Alpha value to start from (in case of Fade tweens)
+ If TRUE sets the target to from value immediately, otherwise waits for the tween to start
+
+
+ Changes a TO tween into a FROM tween: sets the tween's starting value to the given one
+ and eventually sets the tween's target to that value immediately.
+ Value to start from (in case of Vector tweens that act on a single coordinate or scale tweens)
+ If TRUE sets the target to from value immediately, otherwise waits for the tween to start
+
Sets a delayed startup for the tween.
Has no effect on Sequences or if the tween has already started
@@ -2493,7 +2601,7 @@
Default is -999 so avoid using an ID like that or it will capture all unset intIds
- Tween target (usable for filtering with DOTween static methods). Automatically set by tween creation shorcuts
+ Tween target (usable for filtering with DOTween static methods). Automatically set by tween creation shortcuts
Called when the tween is set in a playing state, after any eventual delay.
@@ -2523,9 +2631,21 @@
Called when a path tween's current waypoint changes
+
+ Tweeners-only (ignored by Sequences), returns TRUE if the tween was set as relative
+
+
+ FALSE when tween is (or should be) despawned - set only by TweenManager
+
Gets and sets the time position (loops included, delays excluded) of the tween
+
+ TRUE after the tween was set in a play state at least once, AFTER any delay is elapsed
+
+
+ Time position within a single loop cycle
+
Animates a single value
diff --git a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.dll b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.dll
index dd8bf57..ad728e6 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 7e60f1b..c94144a 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/DOTween46.dll b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween46.dll
index 79daf78..e8da221 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 07e7800..db73104 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/Editor/DOTweenEditor.XML b/UnityTests.Unity4/Assets/Demigiant/DOTween/Editor/DOTweenEditor.XML
index 6afe743..92ab578 100644
--- a/UnityTests.Unity4/Assets/Demigiant/DOTween/Editor/DOTweenEditor.XML
+++ b/UnityTests.Unity4/Assets/Demigiant/DOTween/Editor/DOTweenEditor.XML
@@ -4,37 +4,58 @@
DOTweenEditor
-
+
+
+ Starts the update loop of tween in the editor. Has no effect during playMode.
+
+ Eventual callback to call after every update
+
+
+
+ Stops the update loop and clears the onPreviewUpdated callback.
+
+ If TRUE also resets the tweened objects to their original state
+
+
+
+ Readies the tween for editor preview by setting its UpdateType to Manual plus eventual extra settings.
+
+ The tween to ready
+ If TRUE (recommended) removes all callbacks (OnComplete/Rewind/etc)
+ If TRUE prevents the tween from being auto-killed at completion
+ If TRUE starts playing the tween immediately
+
+
Checks that the given editor texture use the correct import settings,
and applies them if they're incorrect.
-
+
- Returns TRUE if addons setup is required.
+ Returns TRUE if setup is required
-
+
Returns TRUE if the file/directory at the given path exists.
Path, relative to Unity's project folder
-
+
Converts the given project-relative path to a full path,
with backward (\) slashes).
-
+
Converts the given full path to a path usable with AssetDatabase methods
(relative to Unity's project folder, and with the correct Unity forward (/) slashes).
-
+
Connects to a asset.
If the asset already exists at the given path, loads it and returns it.
@@ -45,21 +66,33 @@
File path (relative to Unity's project folder)
If TRUE and the requested asset doesn't exist, forces its creation
-
+
Full path for the given loaded assembly, assembly file included
-
+
+
+ Adds the given global define if it's not already present
+
+
+
+
+ Removes the given global define if it's present
+
+
+
+
+ Returns TRUE if the given global define is present in all the
+ or only in the given , depending on passed parameters.
+
+
+ to use. Leave NULL to check in all of them.
+
+
Not used as menu item anymore, but as a utiity function
-
-
- Setups DOTween
-
- If TRUE, no warning window appears in case there is no need for setup
-
diff --git a/UnityTests.Unity4/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll b/UnityTests.Unity4/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll
index abd34df..5d48020 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 e0918e3..25820d0 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.Unity4/Assets/Demigiant/DOTween/readme.txt b/UnityTests.Unity4/Assets/Demigiant/DOTween/readme.txt
index 3439db1..37ff7ef 100644
--- a/UnityTests.Unity4/Assets/Demigiant/DOTween/readme.txt
+++ b/UnityTests.Unity4/Assets/Demigiant/DOTween/readme.txt
@@ -1,8 +1,18 @@
-DOTween and DOTween Pro are copyright (c) 2014 Daniele Giardini - Demigiant
+DOTween and DOTween Pro are copyright (c) 2014-2018 Daniele Giardini - Demigiant
+
+// IMPORTANT!!! /////////////////////////////////////////////
+// Upgrading DOTween from versions older than 1.2.000 ///////
+// (or DOTween Pro older than 1.0.000) //////////////////////
+-------------------------------------------------------------
+If you're upgrading your project from a version of DOTween older than 1.2.000 (or DOTween Pro older than 1.0.000) please follow these instructions carefully.
+1) Import the new version in the same folder as the previous one, overwriting old files. A lot of errors will appear but don't worry
+2) Close and reopen Unity (and your project). This is fundamental: skipping this step will cause a bloodbath
+3) Open DOTween's Utility Panel (Tools > Demigiant > DOTween Utility Panel) if it doesn't open automatically, then press "Setup DOTween...": this will run the upgrade setup
+4) From the Add/Remove Modules panel that opens, activate/deactivate Modules for Unity systems and for external assets (Pro version only)
// GET STARTED //////////////////////////////////////////////
-- After importing a new DOTween update, select DOTween's Utility Panel from the Tools menu (if it doesn't open automatically) and press the "Setup DOTween..." button to set up additional features based on your Unity version.
+- After importing a new DOTween update, select DOTween's Utility Panel from the "Tools/Demigiant" menu (if it doesn't open automatically) and press the "Setup DOTween..." button to activate/deactivate Modules. You can also access a Preferences Tab from there to choose default settings for DOTween.
- In your code, add "using DG.Tweening" to each class where you want to use DOTween.
- You're ready to tween. Check out the links below for full documentation and license info.
@@ -12,7 +22,8 @@ DOTween and DOTween Pro are copyright (c) 2014 Daniele Giardini - Demigiant
DOTween website (documentation, examples, etc): http://dotween.demigiant.com
DOTween license: http://dotween.demigiant.com/license.php
DOTween repository (Google Code): https://code.google.com/p/dotween/
+Demigiant website (documentation, examples, etc): http://www.demigiant.com
// NOTES //////////////////////////////////////////////////////
-- DOTween's Utility Panel can be found under "Tools > DOTween Utility Panel" and also contains other useful options, plus a tab to set DOTween's preferences
\ No newline at end of file
+- DOTween's Utility Panel can be found under "Tools > Demigiant > DOTween Utility Panel" and also contains other useful options, plus a tab to set DOTween's preferences
\ No newline at end of file
diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll
index 39f5b05..902cfe3 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 cc295d6..f2228ac 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/Editor/DOTweenEditor.dll b/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll
index 2c8f287..3488060 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 4cc3f51..00b6fbe 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/Demigiant/DOTween/Editor/DOTweenUpgradeManager.XML.meta b/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenUpgradeManager.XML.meta
index dedb948..3ef2dfb 100644
--- a/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenUpgradeManager.XML.meta
+++ b/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenUpgradeManager.XML.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 25e007bdbcd3d924b992ace777b1927f
-timeCreated: 1554551713
+timeCreated: 1560264001
licenseType: Pro
TextScriptImporter:
userData:
diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenUpgradeManager.dll b/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenUpgradeManager.dll
index 25d0ab4..f732d87 100644
Binary files a/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenUpgradeManager.dll and b/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenUpgradeManager.dll differ
diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenUpgradeManager.dll.mdb b/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenUpgradeManager.dll.mdb
index 1265c18..bb55b1f 100644
Binary files a/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenUpgradeManager.dll.mdb and b/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenUpgradeManager.dll.mdb differ
diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenUpgradeManager.dll.mdb.meta b/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenUpgradeManager.dll.mdb.meta
index 839300b..f7e3e30 100644
--- a/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenUpgradeManager.dll.mdb.meta
+++ b/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenUpgradeManager.dll.mdb.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 3022aac9cb773eb418831741c656efec
-timeCreated: 1554551699
+timeCreated: 1560263984
licenseType: Pro
DefaultImporter:
userData:
diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenUpgradeManager.dll.meta b/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenUpgradeManager.dll.meta
index 5ed6bd7..41f609f 100644
--- a/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenUpgradeManager.dll.meta
+++ b/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenUpgradeManager.dll.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 65bddc2573542404ca55aa12e6572a5f
-timeCreated: 1554551705
+timeCreated: 1560263991
licenseType: Pro
PluginImporter:
serializedVersion: 2
diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/Modules/DOTweenModuleUI.cs b/UnityTests.Unity5/Assets/Demigiant/DOTween/Modules/DOTweenModuleUI.cs
index 072c02c..f295135 100644
--- a/UnityTests.Unity5/Assets/Demigiant/DOTween/Modules/DOTweenModuleUI.cs
+++ b/UnityTests.Unity5/Assets/Demigiant/DOTween/Modules/DOTweenModuleUI.cs
@@ -501,6 +501,10 @@ namespace DG.Tweening
/// Leave it to NULL (default) to use default ones
public static TweenerCore DOText(this Text target, string endValue, float duration, bool richTextEnabled = true, ScrambleMode scrambleMode = ScrambleMode.None, string scrambleChars = null)
{
+ if (endValue == null) {
+ if (Debugger.logPriority > 0) Debugger.LogWarning("You can't pass a NULL string to DOText: an empty string will be used instead to avoid errors");
+ endValue = "";
+ }
TweenerCore t = DOTween.To(() => target.text, x => target.text = x, endValue, duration);
t.SetOptions(richTextEnabled, scrambleMode, scrambleChars)
.SetTarget(target);
diff --git a/UnityTests.Unity5/Assets/_Tests/TempTests.cs b/UnityTests.Unity5/Assets/_Tests/TempTests.cs
index a4e2026..803a30c 100644
--- a/UnityTests.Unity5/Assets/_Tests/TempTests.cs
+++ b/UnityTests.Unity5/Assets/_Tests/TempTests.cs
@@ -11,16 +11,12 @@ using UnityEngine.UI;
public class TempTests : BrainBase
{
- public Transform target;
+ public Text tf;
IEnumerator Start()
{
- Sequence s = DOTween.Sequence().SetAutoKill(false)
- .Join(target.DOMoveX(2, 1))
- .Append(target.DOMoveY(2, 1));
- yield return s.WaitForCompletion(true);
+ yield return new WaitForSeconds(0.8f);
- s.PlayBackwards();
- s.PlayForward();
+ tf.DOText(null, 1);
}
}
\ No newline at end of file
diff --git a/UnityTests.Unity5/Assets/_Tests/TempTests.unity b/UnityTests.Unity5/Assets/_Tests/TempTests.unity
index ad13169..a482443 100644
Binary files a/UnityTests.Unity5/Assets/_Tests/TempTests.unity and b/UnityTests.Unity5/Assets/_Tests/TempTests.unity differ
diff --git a/_DOTween.Assembly/DOTween/DOTween.cs b/_DOTween.Assembly/DOTween/DOTween.cs
index 50f1a80..e9fbfa6 100644
--- a/_DOTween.Assembly/DOTween/DOTween.cs
+++ b/_DOTween.Assembly/DOTween/DOTween.cs
@@ -34,7 +34,7 @@ namespace DG.Tweening
public class DOTween
{
/// DOTween's version
- public static readonly string Version = "1.2.251"; // Last version before modules: 1.1.755
+ public static readonly string Version = "1.2.252"; // Last version before modules: 1.1.755
///////////////////////////////////////////////
// Options ////////////////////////////////////
diff --git a/_DOTween.Assembly/bin/DOTween.dll b/_DOTween.Assembly/bin/DOTween.dll
index 39f5b05..902cfe3 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 cc295d6..f2228ac 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/Editor/DOTweenEditor.dll b/_DOTween.Assembly/bin/Editor/DOTweenEditor.dll
index 2c8f287..3488060 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 4cc3f51..00b6fbe 100644
Binary files a/_DOTween.Assembly/bin/Editor/DOTweenEditor.dll.mdb and b/_DOTween.Assembly/bin/Editor/DOTweenEditor.dll.mdb differ
diff --git a/_DOTween.Assembly/bin/Editor/DOTweenUpgradeManager.dll b/_DOTween.Assembly/bin/Editor/DOTweenUpgradeManager.dll
index 25d0ab4..f732d87 100644
Binary files a/_DOTween.Assembly/bin/Editor/DOTweenUpgradeManager.dll and b/_DOTween.Assembly/bin/Editor/DOTweenUpgradeManager.dll differ
diff --git a/_DOTween.Assembly/bin/Editor/DOTweenUpgradeManager.dll.mdb b/_DOTween.Assembly/bin/Editor/DOTweenUpgradeManager.dll.mdb
index 1265c18..bb55b1f 100644
Binary files a/_DOTween.Assembly/bin/Editor/DOTweenUpgradeManager.dll.mdb and b/_DOTween.Assembly/bin/Editor/DOTweenUpgradeManager.dll.mdb differ
diff --git a/_DOTween.Assembly/bin/Modules/DOTweenModuleUI.cs b/_DOTween.Assembly/bin/Modules/DOTweenModuleUI.cs
index 072c02c..f295135 100644
--- a/_DOTween.Assembly/bin/Modules/DOTweenModuleUI.cs
+++ b/_DOTween.Assembly/bin/Modules/DOTweenModuleUI.cs
@@ -501,6 +501,10 @@ namespace DG.Tweening
/// Leave it to NULL (default) to use default ones
public static TweenerCore DOText(this Text target, string endValue, float duration, bool richTextEnabled = true, ScrambleMode scrambleMode = ScrambleMode.None, string scrambleChars = null)
{
+ if (endValue == null) {
+ if (Debugger.logPriority > 0) Debugger.LogWarning("You can't pass a NULL string to DOText: an empty string will be used instead to avoid errors");
+ endValue = "";
+ }
TweenerCore t = DOTween.To(() => target.text, x => target.text = x, endValue, duration);
t.SetOptions(richTextEnabled, scrambleMode, scrambleChars)
.SetTarget(target);