diff --git a/.gitignore b/.gitignore index 6ad2fbe..17b2419 100644 --- a/.gitignore +++ b/.gitignore @@ -22,6 +22,8 @@ ExternalPluginsTestsAndExamples* *.Unity*/Assets/Console*Pro* *.Unity*/Assets/Text*Mesh*Pro* *.Unity*/Assets/CodeStage +*.Unity*/Assets/_DOTween Pro Examples +*.Unity*/Assets/_Tests PRO .vs *HOPoolOperator* *HOTools* diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll index d528bd9..c444bff 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 9f0aaea..de9eb47 100644 Binary files a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll.mdb and b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll.mdb differ diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween43.dll b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween43.dll index bc0b498..16d58fb 100644 Binary files a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween43.dll and b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween43.dll differ diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween43.dll.mdb b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween43.dll.mdb index 20fa923..681bedf 100644 Binary files a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween43.dll.mdb and b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween43.dll.mdb differ diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween46.dll b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween46.dll index 0afda14..396dce2 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 c1de725..9daa850 100644 Binary files a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween46.dll.mdb and b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween46.dll.mdb differ diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween50.dll b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween50.dll index f956925..f069ab6 100644 Binary files a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween50.dll and b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween50.dll differ diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween50.dll.mdb b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween50.dll.mdb index 71b2e9a..b0a1570 100644 Binary files a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween50.dll.mdb and b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween50.dll.mdb differ diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll index 90501d7..81d6935 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 4b6cc55..bf3d850 100644 Binary files a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb and b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb differ diff --git a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.dll b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.dll index d528bd9..c444bff 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 9f0aaea..de9eb47 100644 Binary files a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.dll.mdb and b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.dll.mdb differ diff --git a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween43.dll b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween43.dll index bc0b498..16d58fb 100644 Binary files a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween43.dll and b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween43.dll differ diff --git a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween43.dll.mdb b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween43.dll.mdb index 20fa923..681bedf 100644 Binary files a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween43.dll.mdb and b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween43.dll.mdb differ diff --git a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween46.dll b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween46.dll index 0afda14..396dce2 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 c1de725..9daa850 100644 Binary files a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween46.dll.mdb and b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween46.dll.mdb differ diff --git a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween50.dll b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween50.dll index f956925..f069ab6 100644 Binary files a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween50.dll and b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween50.dll differ diff --git a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween50.dll.mdb b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween50.dll.mdb index 71b2e9a..b0a1570 100644 Binary files a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween50.dll.mdb and b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween50.dll.mdb differ diff --git a/UnityTests.Unity4/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll b/UnityTests.Unity4/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll index 90501d7..81d6935 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 4b6cc55..bf3d850 100644 Binary files a/UnityTests.Unity4/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb and b/UnityTests.Unity4/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll index d528bd9..c444bff 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 9f0aaea..de9eb47 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/DOTween43.dll b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween43.dll index bc0b498..16d58fb 100644 Binary files a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween43.dll and b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween43.dll differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween43.dll.mdb b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween43.dll.mdb index 20fa923..681bedf 100644 Binary files a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween43.dll.mdb and b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween43.dll.mdb differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween46.dll b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween46.dll index 0afda14..396dce2 100644 Binary files a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween46.dll and b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween46.dll differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween46.dll.mdb b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween46.dll.mdb index c1de725..9daa850 100644 Binary files a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween46.dll.mdb and b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween46.dll.mdb differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween50.dll b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween50.dll index f956925..f069ab6 100644 Binary files a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween50.dll and b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween50.dll differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween50.dll.mdb b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween50.dll.mdb index 71b2e9a..b0a1570 100644 Binary files a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween50.dll.mdb and b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween50.dll.mdb differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll b/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll index 90501d7..81d6935 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 4b6cc55..bf3d850 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/_DOTween Pro Examples/MAT Sword A.mat b/UnityTests.Unity5/Assets/_DOTween Pro Examples/MAT Sword A.mat deleted file mode 100644 index d004d60..0000000 Binary files a/UnityTests.Unity5/Assets/_DOTween Pro Examples/MAT Sword A.mat and /dev/null differ diff --git a/UnityTests.Unity5/Assets/_DOTween Pro Examples/MAT Sword A.mat.meta b/UnityTests.Unity5/Assets/_DOTween Pro Examples/MAT Sword A.mat.meta deleted file mode 100644 index 023a47f..0000000 --- a/UnityTests.Unity5/Assets/_DOTween Pro Examples/MAT Sword A.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 21910083fa7ddb9418b1f325411856be -timeCreated: 1433157219 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/_DOTween Pro Examples/MAT Sword B.mat b/UnityTests.Unity5/Assets/_DOTween Pro Examples/MAT Sword B.mat deleted file mode 100644 index 331f9d3..0000000 Binary files a/UnityTests.Unity5/Assets/_DOTween Pro Examples/MAT Sword B.mat and /dev/null differ diff --git a/UnityTests.Unity5/Assets/_DOTween Pro Examples/MAT Sword B.mat.meta b/UnityTests.Unity5/Assets/_DOTween Pro Examples/MAT Sword B.mat.meta deleted file mode 100644 index d8f8bc8..0000000 --- a/UnityTests.Unity5/Assets/_DOTween Pro Examples/MAT Sword B.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c9c1c8b84aaadd843ab6ebf98bdd8b71 -timeCreated: 1433157312 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/_DOTween Pro Examples/_LightFade.unity b/UnityTests.Unity5/Assets/_DOTween Pro Examples/_LightFade.unity deleted file mode 100644 index 81e08a5..0000000 Binary files a/UnityTests.Unity5/Assets/_DOTween Pro Examples/_LightFade.unity and /dev/null differ diff --git a/UnityTests.Unity5/Assets/_DOTween Pro Examples/_ObjectShowcase.unity b/UnityTests.Unity5/Assets/_DOTween Pro Examples/_ObjectShowcase.unity deleted file mode 100644 index cecbc1a..0000000 Binary files a/UnityTests.Unity5/Assets/_DOTween Pro Examples/_ObjectShowcase.unity and /dev/null differ diff --git a/UnityTests.Unity5/Assets/_DOTween Pro Examples/_ObjectShowcase.unity.meta b/UnityTests.Unity5/Assets/_DOTween Pro Examples/_ObjectShowcase.unity.meta deleted file mode 100644 index e3adcf7..0000000 --- a/UnityTests.Unity5/Assets/_DOTween Pro Examples/_ObjectShowcase.unity.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 908059918c3382a4fa594291928bae25 -timeCreated: 1433154602 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/_Tests PRO/TempPro.cs b/UnityTests.Unity5/Assets/_Tests PRO/TempPro.cs index 1b2308e..64150e4 100644 --- a/UnityTests.Unity5/Assets/_Tests PRO/TempPro.cs +++ b/UnityTests.Unity5/Assets/_Tests PRO/TempPro.cs @@ -4,20 +4,15 @@ using DG.Tweening; public class TempPro : MonoBehaviour { - public DOTweenAnimation anime; + public Rigidbody2D target; - void Update() + void Start() { - if (Input.GetKeyDown(KeyCode.Space)) anime.DORestart(true); + target.transform.DOScale(2, 1).SetLoops(-1); } - public void OnCreated() + void FixedUpdate() { - Debug.Log("Tween created > " + anime.tween); - } - - public void Output() - { - Debug.Log("HERE"); + target.position += new Vector2(0.03f, 0); } } \ No newline at end of file diff --git a/UnityTests.Unity5/Assets/_Tests PRO/TempPro.unity b/UnityTests.Unity5/Assets/_Tests PRO/TempPro.unity index a4ea6f2..eab10d7 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/Bugs/CaptureFrameRate.cs b/UnityTests.Unity5/Assets/_Tests/Bugs/CaptureFrameRate.cs new file mode 100644 index 0000000..50c10f0 --- /dev/null +++ b/UnityTests.Unity5/Assets/_Tests/Bugs/CaptureFrameRate.cs @@ -0,0 +1,23 @@ +using UnityEngine; +using System.Collections; +using DG.Tweening; + +public class CaptureFrameRate : BrainBase +{ + public bool captureFrameRate = true; + public bool callInit = false; + public Transform target; + + void Start() + { + if (captureFrameRate) Time.captureFramerate = 10; // TOO FAST ANIMATION (1 second) + // if (captureFrameRate) Application.targetFrameRate = 10; // WORKS + + if (callInit) DOTween.Init(); // Fixes fast animation (why?) + + DOTween.defaultTimeScaleIndependent = true; + + float time = Time.realtimeSinceStartup; + target.DOLocalMoveY(-450,5).OnComplete(()=> Debug.Log("> " + (Time.realtimeSinceStartup - time))); + } +} \ No newline at end of file diff --git a/UnityTests.Unity5/Assets/_Tests/Bugs/CaptureFrameRate.cs.meta b/UnityTests.Unity5/Assets/_Tests/Bugs/CaptureFrameRate.cs.meta new file mode 100644 index 0000000..59aa147 --- /dev/null +++ b/UnityTests.Unity5/Assets/_Tests/Bugs/CaptureFrameRate.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 24fdd105e064e4540933dbd78c6411d8 +timeCreated: 1456396885 +licenseType: Pro +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/_Tests/Bugs/CaptureFrameRate.unity b/UnityTests.Unity5/Assets/_Tests/Bugs/CaptureFrameRate.unity new file mode 100644 index 0000000..213eca8 Binary files /dev/null and b/UnityTests.Unity5/Assets/_Tests/Bugs/CaptureFrameRate.unity differ diff --git a/UnityTests.Unity5/Assets/_DOTween Pro Examples/_LightFade.unity.meta b/UnityTests.Unity5/Assets/_Tests/Bugs/CaptureFrameRate.unity.meta similarity index 53% rename from UnityTests.Unity5/Assets/_DOTween Pro Examples/_LightFade.unity.meta rename to UnityTests.Unity5/Assets/_Tests/Bugs/CaptureFrameRate.unity.meta index 30c0ecd..06884ea 100644 --- a/UnityTests.Unity5/Assets/_DOTween Pro Examples/_LightFade.unity.meta +++ b/UnityTests.Unity5/Assets/_Tests/Bugs/CaptureFrameRate.unity.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: ff9f3d81e30130643bf3e3b67c0674b5 -timeCreated: 1442748793 -licenseType: Free +guid: 615ce20fe7ca95a40a13d90fe24063f0 +timeCreated: 1456396874 +licenseType: Pro DefaultImporter: userData: assetBundleName: diff --git a/UnityTests.Unity5/Assets/_Tests/TempTests.cs b/UnityTests.Unity5/Assets/_Tests/TempTests.cs index 0b4f614..15ab98b 100644 --- a/UnityTests.Unity5/Assets/_Tests/TempTests.cs +++ b/UnityTests.Unity5/Assets/_Tests/TempTests.cs @@ -11,15 +11,30 @@ using UnityEngine.UI; public class TempTests : BrainBase { public Transform target; + public float InitialDelay = 1; + public float ExpandDelay = 2; + public float ExpandSpeed = 0.1f; + public float RetractDelay = 2; + public float RetractSpeed = 2; - IEnumerator Start() + float time; + + Sequence s; + // Use this for initialization + void Start () { - Tween t = target.DOMoveX(2, 1).OnPlay(()=>Debug.Log("PLAY")).SetAutoKill(false); - t.SetDelay(1); + time = Time.realtimeSinceStartup; - yield return new WaitForSeconds(2.5f); + s = DOTween.Sequence(); + s.Append(target.DOMove(target.position + new Vector3(0, 0.1f, 0),0.1f).SetDelay(InitialDelay)); + s.Append(target.DOMove(target.position + new Vector3(0, 1, 0), ExpandSpeed).SetDelay(ExpandDelay)); + s.Append(target.DOMove(target.position - new Vector3(0, 1.1f, 0), RetractSpeed).SetDelay(RetractDelay)); + s.SetLoops(-1, LoopType.Restart).OnStepComplete(Step); + } - t.Rewind(); - t.Play(); + void Step() + { + Debug.Log(Time.realtimeSinceStartup - time); + time = Time.realtimeSinceStartup; } } \ No newline at end of file diff --git a/UnityTests.Unity5/Assets/_Tests/TempTests.unity b/UnityTests.Unity5/Assets/_Tests/TempTests.unity index 247a671..5839cc9 100644 Binary files a/UnityTests.Unity5/Assets/_Tests/TempTests.unity and b/UnityTests.Unity5/Assets/_Tests/TempTests.unity differ diff --git a/UnityTests.Unity5/ProjectSettings/GraphicsSettings.asset b/UnityTests.Unity5/ProjectSettings/GraphicsSettings.asset index c5dd1f2..7c0ac3c 100644 Binary files a/UnityTests.Unity5/ProjectSettings/GraphicsSettings.asset and b/UnityTests.Unity5/ProjectSettings/GraphicsSettings.asset differ diff --git a/UnityTests.Unity5/ProjectSettings/ProjectSettings.asset b/UnityTests.Unity5/ProjectSettings/ProjectSettings.asset index ed088b3..2382e91 100644 Binary files a/UnityTests.Unity5/ProjectSettings/ProjectSettings.asset and b/UnityTests.Unity5/ProjectSettings/ProjectSettings.asset differ diff --git a/UnityTests.Unity5/ProjectSettings/ProjectVersion.txt b/UnityTests.Unity5/ProjectSettings/ProjectVersion.txt index 961ebb9..bb60c06 100644 --- a/UnityTests.Unity5/ProjectSettings/ProjectVersion.txt +++ b/UnityTests.Unity5/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 5.3.1f1 +m_EditorVersion: 5.3.2f1 m_StandardAssetsVersion: 0 diff --git a/_DOTween.Assembly/DOTween/DOTween.cs b/_DOTween.Assembly/DOTween/DOTween.cs index b3fe382..ecbeac1 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.1.165"; + public static readonly string Version = "1.1.180"; /////////////////////////////////////////////// // Options //////////////////////////////////// diff --git a/_DOTween.Assembly/DOTweenEditor/DOTweenInspector.cs b/_DOTween.Assembly/DOTweenEditor/DOTweenInspector.cs index d2c4459..99edd12 100644 --- a/_DOTween.Assembly/DOTweenEditor/DOTweenInspector.cs +++ b/_DOTween.Assembly/DOTweenEditor/DOTweenInspector.cs @@ -60,6 +60,11 @@ namespace DG.DOTweenEditor if (GUILayout.Button(_showPlayingTweensData ? "Hide Playing Tweens" : "Show Playing Tweens")) _showPlayingTweensData = !_showPlayingTweensData; if (GUILayout.Button(_showPausedTweensData ? "Hide Paused Tweens" : "Show Paused Tweens")) _showPausedTweensData = !_showPausedTweensData; GUILayout.EndHorizontal(); + GUILayout.BeginHorizontal(); + if (GUILayout.Button("Play all")) DOTween.PlayAll(); + if (GUILayout.Button("Pause all")) DOTween.PauseAll(); + if (GUILayout.Button("Kill all")) DOTween.KillAll(); + GUILayout.EndHorizontal(); GUILayout.Space(8); _strBuilder.Length = 0; diff --git a/_DOTween.Assembly/bin/DOTween.dll b/_DOTween.Assembly/bin/DOTween.dll index d528bd9..c444bff 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 9f0aaea..de9eb47 100644 Binary files a/_DOTween.Assembly/bin/DOTween.dll.mdb and b/_DOTween.Assembly/bin/DOTween.dll.mdb differ diff --git a/_DOTween.Assembly/bin/DOTween43.dll b/_DOTween.Assembly/bin/DOTween43.dll index bc0b498..16d58fb 100644 Binary files a/_DOTween.Assembly/bin/DOTween43.dll and b/_DOTween.Assembly/bin/DOTween43.dll differ diff --git a/_DOTween.Assembly/bin/DOTween43.dll.mdb b/_DOTween.Assembly/bin/DOTween43.dll.mdb index 20fa923..681bedf 100644 Binary files a/_DOTween.Assembly/bin/DOTween43.dll.mdb and b/_DOTween.Assembly/bin/DOTween43.dll.mdb differ diff --git a/_DOTween.Assembly/bin/DOTween46.dll b/_DOTween.Assembly/bin/DOTween46.dll index 0afda14..396dce2 100644 Binary files a/_DOTween.Assembly/bin/DOTween46.dll and b/_DOTween.Assembly/bin/DOTween46.dll differ diff --git a/_DOTween.Assembly/bin/DOTween46.dll.mdb b/_DOTween.Assembly/bin/DOTween46.dll.mdb index c1de725..9daa850 100644 Binary files a/_DOTween.Assembly/bin/DOTween46.dll.mdb and b/_DOTween.Assembly/bin/DOTween46.dll.mdb differ diff --git a/_DOTween.Assembly/bin/DOTween50.dll b/_DOTween.Assembly/bin/DOTween50.dll index f956925..f069ab6 100644 Binary files a/_DOTween.Assembly/bin/DOTween50.dll and b/_DOTween.Assembly/bin/DOTween50.dll differ diff --git a/_DOTween.Assembly/bin/DOTween50.dll.mdb b/_DOTween.Assembly/bin/DOTween50.dll.mdb index 71b2e9a..b0a1570 100644 Binary files a/_DOTween.Assembly/bin/DOTween50.dll.mdb and b/_DOTween.Assembly/bin/DOTween50.dll.mdb differ diff --git a/_DOTween.Assembly/bin/Editor/DOTweenEditor.dll b/_DOTween.Assembly/bin/Editor/DOTweenEditor.dll index 90501d7..81d6935 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 4b6cc55..bf3d850 100644 Binary files a/_DOTween.Assembly/bin/Editor/DOTweenEditor.dll.mdb and b/_DOTween.Assembly/bin/Editor/DOTweenEditor.dll.mdb differ