diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.XML b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.XML index 182fd94..a384e21 100644 --- a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.XML +++ b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.XML @@ -781,12 +781,12 @@ - Returns the a point on a path (returns Vector3.zero if this is not a path tween, if the tween is invalid, or if the path is not yet initialized), - based on the given path percentage (0 to 1). + Returns a point on a path based on the given path percentage + (returns Vector3.zero if this is not a path tween, if the tween is invalid, or if the path is not yet initialized) A path is initialized after its tween starts, or immediately if the tween was created with the Path Editor (DOTween Pro feature). You can force a path to be initialized by calling myTween.ForceInit(). - Percentage of the path on which to get the point (0 to 1) + Percentage of the path (0 to 1) on which to get the point diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll index 5735f45..dd5e4ff 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 c293f30..df0c061 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 9bf3c6d..4163591 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 f2229d1..a404944 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 177d991..132944b 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 edc631e..0452ad2 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 b6df304..1997a78 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 3cef842..351408d 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.XML b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/Editor/DOTweenEditor.XML index 09c788c..db17f44 100644 --- a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/Editor/DOTweenEditor.XML +++ b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/Editor/DOTweenEditor.XML @@ -56,5 +56,10 @@ 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 + + diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll index 2686468..4bb6ac1 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 f9f85c1..d7805a8 100644 Binary files a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb and b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb differ diff --git a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.XML b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.XML index 182fd94..a384e21 100644 --- a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.XML +++ b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.XML @@ -781,12 +781,12 @@ - Returns the a point on a path (returns Vector3.zero if this is not a path tween, if the tween is invalid, or if the path is not yet initialized), - based on the given path percentage (0 to 1). + Returns a point on a path based on the given path percentage + (returns Vector3.zero if this is not a path tween, if the tween is invalid, or if the path is not yet initialized) A path is initialized after its tween starts, or immediately if the tween was created with the Path Editor (DOTween Pro feature). You can force a path to be initialized by calling myTween.ForceInit(). - Percentage of the path on which to get the point (0 to 1) + Percentage of the path (0 to 1) on which to get the point diff --git a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.dll b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.dll index 5735f45..dd5e4ff 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 c293f30..df0c061 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 9bf3c6d..4163591 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 f2229d1..a404944 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 177d991..132944b 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 edc631e..0452ad2 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 b6df304..1997a78 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 3cef842..351408d 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.XML b/UnityTests.Unity4/Assets/Demigiant/DOTween/Editor/DOTweenEditor.XML index 09c788c..db17f44 100644 --- a/UnityTests.Unity4/Assets/Demigiant/DOTween/Editor/DOTweenEditor.XML +++ b/UnityTests.Unity4/Assets/Demigiant/DOTween/Editor/DOTweenEditor.XML @@ -56,5 +56,10 @@ 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 + + diff --git a/UnityTests.Unity4/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll b/UnityTests.Unity4/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll index 2686468..4bb6ac1 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 f9f85c1..d7805a8 100644 Binary files a/UnityTests.Unity4/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb and b/UnityTests.Unity4/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.XML b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.XML index 182fd94..a384e21 100644 --- a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.XML +++ b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.XML @@ -781,12 +781,12 @@ - Returns the a point on a path (returns Vector3.zero if this is not a path tween, if the tween is invalid, or if the path is not yet initialized), - based on the given path percentage (0 to 1). + Returns a point on a path based on the given path percentage + (returns Vector3.zero if this is not a path tween, if the tween is invalid, or if the path is not yet initialized) A path is initialized after its tween starts, or immediately if the tween was created with the Path Editor (DOTween Pro feature). You can force a path to be initialized by calling myTween.ForceInit(). - Percentage of the path on which to get the point (0 to 1) + Percentage of the path (0 to 1) on which to get the point diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll index 5735f45..dd5e4ff 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 c293f30..df0c061 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 9bf3c6d..4163591 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 f2229d1..a404944 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 177d991..132944b 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 edc631e..0452ad2 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 b6df304..1997a78 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 3cef842..351408d 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.XML b/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.XML index 09c788c..db17f44 100644 --- a/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.XML +++ b/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.XML @@ -56,5 +56,10 @@ 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 + + diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll b/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll index 2686468..4bb6ac1 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 f9f85c1..d7805a8 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/DemiLib.dll b/UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiLib.dll index 05b4480..3a48e9e 100644 Binary files a/UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiLib.dll and b/UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiLib.dll differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiLib.dll.mdb b/UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiLib.dll.mdb index 81cd117..93c52c6 100644 Binary files a/UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiLib.dll.mdb and b/UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiLib.dll.mdb differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiLib.xml b/UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiLib.xml index 6be7a2d..e24daa9 100644 --- a/UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiLib.xml +++ b/UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiLib.xml @@ -4,10 +4,9 @@ DemiLib - + - Contains both free and pro skins color variations, - and automatically returns the correct one when converted to Color + Set when calling DeGUIManage.BeginGUI @@ -27,9 +26,10 @@ Content colors - + - Set when calling DeGUIManage.BeginGUI + Contains both free and pro skins color variations, + and automatically returns the correct one when converted to Color diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditor.XML b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditor.XML index e26d856..a0ed45e 100644 --- a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditor.XML +++ b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditor.XML @@ -4,6 +4,16 @@ DemiEditor + + + Texture extensions + + + + + Checks that the texture uses the correct import settings, and applies them if they're incorrect. + + Global Demigiant GUI manager @@ -36,6 +46,31 @@ (or resets them to the default ones if NULL) + + + Assembly extensions + + + + AssetDatabase path to the assembly directory, without final slash + + + + File utils + + + + Path slash for AssetDatabase format + + + Path slash to replace for AssetDatabase format + + + Current OS path slash + + + Path slash to replace on current OS + Stores a GUIStyle palette, which can be passed to default DeGUI layouts when calling DeGUI.BeginGUI, @@ -134,6 +169,16 @@ Sets the margin of the style + + + Sets the left margin of the style + + + + + Sets the right margin of the style + + Sets the top margin of the style @@ -194,23 +239,6 @@ Sets the stretchWidth property of the style - - - File utils - - - - Path slash for AssetDatabase format - - - Path slash to replace for AssetDatabase format - - - Current OS path slash - - - Path slash to replace on current OS - GUILayout methods @@ -229,6 +257,9 @@ Button that can be toggled on and off Button that can be toggled on and off + + Toolbar foldout button + Button that can be toggled on and off @@ -281,25 +312,22 @@ A toolbar with a label + + Vertical box layout with style and color options + + + Vertical box layout with style and color options + + + End vertical box layout + Divider - + - Assembly extensions - - - - AssetDatabase path to the assembly, without final slash - - - - Texture extensions - - - - - Checks that the texture uses the correct import settings, and applies them if they're incorrect. + Contains both free and pro skins GUIStyle variations, + and automatically returns the correct one when converted to GUIStyle diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditor.dll b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditor.dll index 5b34d2c..0f66111 100644 Binary files a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditor.dll and b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditor.dll differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditor.dll.mdb b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditor.dll.mdb index 4c4389d..d34cac3 100644 Binary files a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditor.dll.mdb and b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditor.dll.mdb differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/Imgs/whiteSquareAlpha25.png b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/Imgs/whiteSquareAlpha25.png index 4da5e1e..5219f2a 100644 Binary files a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/Imgs/whiteSquareAlpha25.png and b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/Imgs/whiteSquareAlpha25.png differ diff --git a/_DOTween.Assembly/DOTween/DOTween.cs b/_DOTween.Assembly/DOTween/DOTween.cs index bf1a282..eb9b6fc 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.665"; + public static readonly string Version = "1.0.675"; /////////////////////////////////////////////// // Options //////////////////////////////////// diff --git a/_DOTween.Assembly/DOTweenEditor/Core/EditorUtils.cs b/_DOTween.Assembly/DOTweenEditor/Core/EditorUtils.cs index 89d94ae..fd94f5e 100644 --- a/_DOTween.Assembly/DOTweenEditor/Core/EditorUtils.cs +++ b/_DOTween.Assembly/DOTweenEditor/Core/EditorUtils.cs @@ -141,6 +141,27 @@ namespace DG.DOTweenEditor.Core return source; } + /// + /// Full path for the given loaded assembly, assembly file included + /// + public static string GetAssemblyFilePath(Assembly assembly) + { + + string codeBase = assembly.CodeBase; + UriBuilder uri = new UriBuilder(codeBase); + string path = Uri.UnescapeDataString(uri.Path); + if (path.Substring(path.Length - 3) == "dll") return path; + +// string codeBase = assembly.CodeBase; +// UriBuilder uri = new UriBuilder(codeBase); +// string path = Path.GetDirectoryName(Uri.UnescapeDataString(uri.Path)); +// string lastChar = path.Substring(path.Length - 4); +// if (lastChar == "dll") return path; + + // Invalid path, use Location + return Path.GetFullPath(assembly.Location); + } + // =================================================================================== // METHODS --------------------------------------------------------------------------- @@ -161,18 +182,20 @@ namespace DG.DOTweenEditor.Core // AssetDatabase formatted path to DOTween's Editor folder static void StoreEditorADBDir() { - string codeBase = Assembly.GetExecutingAssembly().CodeBase; - UriBuilder uri = new UriBuilder(codeBase); - string fullPath = Path.GetDirectoryName(Uri.UnescapeDataString(uri.Path)); +// string codeBase = Assembly.GetExecutingAssembly().CodeBase; +// UriBuilder uri = new UriBuilder(codeBase); +// string fullPath = Path.GetDirectoryName(Uri.UnescapeDataString(uri.Path)); + string fullPath = Path.GetDirectoryName(GetAssemblyFilePath(Assembly.GetExecutingAssembly())); string adbPath = fullPath.Substring(Application.dataPath.Length + 1); _editorADBDir = adbPath.Replace("\\", "/") + "/"; } static void StoreDOTweenDirs() { - string codeBase = Assembly.GetExecutingAssembly().CodeBase; - UriBuilder uri = new UriBuilder(codeBase); - _dotweenDir = Path.GetDirectoryName(Uri.UnescapeDataString(uri.Path)); +// string codeBase = Assembly.GetExecutingAssembly().CodeBase; +// UriBuilder uri = new UriBuilder(codeBase); +// _dotweenDir = Path.GetDirectoryName(Uri.UnescapeDataString(uri.Path)); + _dotweenDir = Path.GetDirectoryName(GetAssemblyFilePath(Assembly.GetExecutingAssembly())); string pathSeparator = _dotweenDir.IndexOf("/") != -1 ? "/" : "\\"; _dotweenDir = _dotweenDir.Substring(0, _dotweenDir.LastIndexOf(pathSeparator) + 1); diff --git a/_DOTween.Assembly/bin/DOTween.XML b/_DOTween.Assembly/bin/DOTween.XML index 182fd94..a384e21 100644 --- a/_DOTween.Assembly/bin/DOTween.XML +++ b/_DOTween.Assembly/bin/DOTween.XML @@ -781,12 +781,12 @@ - Returns the a point on a path (returns Vector3.zero if this is not a path tween, if the tween is invalid, or if the path is not yet initialized), - based on the given path percentage (0 to 1). + Returns a point on a path based on the given path percentage + (returns Vector3.zero if this is not a path tween, if the tween is invalid, or if the path is not yet initialized) A path is initialized after its tween starts, or immediately if the tween was created with the Path Editor (DOTween Pro feature). You can force a path to be initialized by calling myTween.ForceInit(). - Percentage of the path on which to get the point (0 to 1) + Percentage of the path (0 to 1) on which to get the point diff --git a/_DOTween.Assembly/bin/DOTween.dll b/_DOTween.Assembly/bin/DOTween.dll index 5735f45..dd5e4ff 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 c293f30..df0c061 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 9bf3c6d..4163591 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 f2229d1..a404944 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 177d991..132944b 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 edc631e..0452ad2 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 b6df304..1997a78 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 3cef842..351408d 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.XML b/_DOTween.Assembly/bin/Editor/DOTweenEditor.XML index 09c788c..db17f44 100644 --- a/_DOTween.Assembly/bin/Editor/DOTweenEditor.XML +++ b/_DOTween.Assembly/bin/Editor/DOTweenEditor.XML @@ -56,5 +56,10 @@ 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 + + diff --git a/_DOTween.Assembly/bin/Editor/DOTweenEditor.dll b/_DOTween.Assembly/bin/Editor/DOTweenEditor.dll index 2686468..4bb6ac1 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 f9f85c1..d7805a8 100644 Binary files a/_DOTween.Assembly/bin/Editor/DOTweenEditor.dll.mdb and b/_DOTween.Assembly/bin/Editor/DOTweenEditor.dll.mdb differ