diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.XML b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.XML index 69109d4..4bebb21 100644 --- a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.XML +++ b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.XML @@ -1787,18 +1787,20 @@ Beware: each time you call this method a new list is generated, so use it for debug only - + Returns a list of all active tweens with the given id. Returns NULL if there are no active tweens with the given id. Beware: each time you call this method a new list is generated + If TRUE returns only the tweens with the given ID that are currently playing - + Returns a list of all active tweens with the given target. Returns NULL if there are no active tweens with the given target. Beware: each time you call this method a new list is generated + If TRUE returns only the tweens with the given target that are currently playing diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll index e51311d..9fe7e97 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 31baa05..13b1a87 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 10506de..56ac2b3 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 dd9d8bf..d6433d9 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 40dc516..6af6897 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 aa01098..42cf4d0 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 0524b30..137ea65 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 125d7bd..8dd89ba 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 967b5a0..8c4894e 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 55b9668..fed8d92 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 69109d4..4bebb21 100644 --- a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.XML +++ b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.XML @@ -1787,18 +1787,20 @@ Beware: each time you call this method a new list is generated, so use it for debug only - + Returns a list of all active tweens with the given id. Returns NULL if there are no active tweens with the given id. Beware: each time you call this method a new list is generated + If TRUE returns only the tweens with the given ID that are currently playing - + Returns a list of all active tweens with the given target. Returns NULL if there are no active tweens with the given target. Beware: each time you call this method a new list is generated + If TRUE returns only the tweens with the given target that are currently playing diff --git a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.dll b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.dll index e51311d..9fe7e97 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 31baa05..13b1a87 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 10506de..56ac2b3 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 dd9d8bf..d6433d9 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 40dc516..6af6897 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 aa01098..42cf4d0 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 0524b30..137ea65 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 125d7bd..8dd89ba 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 967b5a0..8c4894e 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 55b9668..fed8d92 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 69109d4..4bebb21 100644 --- a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.XML +++ b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.XML @@ -1787,18 +1787,20 @@ Beware: each time you call this method a new list is generated, so use it for debug only - + Returns a list of all active tweens with the given id. Returns NULL if there are no active tweens with the given id. Beware: each time you call this method a new list is generated + If TRUE returns only the tweens with the given ID that are currently playing - + Returns a list of all active tweens with the given target. Returns NULL if there are no active tweens with the given target. Beware: each time you call this method a new list is generated + If TRUE returns only the tweens with the given target that are currently playing diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll index e51311d..9fe7e97 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 31baa05..13b1a87 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 10506de..56ac2b3 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 dd9d8bf..d6433d9 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 40dc516..6af6897 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 aa01098..42cf4d0 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 0524b30..137ea65 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 125d7bd..8dd89ba 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 967b5a0..8c4894e 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 55b9668..fed8d92 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.meta b/UnityTests.Unity5/Assets/Demigiant/DemiLib.meta new file mode 100644 index 0000000..0b19842 --- /dev/null +++ b/UnityTests.Unity5/Assets/Demigiant/DemiLib.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 495b9da348774694195375845cf36b34 +folderAsset: yes +timeCreated: 1430325782 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiGUI.XML b/UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiGUI.XML new file mode 100644 index 0000000..73f1524 --- /dev/null +++ b/UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiGUI.XML @@ -0,0 +1,36 @@ + + + + DemiGUI + + + + + Contains both free and pro skins color variations, + and automatically returns the correct one when converted to Color + + + + + Stores a color palette, which can be passed to default DeGUI layouts when calling DeGUIManager.BeginGUI, + and changed at any time by calling DeGUIManager.ChangePalette. + You can inherit from this class to create custom color palettes with more color options. + + + + + Background colors + + + + + Content colors + + + + + Set when calling DeGUIManage.BeginGUI + + + + diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiGUI.XML.meta b/UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiGUI.XML.meta new file mode 100644 index 0000000..623abb0 --- /dev/null +++ b/UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiGUI.XML.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a82d7bde0f131c34186fd7eda6b47f4c +timeCreated: 1430325898 +licenseType: Free +TextScriptImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiGUI.dll b/UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiGUI.dll new file mode 100644 index 0000000..765ba67 Binary files /dev/null and b/UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiGUI.dll differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiGUI.dll.mdb b/UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiGUI.dll.mdb new file mode 100644 index 0000000..f424de8 Binary files /dev/null and b/UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiGUI.dll.mdb differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiGUI.dll.mdb.meta b/UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiGUI.dll.mdb.meta new file mode 100644 index 0000000..2d1707c --- /dev/null +++ b/UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiGUI.dll.mdb.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 037849c169804e1438ef4ff7c52b2155 +timeCreated: 1430325890 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiGUI.dll.meta b/UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiGUI.dll.meta new file mode 100644 index 0000000..9ce47ea --- /dev/null +++ b/UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiGUI.dll.meta @@ -0,0 +1,20 @@ +fileFormatVersion: 2 +guid: b09997ea40c62f245ab68176bba4ef16 +timeCreated: 1430325898 +licenseType: Free +PluginImporter: + serializedVersion: 1 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + platformData: + Any: + enabled: 1 + settings: {} + Editor: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor.meta b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor.meta new file mode 100644 index 0000000..874cdaf --- /dev/null +++ b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: c760f6aafa0a81c4ea230ee15e51e164 +folderAsset: yes +timeCreated: 1430325782 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditorGUI.XML b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditorGUI.XML new file mode 100644 index 0000000..ce65ea8 --- /dev/null +++ b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditorGUI.XML @@ -0,0 +1,232 @@ + + + + DemiEditorGUI + + + + + GUI extension methods + + + + + Clones the style and adds the given formats to it + + + + + Adds the given formats to the style + + + + + Sets the border of the style + + + + + Sets the background of the style + + + + + Sets the contentOffset of the style + + + + + Sets the X contentOffset of the style + + + + + Sets the Y contentOffset of the style + + + + + Sets the Y fixedWidth of the style + + + + + Sets the margin of the style + + + + + Sets the margin of the style + + + + + Sets the top margin of the style + + + + + Sets the bottom margin of the style + + + + + Sets the padding of the style + + + + + Sets the padding of the style + + + + + Sets the left padding of the style + + + + + Sets the right padding of the style + + + + + Sets the top padding of the style + + + + + Sets the bottom padding of the style + + + + + Sets the fixedHeight of the style + + + + + Sets the stretchHeight property of the style + + + + + Sets the stretchWidth property of the style + + + + + Global Demigiant GUI manager + + + + + Default color palette + + + + + Default style palette + + + + + Call this at the beginning of GUI methods + + + + + + Changes the active palettes to the given ones + (or resets them to the default ones if NULL) + + + + + Stores a GUIStyle palette, which can be passed to default DeGUI layouts when calling DeGUI.BeginGUI, + and changed at any time by calling DeGUI.ChangePalette. + You can inherit from this class to create custom GUIStyle palettes with more options. + + + + + Needs to be overridden in order to initialize new styles added from inherited classes + + + + + Needs to be overridden in order to initialize new styles added from inherited classes + + + + + Needs to be overridden in order to initialize new styles added from inherited classes + + + + + Needs to be overridden in order to initialize new styles added from inherited classes + + + + + Needs to be overridden in order to initialize new styles added from inherited classes + + + + + GUILayout methods + + + + Begins an horizontal toolbar layout + + + Begins an horizontal toolbar layout + + + Begins an horizontal toolbar layout + + + Begins an horizontal toolbar layout + + + Ends an horizontal toolbar layout + + + Divider + + + Button that can be toggled on and off + + + Button that can be toggled on and off + + + Button that can be toggled on and off + + + Button that can be toggled on and off + Button that can be toggled on and off + + + Button that can be toggled on and off + + + Button that can be toggled on and off + + + Button that can be toggled on and off + + + Button that can be toggled on and off + + + Button that can be toggled on and off + + + Button that can be toggled on and off + Button that can be toggled on and off + + + diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditorGUI.XML.meta b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditorGUI.XML.meta new file mode 100644 index 0000000..a4c1bb8 --- /dev/null +++ b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditorGUI.XML.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7628aecf8209d114fb62be9eeb9951fb +timeCreated: 1430325788 +licenseType: Free +TextScriptImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditorGUI.dll b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditorGUI.dll new file mode 100644 index 0000000..249e516 Binary files /dev/null and b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditorGUI.dll differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditorGUI.dll.mdb b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditorGUI.dll.mdb new file mode 100644 index 0000000..4abc7e7 Binary files /dev/null and b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditorGUI.dll.mdb differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditorGUI.dll.mdb.meta b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditorGUI.dll.mdb.meta new file mode 100644 index 0000000..869fe62 --- /dev/null +++ b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditorGUI.dll.mdb.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3c30293ddc57adf42b4c0cb54dfb304d +timeCreated: 1430325782 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditorGUI.dll.meta b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditorGUI.dll.meta new file mode 100644 index 0000000..d85ded5 --- /dev/null +++ b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditorGUI.dll.meta @@ -0,0 +1,20 @@ +fileFormatVersion: 2 +guid: 8e6e9a21c7dc3914f869b264db71fe76 +timeCreated: 1430325788 +licenseType: Free +PluginImporter: + serializedVersion: 1 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + platformData: + Any: + enabled: 0 + settings: {} + Editor: + enabled: 1 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/_Tests PRO/BugsPro.unity b/UnityTests.Unity5/Assets/_Tests PRO/BugsPro.unity index 2d7f9a6..75be760 100644 Binary files a/UnityTests.Unity5/Assets/_Tests PRO/BugsPro.unity and b/UnityTests.Unity5/Assets/_Tests PRO/BugsPro.unity differ diff --git a/UnityTests.Unity5/Assets/_Tests PRO/TempPro.cs b/UnityTests.Unity5/Assets/_Tests PRO/TempPro.cs index 33a5596..38ad94f 100644 --- a/UnityTests.Unity5/Assets/_Tests PRO/TempPro.cs +++ b/UnityTests.Unity5/Assets/_Tests PRO/TempPro.cs @@ -4,9 +4,10 @@ using DG.Tweening; public class TempPro : MonoBehaviour { - void OnMouseDown() + public float timeScale = 0; + + void Start() { - Debug.Log("DOWN"); - this.GetComponent().DOPlay(); + Time.timeScale = timeScale; } } \ 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 ad29ef6..b9997e6 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/Temp.cs b/UnityTests.Unity5/Assets/_Tests/Bugs/Temp.cs index 3b10deb..4eff625 100644 --- a/UnityTests.Unity5/Assets/_Tests/Bugs/Temp.cs +++ b/UnityTests.Unity5/Assets/_Tests/Bugs/Temp.cs @@ -6,16 +6,18 @@ using System.Collections; public class Temp : BrainBase { - public Transform[] targets; + public Transform target; + public bool independentUpdate = true; void Start() { - for (int i = 0; i < targets.Length; ++i) { - Transform t = targets[i]; - Tweener tween = t.DOLocalMove(Vector3.zero, 1).SetLoops(4, LoopType.Restart).SetEase(Ease.Linear); - float time = ((i+1) / (float)targets.Length); - t.GetComponentInChildren().text = i + "-" + time; - tween.Goto(time, false); - } + target.DORotate(new Vector3(0, 180, 0), 2, RotateMode.Fast).SetUpdate(independentUpdate).SetEase(Ease.Linear).SetLoops(-1, LoopType.Incremental); + } + + void OnGUI() + { + if (GUILayout.Button("VSync 0")) QualitySettings.vSyncCount = 0; + if (GUILayout.Button("VSync 1")) QualitySettings.vSyncCount = 1; + if (GUILayout.Button("VSync 2")) QualitySettings.vSyncCount = 2; } } \ No newline at end of file diff --git a/UnityTests.Unity5/Assets/_Tests/Bugs/Temp.unity b/UnityTests.Unity5/Assets/_Tests/Bugs/Temp.unity index 36b96d2..ce70e00 100644 Binary files a/UnityTests.Unity5/Assets/_Tests/Bugs/Temp.unity and b/UnityTests.Unity5/Assets/_Tests/Bugs/Temp.unity differ diff --git a/UnityTests.Unity5/ProjectSettings/QualitySettings.asset b/UnityTests.Unity5/ProjectSettings/QualitySettings.asset index 6227b02..c1007d6 100644 Binary files a/UnityTests.Unity5/ProjectSettings/QualitySettings.asset and b/UnityTests.Unity5/ProjectSettings/QualitySettings.asset differ diff --git a/_DOTween.Assembly/DOTween/Core/TweenManager.cs b/_DOTween.Assembly/DOTween/Core/TweenManager.cs index 7e35949..9e4b939 100644 --- a/_DOTween.Assembly/DOTween/Core/TweenManager.cs +++ b/_DOTween.Assembly/DOTween/Core/TweenManager.cs @@ -679,7 +679,7 @@ namespace DG.Tweening.Core } // Returns all active tweens with the given id - internal static List GetTweensById(object id) + internal static List GetTweensById(object id, bool playingOnly) { if (_requiresActiveReorganization) ReorganizeActiveTweens(); @@ -688,14 +688,15 @@ namespace DG.Tweening.Core List ts = new List(len); for (int i = 0; i < len; ++i) { Tween t = _activeTweens[i]; - if (t != null && Equals(id, t.id)) ts.Add(t); + if (t == null || !Equals(id, t.id)) continue; + if (!playingOnly || t.isPlaying) ts.Add(t); } if (ts.Count > 0) return ts; return null; } // Returns all active tweens with the given target - internal static List GetTweensByTarget(object target) + internal static List GetTweensByTarget(object target, bool playingOnly) { if (_requiresActiveReorganization) ReorganizeActiveTweens(); @@ -704,7 +705,8 @@ namespace DG.Tweening.Core List ts = new List(len); for (int i = 0; i < len; ++i) { Tween t = _activeTweens[i]; - if (t.target == target) ts.Add(t); + if (t.target != target) continue; + if (!playingOnly || t.isPlaying) ts.Add(t); } if (ts.Count > 0) return ts; return null; diff --git a/_DOTween.Assembly/DOTween/DOTween.cs b/_DOTween.Assembly/DOTween/DOTween.cs index 2612fdc..978df4d 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.640"; + public static readonly string Version = "1.0.645"; /////////////////////////////////////////////// // Options //////////////////////////////////// @@ -840,22 +840,24 @@ namespace DG.Tweening /// Returns a list of all active tweens with the given id. /// Returns NULL if there are no active tweens with the given id. /// Beware: each time you call this method a new list is generated + /// If TRUE returns only the tweens with the given ID that are currently playing /// - public static List TweensById(object id) + public static List TweensById(object id, bool playingOnly = false) { if (id == null) return null; - return TweenManager.GetTweensById(id); + return TweenManager.GetTweensById(id, playingOnly); } /// /// Returns a list of all active tweens with the given target. /// Returns NULL if there are no active tweens with the given target. /// Beware: each time you call this method a new list is generated + /// If TRUE returns only the tweens with the given target that are currently playing /// - public static List TweensByTarget(object target) + public static List TweensByTarget(object target, bool playingOnly = false) { - return TweenManager.GetTweensByTarget(target); + return TweenManager.GetTweensByTarget(target, playingOnly); } #endregion diff --git a/_DOTween.Assembly/bin/DOTween.XML b/_DOTween.Assembly/bin/DOTween.XML index 69109d4..4bebb21 100644 --- a/_DOTween.Assembly/bin/DOTween.XML +++ b/_DOTween.Assembly/bin/DOTween.XML @@ -1787,18 +1787,20 @@ Beware: each time you call this method a new list is generated, so use it for debug only - + Returns a list of all active tweens with the given id. Returns NULL if there are no active tweens with the given id. Beware: each time you call this method a new list is generated + If TRUE returns only the tweens with the given ID that are currently playing - + Returns a list of all active tweens with the given target. Returns NULL if there are no active tweens with the given target. Beware: each time you call this method a new list is generated + If TRUE returns only the tweens with the given target that are currently playing diff --git a/_DOTween.Assembly/bin/DOTween.dll b/_DOTween.Assembly/bin/DOTween.dll index e51311d..9fe7e97 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 31baa05..13b1a87 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 10506de..56ac2b3 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 dd9d8bf..d6433d9 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 40dc516..6af6897 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 aa01098..42cf4d0 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 0524b30..137ea65 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 125d7bd..8dd89ba 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 967b5a0..8c4894e 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 55b9668..fed8d92 100644 Binary files a/_DOTween.Assembly/bin/Editor/DOTweenEditor.dll.mdb and b/_DOTween.Assembly/bin/Editor/DOTweenEditor.dll.mdb differ