diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll index 965106e..e810a82 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 a37ca24..c29efd4 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 4970969..4dd3217 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 0934e92..7b17117 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/DemiLib/Core/Editor/Imgs/whiteSquare.png.meta b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/whiteSquare.png.meta index e219c74..1aebd5e 100644 --- a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/whiteSquare.png.meta +++ b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/whiteSquare.png.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: d3e15b806a8368742ba6f10e794d7b76 -timeCreated: 1533212723 +timeCreated: 1533742575 licenseType: Pro TextureImporter: fileIDToRecycleName: {} diff --git a/UnityTests.Unity5/Assets/_Tests PRO/AnimationEditor.unity b/UnityTests.Unity5/Assets/_Tests PRO/AnimationEditor.unity index 0e02fff..f9d876e 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/AnimationEditor_TempTests.unity b/UnityTests.Unity5/Assets/_Tests PRO/AnimationEditor_TempTests.unity index 9bdafa3..4039759 100644 Binary files a/UnityTests.Unity5/Assets/_Tests PRO/AnimationEditor_TempTests.unity and b/UnityTests.Unity5/Assets/_Tests PRO/AnimationEditor_TempTests.unity differ diff --git a/UnityTests.Unity5/Assets/_Tests PRO/TempPro.unity b/UnityTests.Unity5/Assets/_Tests PRO/TempPro.unity index 7abf9d4..a820515 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/_Shared Materials/Diffuse MAT 00.mat b/UnityTests.Unity5/Assets/_Tests/_Shared Materials/Diffuse MAT 00.mat index f726031..4ecca5f 100644 Binary files a/UnityTests.Unity5/Assets/_Tests/_Shared Materials/Diffuse MAT 00.mat and b/UnityTests.Unity5/Assets/_Tests/_Shared Materials/Diffuse MAT 00.mat differ diff --git a/_DOTween.Assembly/DOTween/DOTween.cs b/_DOTween.Assembly/DOTween/DOTween.cs index e026ba7..a6789c1 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.2.075"; // Last version before modules: 1.1.755 + public static readonly string Version = "1.2.080"; // Last version before modules: 1.1.755 /////////////////////////////////////////////// // Options //////////////////////////////////// @@ -264,7 +264,10 @@ namespace DG.Tweening public static void ManualUpdate(float deltaTime, float unscaledDeltaTime) { InitCheck(); - instance.ManualUpdate(deltaTime, unscaledDeltaTime); +// instance.ManualUpdate(deltaTime, unscaledDeltaTime); + if (TweenManager.hasActiveManualTweens) { + TweenManager.Update(UpdateType.Manual, deltaTime * DOTween.timeScale, unscaledDeltaTime * DOTween.timeScale); + } } #endregion diff --git a/_DOTween.Assembly/DOTween_LooseScripts/DOTween_LooseScripts.csproj b/_DOTween.Assembly/DOTween_LooseScripts/DOTween_LooseScripts.csproj index e1f503d..6909350 100644 --- a/_DOTween.Assembly/DOTween_LooseScripts/DOTween_LooseScripts.csproj +++ b/_DOTween.Assembly/DOTween_LooseScripts/DOTween_LooseScripts.csproj @@ -30,7 +30,7 @@ pdbonly true ..\bin\ - TRACE;UNITY_4_3;UNITY_4_6;UNITY_5;UNITY_2017_1_OR_NEWER + TRACE;UNITY_EDITOR;UNITY_4_3;UNITY_4_6;UNITY_5;UNITY_2017_1_OR_NEWER prompt 4 @@ -80,8 +80,11 @@ bin_pro\%(FileName) - - bin_pro\Editor\%(FileName) + + bin_pro\Editor\DOTweenAnimationInspector + + + bin_pro\Editor\DOTweenPreviewManager diff --git a/_DOTween.Assembly/bin/DOTween.dll b/_DOTween.Assembly/bin/DOTween.dll index 965106e..e810a82 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 a37ca24..c29efd4 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 4970969..4dd3217 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 0934e92..7b17117 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 0752d27..6137ba4 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 f5883c2..ab3cd6f 100644 Binary files a/_DOTween.Assembly/bin/Editor/DOTweenUpgradeManager.dll.mdb and b/_DOTween.Assembly/bin/Editor/DOTweenUpgradeManager.dll.mdb differ