diff --git a/.gitignore b/.gitignore index 23017ee..fe4264e 100644 --- a/.gitignore +++ b/.gitignore @@ -21,6 +21,7 @@ ExternalPluginsTestsAndExamples* *.Unity*/Assets/-tk2d* *.Unity*/Assets/Console*Pro* *.Unity*/Assets/Text*Mesh*Pro* +.vs *HOPoolOperator* *HOTools* zz builds diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.XML b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.XML index 35dc374..acf3900 100644 --- a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.XML +++ b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.XML @@ -1636,6 +1636,16 @@ For Sequences only: if TRUE also internal Sequence callbacks will be fired, otherwise they will be ignored + + + Completes all tweens that have this target as a reference + (meaning tweens that were started from this target, or that had this target added as an Id) + and returns the total number of tweens completed + (meaning the tweens that don't have infinite loops and were not already complete) + + For Sequences only: if TRUE also internal Sequence callbacks will be fired, + otherwise they will be ignored + Kills all tweens that have this target as a reference @@ -1644,6 +1654,14 @@ If TRUE completes the tween before killing it + + + Kills all tweens that have this target as a reference + (meaning tweens that were started from this target, or that had this target added as an Id) + and returns the total number of tweens killed. + + If TRUE completes the tween before killing it + Flips the direction (backwards if it was going forward or viceversa) of all tweens that have this target as a reference @@ -1651,6 +1669,13 @@ and returns the total number of tweens flipped. + + + Flips the direction (backwards if it was going forward or viceversa) of all tweens that have this target as a reference + (meaning tweens that were started from this target, or that had this target added as an Id) + and returns the total number of tweens flipped. + + Sends to the given position all tweens that have this target as a reference @@ -1661,6 +1686,16 @@ (if higher than the whole tween duration the tween will simply reach its end) If TRUE will play the tween after reaching the given position, otherwise it will pause it + + + Sends to the given position all tweens that have this target as a reference + (meaning tweens that were started from this target, or that had this target added as an Id) + and returns the total number of tweens involved. + + Time position to reach + (if higher than the whole tween duration the tween will simply reach its end) + If TRUE will play the tween after reaching the given position, otherwise it will pause it + Pauses all tweens that have this target as a reference @@ -1668,6 +1703,13 @@ and returns the total number of tweens paused. + + + Pauses all tweens that have this target as a reference + (meaning tweens that were started from this target, or that had this target added as an Id) + and returns the total number of tweens paused. + + Plays all tweens that have this target as a reference @@ -1675,6 +1717,13 @@ and returns the total number of tweens played. + + + Plays all tweens that have this target as a reference + (meaning tweens that were started from this target, or that had this target added as an Id) + and returns the total number of tweens played. + + Plays backwards all tweens that have this target as a reference @@ -1682,6 +1731,13 @@ and returns the total number of tweens played. + + + Plays backwards all tweens that have this target as a reference + (meaning tweens that were started from this target, or that had this target added as an Id) + and returns the total number of tweens played. + + Plays forward all tweens that have this target as a reference @@ -1689,6 +1745,13 @@ and returns the total number of tweens played. + + + Plays forward all tweens that have this target as a reference + (meaning tweens that were started from this target, or that had this target added as an Id) + and returns the total number of tweens played. + + Restarts all tweens that have this target as a reference @@ -1696,6 +1759,13 @@ and returns the total number of tweens restarted. + + + Restarts all tweens that have this target as a reference + (meaning tweens that were started from this target, or that had this target added as an Id) + and returns the total number of tweens restarted. + + Rewinds all tweens that have this target as a reference @@ -1703,6 +1773,13 @@ and returns the total number of tweens rewinded. + + + Rewinds all tweens that have this target as a reference + (meaning tweens that were started from this target, or that had this target added as an Id) + and returns the total number of tweens rewinded. + + Smoothly rewinds all tweens that have this target as a reference @@ -1710,6 +1787,13 @@ and returns the total number of tweens rewinded. + + + Smoothly rewinds all tweens that have this target as a reference + (meaning tweens that were started from this target, or that had this target added as an Id) + and returns the total number of tweens rewinded. + + Toggles the paused state (plays if it was paused, pauses if it was playing) of all tweens that have this target as a reference @@ -1717,6 +1801,13 @@ and returns the total number of tweens involved. + + + Toggles the paused state (plays if it was paused, pauses if it was playing) of all tweens that have this target as a reference + (meaning tweens that were started from this target, or that had this target added as an Id) + and returns the total number of tweens involved. + + This class serves only as a utility class to store tween settings to apply on multiple tweens. diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll index 35000cd..b4318d5 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 08babe5..0241891 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/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.XML b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.XML index 35dc374..acf3900 100644 --- a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.XML +++ b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.XML @@ -1636,6 +1636,16 @@ For Sequences only: if TRUE also internal Sequence callbacks will be fired, otherwise they will be ignored + + + Completes all tweens that have this target as a reference + (meaning tweens that were started from this target, or that had this target added as an Id) + and returns the total number of tweens completed + (meaning the tweens that don't have infinite loops and were not already complete) + + For Sequences only: if TRUE also internal Sequence callbacks will be fired, + otherwise they will be ignored + Kills all tweens that have this target as a reference @@ -1644,6 +1654,14 @@ If TRUE completes the tween before killing it + + + Kills all tweens that have this target as a reference + (meaning tweens that were started from this target, or that had this target added as an Id) + and returns the total number of tweens killed. + + If TRUE completes the tween before killing it + Flips the direction (backwards if it was going forward or viceversa) of all tweens that have this target as a reference @@ -1651,6 +1669,13 @@ and returns the total number of tweens flipped. + + + Flips the direction (backwards if it was going forward or viceversa) of all tweens that have this target as a reference + (meaning tweens that were started from this target, or that had this target added as an Id) + and returns the total number of tweens flipped. + + Sends to the given position all tweens that have this target as a reference @@ -1661,6 +1686,16 @@ (if higher than the whole tween duration the tween will simply reach its end) If TRUE will play the tween after reaching the given position, otherwise it will pause it + + + Sends to the given position all tweens that have this target as a reference + (meaning tweens that were started from this target, or that had this target added as an Id) + and returns the total number of tweens involved. + + Time position to reach + (if higher than the whole tween duration the tween will simply reach its end) + If TRUE will play the tween after reaching the given position, otherwise it will pause it + Pauses all tweens that have this target as a reference @@ -1668,6 +1703,13 @@ and returns the total number of tweens paused. + + + Pauses all tweens that have this target as a reference + (meaning tweens that were started from this target, or that had this target added as an Id) + and returns the total number of tweens paused. + + Plays all tweens that have this target as a reference @@ -1675,6 +1717,13 @@ and returns the total number of tweens played. + + + Plays all tweens that have this target as a reference + (meaning tweens that were started from this target, or that had this target added as an Id) + and returns the total number of tweens played. + + Plays backwards all tweens that have this target as a reference @@ -1682,6 +1731,13 @@ and returns the total number of tweens played. + + + Plays backwards all tweens that have this target as a reference + (meaning tweens that were started from this target, or that had this target added as an Id) + and returns the total number of tweens played. + + Plays forward all tweens that have this target as a reference @@ -1689,6 +1745,13 @@ and returns the total number of tweens played. + + + Plays forward all tweens that have this target as a reference + (meaning tweens that were started from this target, or that had this target added as an Id) + and returns the total number of tweens played. + + Restarts all tweens that have this target as a reference @@ -1696,6 +1759,13 @@ and returns the total number of tweens restarted. + + + Restarts all tweens that have this target as a reference + (meaning tweens that were started from this target, or that had this target added as an Id) + and returns the total number of tweens restarted. + + Rewinds all tweens that have this target as a reference @@ -1703,6 +1773,13 @@ and returns the total number of tweens rewinded. + + + Rewinds all tweens that have this target as a reference + (meaning tweens that were started from this target, or that had this target added as an Id) + and returns the total number of tweens rewinded. + + Smoothly rewinds all tweens that have this target as a reference @@ -1710,6 +1787,13 @@ and returns the total number of tweens rewinded. + + + Smoothly rewinds all tweens that have this target as a reference + (meaning tweens that were started from this target, or that had this target added as an Id) + and returns the total number of tweens rewinded. + + Toggles the paused state (plays if it was paused, pauses if it was playing) of all tweens that have this target as a reference @@ -1717,6 +1801,13 @@ and returns the total number of tweens involved. + + + Toggles the paused state (plays if it was paused, pauses if it was playing) of all tweens that have this target as a reference + (meaning tweens that were started from this target, or that had this target added as an Id) + and returns the total number of tweens involved. + + This class serves only as a utility class to store tween settings to apply on multiple tweens. diff --git a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.dll b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.dll index 35000cd..b4318d5 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 08babe5..0241891 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.Unity5/Assets/Demigiant/DOTween/DOTween.XML b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.XML index 35dc374..acf3900 100644 --- a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.XML +++ b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.XML @@ -1636,6 +1636,16 @@ For Sequences only: if TRUE also internal Sequence callbacks will be fired, otherwise they will be ignored + + + Completes all tweens that have this target as a reference + (meaning tweens that were started from this target, or that had this target added as an Id) + and returns the total number of tweens completed + (meaning the tweens that don't have infinite loops and were not already complete) + + For Sequences only: if TRUE also internal Sequence callbacks will be fired, + otherwise they will be ignored + Kills all tweens that have this target as a reference @@ -1644,6 +1654,14 @@ If TRUE completes the tween before killing it + + + Kills all tweens that have this target as a reference + (meaning tweens that were started from this target, or that had this target added as an Id) + and returns the total number of tweens killed. + + If TRUE completes the tween before killing it + Flips the direction (backwards if it was going forward or viceversa) of all tweens that have this target as a reference @@ -1651,6 +1669,13 @@ and returns the total number of tweens flipped. + + + Flips the direction (backwards if it was going forward or viceversa) of all tweens that have this target as a reference + (meaning tweens that were started from this target, or that had this target added as an Id) + and returns the total number of tweens flipped. + + Sends to the given position all tweens that have this target as a reference @@ -1661,6 +1686,16 @@ (if higher than the whole tween duration the tween will simply reach its end) If TRUE will play the tween after reaching the given position, otherwise it will pause it + + + Sends to the given position all tweens that have this target as a reference + (meaning tweens that were started from this target, or that had this target added as an Id) + and returns the total number of tweens involved. + + Time position to reach + (if higher than the whole tween duration the tween will simply reach its end) + If TRUE will play the tween after reaching the given position, otherwise it will pause it + Pauses all tweens that have this target as a reference @@ -1668,6 +1703,13 @@ and returns the total number of tweens paused. + + + Pauses all tweens that have this target as a reference + (meaning tweens that were started from this target, or that had this target added as an Id) + and returns the total number of tweens paused. + + Plays all tweens that have this target as a reference @@ -1675,6 +1717,13 @@ and returns the total number of tweens played. + + + Plays all tweens that have this target as a reference + (meaning tweens that were started from this target, or that had this target added as an Id) + and returns the total number of tweens played. + + Plays backwards all tweens that have this target as a reference @@ -1682,6 +1731,13 @@ and returns the total number of tweens played. + + + Plays backwards all tweens that have this target as a reference + (meaning tweens that were started from this target, or that had this target added as an Id) + and returns the total number of tweens played. + + Plays forward all tweens that have this target as a reference @@ -1689,6 +1745,13 @@ and returns the total number of tweens played. + + + Plays forward all tweens that have this target as a reference + (meaning tweens that were started from this target, or that had this target added as an Id) + and returns the total number of tweens played. + + Restarts all tweens that have this target as a reference @@ -1696,6 +1759,13 @@ and returns the total number of tweens restarted. + + + Restarts all tweens that have this target as a reference + (meaning tweens that were started from this target, or that had this target added as an Id) + and returns the total number of tweens restarted. + + Rewinds all tweens that have this target as a reference @@ -1703,6 +1773,13 @@ and returns the total number of tweens rewinded. + + + Rewinds all tweens that have this target as a reference + (meaning tweens that were started from this target, or that had this target added as an Id) + and returns the total number of tweens rewinded. + + Smoothly rewinds all tweens that have this target as a reference @@ -1710,6 +1787,13 @@ and returns the total number of tweens rewinded. + + + Smoothly rewinds all tweens that have this target as a reference + (meaning tweens that were started from this target, or that had this target added as an Id) + and returns the total number of tweens rewinded. + + Toggles the paused state (plays if it was paused, pauses if it was playing) of all tweens that have this target as a reference @@ -1717,6 +1801,13 @@ and returns the total number of tweens involved. + + + Toggles the paused state (plays if it was paused, pauses if it was playing) of all tweens that have this target as a reference + (meaning tweens that were started from this target, or that had this target added as an Id) + and returns the total number of tweens involved. + + This class serves only as a utility class to store tween settings to apply on multiple tweens. diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll index 35000cd..b4318d5 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 08babe5..0241891 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/UnityVS.meta b/UnityTests.Unity5/Assets/UnityVS.meta index 00d3372..9e28a46 100644 --- a/UnityTests.Unity5/Assets/UnityVS.meta +++ b/UnityTests.Unity5/Assets/UnityVS.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 02fe78e962405814a83b8ba6c9471d32 folderAsset: yes -timeCreated: 1426681054 -licenseType: Pro +timeCreated: 1439628445 +licenseType: Free DefaultImporter: userData: assetBundleName: diff --git a/UnityTests.Unity5/Assets/UnityVS/Editor.meta b/UnityTests.Unity5/Assets/UnityVS/Editor.meta index b6befcd..0d09b28 100644 --- a/UnityTests.Unity5/Assets/UnityVS/Editor.meta +++ b/UnityTests.Unity5/Assets/UnityVS/Editor.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 6e71a3e2fb5854e43823a9da25b68e21 folderAsset: yes -timeCreated: 1426681054 -licenseType: Pro +timeCreated: 1439628445 +licenseType: Free DefaultImporter: userData: assetBundleName: diff --git a/UnityTests.Unity5/Assets/UnityVS/Editor/SyntaxTree.VisualStudio.Unity.Bridge.dll b/UnityTests.Unity5/Assets/UnityVS/Editor/SyntaxTree.VisualStudio.Unity.Bridge.dll index 8f28fd7..e2f5f17 100644 Binary files a/UnityTests.Unity5/Assets/UnityVS/Editor/SyntaxTree.VisualStudio.Unity.Bridge.dll and b/UnityTests.Unity5/Assets/UnityVS/Editor/SyntaxTree.VisualStudio.Unity.Bridge.dll differ diff --git a/UnityTests.Unity5/Assets/UnityVS/Editor/SyntaxTree.VisualStudio.Unity.Bridge.dll.meta b/UnityTests.Unity5/Assets/UnityVS/Editor/SyntaxTree.VisualStudio.Unity.Bridge.dll.meta index 2c8f4f6..6a2e6d4 100644 --- a/UnityTests.Unity5/Assets/UnityVS/Editor/SyntaxTree.VisualStudio.Unity.Bridge.dll.meta +++ b/UnityTests.Unity5/Assets/UnityVS/Editor/SyntaxTree.VisualStudio.Unity.Bridge.dll.meta @@ -1,18 +1 @@ -fileFormatVersion: 2 -guid: 38d405c119fcc7c4e83d4a478a40ff2f -PluginImporter: - serializedVersion: 1 - iconMap: {} - executionOrder: {} - isPreloaded: 0 - platformData: - Any: - enabled: 0 - settings: {} - Editor: - enabled: 1 - settings: - DefaultValueInitialized: true - userData: - assetBundleName: - assetBundleVariant: +guid: 38d405c119fcc7c4e83d4a478a40ff2f diff --git a/UnityTests.Unity5/Assets/UnityVS/Editor/SyntaxTree.VisualStudio.Unity.Messaging.dll b/UnityTests.Unity5/Assets/UnityVS/Editor/SyntaxTree.VisualStudio.Unity.Messaging.dll index 3df910d..c7cd0a9 100644 Binary files a/UnityTests.Unity5/Assets/UnityVS/Editor/SyntaxTree.VisualStudio.Unity.Messaging.dll and b/UnityTests.Unity5/Assets/UnityVS/Editor/SyntaxTree.VisualStudio.Unity.Messaging.dll differ diff --git a/UnityTests.Unity5/Assets/UnityVS/Editor/SyntaxTree.VisualStudio.Unity.Messaging.dll.meta b/UnityTests.Unity5/Assets/UnityVS/Editor/SyntaxTree.VisualStudio.Unity.Messaging.dll.meta index db97df2..19d28ec 100644 --- a/UnityTests.Unity5/Assets/UnityVS/Editor/SyntaxTree.VisualStudio.Unity.Messaging.dll.meta +++ b/UnityTests.Unity5/Assets/UnityVS/Editor/SyntaxTree.VisualStudio.Unity.Messaging.dll.meta @@ -1,18 +1 @@ -fileFormatVersion: 2 -guid: 4ad02dc83da735c4e8d945332b9202f6 -PluginImporter: - serializedVersion: 1 - iconMap: {} - executionOrder: {} - isPreloaded: 0 - platformData: - Any: - enabled: 0 - settings: {} - Editor: - enabled: 1 - settings: - DefaultValueInitialized: true - userData: - assetBundleName: - assetBundleVariant: +guid: 4ad02dc83da735c4e8d945332b9202f6 diff --git a/UnityTests.Unity5/Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll b/UnityTests.Unity5/Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll index d80335c..e9018e2 100644 Binary files a/UnityTests.Unity5/Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll and b/UnityTests.Unity5/Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll differ diff --git a/UnityTests.Unity5/Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll.meta b/UnityTests.Unity5/Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll.meta index 02282e3..1378fd7 100644 --- a/UnityTests.Unity5/Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll.meta +++ b/UnityTests.Unity5/Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 42c12149efdc035458bffa42058b9a04 -timeCreated: 1437676366 +timeCreated: 1439628452 licenseType: Free PluginImporter: serializedVersion: 1 diff --git a/UnityTests.Unity5/Assets/_DOTween Examples/CircleOutline.png b/UnityTests.Unity5/Assets/_DOTween Examples/CircleOutline.png new file mode 100644 index 0000000..55960d4 Binary files /dev/null and b/UnityTests.Unity5/Assets/_DOTween Examples/CircleOutline.png differ diff --git a/UnityTests.Unity5/Assets/_DOTween Examples/CircleOutline.png.meta b/UnityTests.Unity5/Assets/_DOTween Examples/CircleOutline.png.meta new file mode 100644 index 0000000..6bcc3c5 --- /dev/null +++ b/UnityTests.Unity5/Assets/_DOTween Examples/CircleOutline.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: 54f6835bb459b894d842dc386533f7e3 +timeCreated: 1440235341 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -3 + maxTextureSize: 128 + textureSettings: + filterMode: 1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 1 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/_DOTween Examples/FollowTarget.cs b/UnityTests.Unity5/Assets/_DOTween Examples/FollowTarget.cs new file mode 100644 index 0000000..ea4439a --- /dev/null +++ b/UnityTests.Unity5/Assets/_DOTween Examples/FollowTarget.cs @@ -0,0 +1,26 @@ +using UnityEngine; +using System.Collections; +using DG.Tweening; + +public class FollowTarget : MonoBehaviour +{ + public Transform targetToFollow; + public Transform follower; + + Vector3 prevTargetPos; + Tweener followTween; + + void Start() + { + prevTargetPos = targetToFollow.position; + followTween = follower.DOMoveX(targetToFollow.position.x, 2).SetAutoKill(false); + } + + void Update() + { + if (prevTargetPos != targetToFollow.position) { + prevTargetPos = targetToFollow.position; + followTween.ChangeEndValue(targetToFollow.position, 2, true).Restart(); + } + } +} \ No newline at end of file diff --git a/UnityTests.Unity5/Assets/_DOTween Examples/FollowTarget.cs.meta b/UnityTests.Unity5/Assets/_DOTween Examples/FollowTarget.cs.meta new file mode 100644 index 0000000..17ab218 --- /dev/null +++ b/UnityTests.Unity5/Assets/_DOTween Examples/FollowTarget.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: ffddcdd89d0eb1644be5e54193fca561 +timeCreated: 1440148479 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/_DOTween Examples/FollowTarget.unity b/UnityTests.Unity5/Assets/_DOTween Examples/FollowTarget.unity new file mode 100644 index 0000000..a2aaff6 Binary files /dev/null and b/UnityTests.Unity5/Assets/_DOTween Examples/FollowTarget.unity differ diff --git a/UnityTests.Unity5/Assets/_DOTween Examples/FollowTarget.unity.meta b/UnityTests.Unity5/Assets/_DOTween Examples/FollowTarget.unity.meta new file mode 100644 index 0000000..6d2ab1b --- /dev/null +++ b/UnityTests.Unity5/Assets/_DOTween Examples/FollowTarget.unity.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ee8fd0a0eaa551541be3af0385bff84f +timeCreated: 1440148474 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/_DOTween Examples/FollowTargetUntilReached.cs b/UnityTests.Unity5/Assets/_DOTween Examples/FollowTargetUntilReached.cs new file mode 100644 index 0000000..6b8faf8 --- /dev/null +++ b/UnityTests.Unity5/Assets/_DOTween Examples/FollowTargetUntilReached.cs @@ -0,0 +1,25 @@ +using UnityEngine; +using System.Collections; +using DG.Tweening; + +public class FollowTargetUntilReached : MonoBehaviour +{ + public Transform targetToFollow; + public Transform follower; + + void Start() + { + // Create tween and use OnUpdate to follow that target. + // In this case, when the target is reached the tween will be + // automatically killed and the following will stop + Vector3 prevTargetPos = targetToFollow.position; + Tweener followTween = follower.DOMove(targetToFollow.position, 2); + followTween.OnUpdate(()=> { + if (prevTargetPos != targetToFollow.position) { + prevTargetPos = targetToFollow.position; + followTween.ChangeEndValue(targetToFollow.position, 2, true).Restart(); + } + }); + followTween.OnComplete(()=> Debug.Log("Target reached and tween killed")); + } +} \ No newline at end of file diff --git a/UnityTests.Unity5/Assets/_DOTween Examples/FollowTargetUntilReached.cs.meta b/UnityTests.Unity5/Assets/_DOTween Examples/FollowTargetUntilReached.cs.meta new file mode 100644 index 0000000..18b1895 --- /dev/null +++ b/UnityTests.Unity5/Assets/_DOTween Examples/FollowTargetUntilReached.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 574f167fa9e36b54a970e5c00597e8c0 +timeCreated: 1440234949 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/_DOTween Examples/FollowTargetUntilReached.unity b/UnityTests.Unity5/Assets/_DOTween Examples/FollowTargetUntilReached.unity new file mode 100644 index 0000000..2cec7f6 Binary files /dev/null and b/UnityTests.Unity5/Assets/_DOTween Examples/FollowTargetUntilReached.unity differ diff --git a/UnityTests.Unity5/Assets/_DOTween Examples/FollowTargetUntilReached.unity.meta b/UnityTests.Unity5/Assets/_DOTween Examples/FollowTargetUntilReached.unity.meta new file mode 100644 index 0000000..cb76a5a --- /dev/null +++ b/UnityTests.Unity5/Assets/_DOTween Examples/FollowTargetUntilReached.unity.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 42bbd4570313d7f41bc44618520dc7f3 +timeCreated: 1440234943 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/_DOTween Examples/UIFillAmount.cs b/UnityTests.Unity5/Assets/_DOTween Examples/UIFillAmount.cs new file mode 100644 index 0000000..af631a1 --- /dev/null +++ b/UnityTests.Unity5/Assets/_DOTween Examples/UIFillAmount.cs @@ -0,0 +1,15 @@ +using UnityEngine; +using System.Collections; +using UnityEngine.UI; +using DG.Tweening; + +public class UIFillAmount : MonoBehaviour +{ + public Image fillImage; + public float tweenTime = 2; + + void Start() + { + fillImage.DOFillAmount(0, tweenTime).SetLoops(-1, LoopType.Yoyo); + } +} \ No newline at end of file diff --git a/UnityTests.Unity5/Assets/_DOTween Examples/UIFillAmount.cs.meta b/UnityTests.Unity5/Assets/_DOTween Examples/UIFillAmount.cs.meta new file mode 100644 index 0000000..effd609 --- /dev/null +++ b/UnityTests.Unity5/Assets/_DOTween Examples/UIFillAmount.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 441241a910a18564dae53506686e077e +timeCreated: 1440235390 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/_DOTween Examples/UIFillAmount.unity b/UnityTests.Unity5/Assets/_DOTween Examples/UIFillAmount.unity new file mode 100644 index 0000000..b3b3a1b Binary files /dev/null and b/UnityTests.Unity5/Assets/_DOTween Examples/UIFillAmount.unity differ diff --git a/UnityTests.Unity5/Assets/_DOTween Examples/UIFillAmount.unity.meta b/UnityTests.Unity5/Assets/_DOTween Examples/UIFillAmount.unity.meta new file mode 100644 index 0000000..63a7d2e --- /dev/null +++ b/UnityTests.Unity5/Assets/_DOTween Examples/UIFillAmount.unity.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fdcfe2995d378c4458cd11a6b695335a +timeCreated: 1440235330 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/_Tests PRO/AnimationEditor.unity b/UnityTests.Unity5/Assets/_Tests PRO/AnimationEditor.unity index 47418cb..af9c3a7 100644 Binary files a/UnityTests.Unity5/Assets/_Tests PRO/AnimationEditor.unity and b/UnityTests.Unity5/Assets/_Tests PRO/AnimationEditor.unity differ diff --git a/UnityTests.Unity5/Assets/_Tests PRO/TempPro.unity b/UnityTests.Unity5/Assets/_Tests PRO/TempPro.unity index 57b3c64..49599f5 100644 Binary files a/UnityTests.Unity5/Assets/_Tests PRO/TempPro.unity and b/UnityTests.Unity5/Assets/_Tests PRO/TempPro.unity differ diff --git a/UnityTests.Unity5/Assets/_Tests/TempTests.cs b/UnityTests.Unity5/Assets/_Tests/TempTests.cs index 2ed17e5..afe2b68 100644 --- a/UnityTests.Unity5/Assets/_Tests/TempTests.cs +++ b/UnityTests.Unity5/Assets/_Tests/TempTests.cs @@ -10,17 +10,16 @@ using UnityEngine.UI; public class TempTests : BrainBase { public Transform target; - Tween tween; void Start() { - tween = target.DOMoveX(2, 1).SetAutoKill(false).OnPlay(()=> Debug.Log("Play")); - } + float delay = 0.15f; + Sequence seq = DOTween.Sequence(); + seq.Insert(delay, target.DOMoveX(0.5f, 0.5f).OnComplete(() => { + Debug.Log("Doesn't work"); + })); + seq.OnComplete(()=> Debug.Log("Works")); - void OnGUI() - { - if (GUILayout.Button("Restart")) tween.Restart(); - if (GUILayout.Button("Flip")) tween.Flip(); - if (GUILayout.Button("TogglePause")) tween.TogglePause(); + target.DORotate (new Vector3 (1, 2, 1), 2); } } \ No newline at end of file diff --git a/UnityTests.Unity5/Assets/_Tests/TempTests.unity b/UnityTests.Unity5/Assets/_Tests/TempTests.unity index 0b0313b..4423665 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 157d070..80a5a9a 100644 --- a/_DOTween.Assembly/DOTween/DOTween.cs +++ b/_DOTween.Assembly/DOTween/DOTween.cs @@ -32,7 +32,7 @@ namespace DG.Tweening public class DOTween { /// DOTween's version - public static readonly string Version = "1.0.815"; + public static readonly string Version = "1.0.820"; /////////////////////////////////////////////// // Options //////////////////////////////////// diff --git a/_DOTween.Assembly/DOTween/ShortcutExtensions.cs b/_DOTween.Assembly/DOTween/ShortcutExtensions.cs index 03aa289..31e2f50 100644 --- a/_DOTween.Assembly/DOTween/ShortcutExtensions.cs +++ b/_DOTween.Assembly/DOTween/ShortcutExtensions.cs @@ -1140,6 +1140,18 @@ namespace DG.Tweening { return DOTween.Complete(target, withCallbacks); } + /// + /// Completes all tweens that have this target as a reference + /// (meaning tweens that were started from this target, or that had this target added as an Id) + /// and returns the total number of tweens completed + /// (meaning the tweens that don't have infinite loops and were not already complete) + /// + /// For Sequences only: if TRUE also internal Sequence callbacks will be fired, + /// otherwise they will be ignored + public static int DOComplete(this Material target, bool withCallbacks = false) + { + return DOTween.Complete(target, withCallbacks); + } /// /// Kills all tweens that have this target as a reference @@ -1153,6 +1165,16 @@ namespace DG.Tweening // return tot + DOTween.Kill(target); return DOTween.Kill(target, complete); } + /// + /// Kills all tweens that have this target as a reference + /// (meaning tweens that were started from this target, or that had this target added as an Id) + /// and returns the total number of tweens killed. + /// + /// If TRUE completes the tween before killing it + public static int DOKill(this Material target, bool complete = false) + { + return DOTween.Kill(target, complete); + } /// /// Flips the direction (backwards if it was going forward or viceversa) of all tweens that have this target as a reference @@ -1163,6 +1185,15 @@ namespace DG.Tweening { return DOTween.Flip(target); } + /// + /// Flips the direction (backwards if it was going forward or viceversa) of all tweens that have this target as a reference + /// (meaning tweens that were started from this target, or that had this target added as an Id) + /// and returns the total number of tweens flipped. + /// + public static int DOFlip(this Material target) + { + return DOTween.Flip(target); + } /// /// Sends to the given position all tweens that have this target as a reference @@ -1176,6 +1207,18 @@ namespace DG.Tweening { return DOTween.Goto(target, to, andPlay); } + /// + /// Sends to the given position all tweens that have this target as a reference + /// (meaning tweens that were started from this target, or that had this target added as an Id) + /// and returns the total number of tweens involved. + /// + /// Time position to reach + /// (if higher than the whole tween duration the tween will simply reach its end) + /// If TRUE will play the tween after reaching the given position, otherwise it will pause it + public static int DOGoto(this Material target, float to, bool andPlay = false) + { + return DOTween.Goto(target, to, andPlay); + } /// /// Pauses all tweens that have this target as a reference @@ -1186,6 +1229,15 @@ namespace DG.Tweening { return DOTween.Pause(target); } + /// + /// Pauses all tweens that have this target as a reference + /// (meaning tweens that were started from this target, or that had this target added as an Id) + /// and returns the total number of tweens paused. + /// + public static int DOPause(this Material target) + { + return DOTween.Pause(target); + } /// /// Plays all tweens that have this target as a reference @@ -1196,6 +1248,15 @@ namespace DG.Tweening { return DOTween.Play(target); } + /// + /// Plays all tweens that have this target as a reference + /// (meaning tweens that were started from this target, or that had this target added as an Id) + /// and returns the total number of tweens played. + /// + public static int DOPlay(this Material target) + { + return DOTween.Play(target); + } /// /// Plays backwards all tweens that have this target as a reference @@ -1206,6 +1267,15 @@ namespace DG.Tweening { return DOTween.PlayBackwards(target); } + /// + /// Plays backwards all tweens that have this target as a reference + /// (meaning tweens that were started from this target, or that had this target added as an Id) + /// and returns the total number of tweens played. + /// + public static int DOPlayBackwards(this Material target) + { + return DOTween.PlayBackwards(target); + } /// /// Plays forward all tweens that have this target as a reference @@ -1216,6 +1286,15 @@ namespace DG.Tweening { return DOTween.PlayForward(target); } + /// + /// Plays forward all tweens that have this target as a reference + /// (meaning tweens that were started from this target, or that had this target added as an Id) + /// and returns the total number of tweens played. + /// + public static int DOPlayForward(this Material target) + { + return DOTween.PlayForward(target); + } /// /// Restarts all tweens that have this target as a reference @@ -1226,6 +1305,15 @@ namespace DG.Tweening { return DOTween.Restart(target, includeDelay); } + /// + /// Restarts all tweens that have this target as a reference + /// (meaning tweens that were started from this target, or that had this target added as an Id) + /// and returns the total number of tweens restarted. + /// + public static int DORestart(this Material target, bool includeDelay = true) + { + return DOTween.Restart(target, includeDelay); + } /// /// Rewinds all tweens that have this target as a reference @@ -1236,6 +1324,15 @@ namespace DG.Tweening { return DOTween.Rewind(target, includeDelay); } + /// + /// Rewinds all tweens that have this target as a reference + /// (meaning tweens that were started from this target, or that had this target added as an Id) + /// and returns the total number of tweens rewinded. + /// + public static int DORewind(this Material target, bool includeDelay = true) + { + return DOTween.Rewind(target, includeDelay); + } /// /// Smoothly rewinds all tweens that have this target as a reference @@ -1246,6 +1343,15 @@ namespace DG.Tweening { return DOTween.SmoothRewind(target); } + /// + /// Smoothly rewinds all tweens that have this target as a reference + /// (meaning tweens that were started from this target, or that had this target added as an Id) + /// and returns the total number of tweens rewinded. + /// + public static int DOSmoothRewind(this Material target) + { + return DOTween.SmoothRewind(target); + } /// /// Toggles the paused state (plays if it was paused, pauses if it was playing) of all tweens that have this target as a reference @@ -1256,6 +1362,15 @@ namespace DG.Tweening { return DOTween.TogglePause(target); } + /// + /// Toggles the paused state (plays if it was paused, pauses if it was playing) of all tweens that have this target as a reference + /// (meaning tweens that were started from this target, or that had this target added as an Id) + /// and returns the total number of tweens involved. + /// + public static int DOTogglePause(this Material target) + { + return DOTween.TogglePause(target); + } #endregion } diff --git a/_DOTween.Assembly/bin/DOTween.XML b/_DOTween.Assembly/bin/DOTween.XML index 35dc374..acf3900 100644 --- a/_DOTween.Assembly/bin/DOTween.XML +++ b/_DOTween.Assembly/bin/DOTween.XML @@ -1636,6 +1636,16 @@ For Sequences only: if TRUE also internal Sequence callbacks will be fired, otherwise they will be ignored + + + Completes all tweens that have this target as a reference + (meaning tweens that were started from this target, or that had this target added as an Id) + and returns the total number of tweens completed + (meaning the tweens that don't have infinite loops and were not already complete) + + For Sequences only: if TRUE also internal Sequence callbacks will be fired, + otherwise they will be ignored + Kills all tweens that have this target as a reference @@ -1644,6 +1654,14 @@ If TRUE completes the tween before killing it + + + Kills all tweens that have this target as a reference + (meaning tweens that were started from this target, or that had this target added as an Id) + and returns the total number of tweens killed. + + If TRUE completes the tween before killing it + Flips the direction (backwards if it was going forward or viceversa) of all tweens that have this target as a reference @@ -1651,6 +1669,13 @@ and returns the total number of tweens flipped. + + + Flips the direction (backwards if it was going forward or viceversa) of all tweens that have this target as a reference + (meaning tweens that were started from this target, or that had this target added as an Id) + and returns the total number of tweens flipped. + + Sends to the given position all tweens that have this target as a reference @@ -1661,6 +1686,16 @@ (if higher than the whole tween duration the tween will simply reach its end) If TRUE will play the tween after reaching the given position, otherwise it will pause it + + + Sends to the given position all tweens that have this target as a reference + (meaning tweens that were started from this target, or that had this target added as an Id) + and returns the total number of tweens involved. + + Time position to reach + (if higher than the whole tween duration the tween will simply reach its end) + If TRUE will play the tween after reaching the given position, otherwise it will pause it + Pauses all tweens that have this target as a reference @@ -1668,6 +1703,13 @@ and returns the total number of tweens paused. + + + Pauses all tweens that have this target as a reference + (meaning tweens that were started from this target, or that had this target added as an Id) + and returns the total number of tweens paused. + + Plays all tweens that have this target as a reference @@ -1675,6 +1717,13 @@ and returns the total number of tweens played. + + + Plays all tweens that have this target as a reference + (meaning tweens that were started from this target, or that had this target added as an Id) + and returns the total number of tweens played. + + Plays backwards all tweens that have this target as a reference @@ -1682,6 +1731,13 @@ and returns the total number of tweens played. + + + Plays backwards all tweens that have this target as a reference + (meaning tweens that were started from this target, or that had this target added as an Id) + and returns the total number of tweens played. + + Plays forward all tweens that have this target as a reference @@ -1689,6 +1745,13 @@ and returns the total number of tweens played. + + + Plays forward all tweens that have this target as a reference + (meaning tweens that were started from this target, or that had this target added as an Id) + and returns the total number of tweens played. + + Restarts all tweens that have this target as a reference @@ -1696,6 +1759,13 @@ and returns the total number of tweens restarted. + + + Restarts all tweens that have this target as a reference + (meaning tweens that were started from this target, or that had this target added as an Id) + and returns the total number of tweens restarted. + + Rewinds all tweens that have this target as a reference @@ -1703,6 +1773,13 @@ and returns the total number of tweens rewinded. + + + Rewinds all tweens that have this target as a reference + (meaning tweens that were started from this target, or that had this target added as an Id) + and returns the total number of tweens rewinded. + + Smoothly rewinds all tweens that have this target as a reference @@ -1710,6 +1787,13 @@ and returns the total number of tweens rewinded. + + + Smoothly rewinds all tweens that have this target as a reference + (meaning tweens that were started from this target, or that had this target added as an Id) + and returns the total number of tweens rewinded. + + Toggles the paused state (plays if it was paused, pauses if it was playing) of all tweens that have this target as a reference @@ -1717,6 +1801,13 @@ and returns the total number of tweens involved. + + + Toggles the paused state (plays if it was paused, pauses if it was playing) of all tweens that have this target as a reference + (meaning tweens that were started from this target, or that had this target added as an Id) + and returns the total number of tweens involved. + + This class serves only as a utility class to store tween settings to apply on multiple tweens. diff --git a/_DOTween.Assembly/bin/DOTween.dll b/_DOTween.Assembly/bin/DOTween.dll index 35000cd..b4318d5 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 08babe5..0241891 100644 Binary files a/_DOTween.Assembly/bin/DOTween.dll.mdb and b/_DOTween.Assembly/bin/DOTween.dll.mdb differ