diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll index 9fe7e97..49a9f90 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 13b1a87..452fc84 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 56ac2b3..fdc7744 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 d6433d9..a421f2f 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 6af6897..fbf46ae 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 42cf4d0..8c33349 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 137ea65..9533766 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 8dd89ba..ab46924 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 8c4894e..3ca71b8 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 fed8d92..ac8716a 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 9fe7e97..49a9f90 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 13b1a87..452fc84 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 56ac2b3..fdc7744 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 d6433d9..a421f2f 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 6af6897..fbf46ae 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 42cf4d0..8c33349 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 137ea65..9533766 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 8dd89ba..ab46924 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 8c4894e..3ca71b8 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 fed8d92..ac8716a 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 9fe7e97..49a9f90 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 13b1a87..452fc84 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 56ac2b3..fdc7744 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 d6433d9..a421f2f 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 6af6897..fbf46ae 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 42cf4d0..8c33349 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 137ea65..9533766 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 8dd89ba..ab46924 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 8c4894e..3ca71b8 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 fed8d92..ac8716a 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/DemiGUI.dll b/UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiLib.dll similarity index 72% rename from UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiGUI.dll rename to UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiLib.dll index 765ba67..2452ad6 100644 Binary files a/UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiGUI.dll and b/UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiLib.dll differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiGUI.dll.mdb b/UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiLib.dll.mdb similarity index 65% rename from UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiGUI.dll.mdb rename to UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiLib.dll.mdb index f424de8..06e7a40 100644 Binary files a/UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiGUI.dll.mdb and b/UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiLib.dll.mdb differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiGUI.dll.mdb.meta b/UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiLib.dll.mdb.meta similarity index 64% rename from UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiGUI.dll.mdb.meta rename to UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiLib.dll.mdb.meta index 2d1707c..e8bdb73 100644 --- a/UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiGUI.dll.mdb.meta +++ b/UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiLib.dll.mdb.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 037849c169804e1438ef4ff7c52b2155 -timeCreated: 1430325890 +guid: abaf73559a636e64e806fc2f2e965e84 +timeCreated: 1430738302 licenseType: Free DefaultImporter: userData: diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiGUI.dll.meta b/UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiLib.dll.meta similarity index 83% rename from UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiGUI.dll.meta rename to UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiLib.dll.meta index 9ce47ea..f4bc974 100644 --- a/UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiGUI.dll.meta +++ b/UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiLib.dll.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: b09997ea40c62f245ab68176bba4ef16 -timeCreated: 1430325898 +guid: ad7d8d86ac8f0fc49a81cb875a5be5c6 +timeCreated: 1430738308 licenseType: Free PluginImporter: serializedVersion: 1 diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiGUI.XML b/UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiLib.xml similarity index 65% rename from UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiGUI.XML rename to UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiLib.xml index 73f1524..6be7a2d 100644 --- a/UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiGUI.XML +++ b/UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiLib.xml @@ -1,33 +1,33 @@ - DemiGUI + DemiLib - + 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. + Stores a color 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 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/DemiLib.xml.meta similarity index 64% rename from UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiGUI.XML.meta rename to UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiLib.xml.meta index 623abb0..6a5a394 100644 --- a/UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiGUI.XML.meta +++ b/UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiLib.xml.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: a82d7bde0f131c34186fd7eda6b47f4c -timeCreated: 1430325898 +guid: d648af5b6187e6b4a9e9ad2adf84b646 +timeCreated: 1430738318 licenseType: Free TextScriptImporter: userData: diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditor.XML b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditor.XML new file mode 100644 index 0000000..8096d3b --- /dev/null +++ b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditor.XML @@ -0,0 +1,301 @@ + + + + DemiEditor + + + + + 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. + + + + + Called automatically by DeGUI.BeginGUI. + Override when adding new style subclasses. + + + + + Extend any custom subpalettes from this, so they will be initialized correctly + + + + + 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 + + + + + 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 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 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 Y fixedWidth of the style + + + + + Sets the fixedHeight of the style + + + + + Sets the stretchHeight property of the style + + + + + 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 + + + + 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 + + + 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 + + + A toolbar with a label + + + A toolbar with a label + + + A toolbar with a label + + + A toolbar with a label + + + A toolbar with a label + + + A toolbar with a label + + + 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. + + + + diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditorGUI.XML.meta b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditor.XML.meta similarity index 64% rename from UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditorGUI.XML.meta rename to UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditor.XML.meta index a4c1bb8..ae669db 100644 --- a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditorGUI.XML.meta +++ b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditor.XML.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 7628aecf8209d114fb62be9eeb9951fb -timeCreated: 1430325788 +guid: 29fba45460626514c98ea3a468bfff31 +timeCreated: 1430439750 licenseType: Free TextScriptImporter: userData: diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditor.dll b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditor.dll new file mode 100644 index 0000000..070ebc1 Binary files /dev/null 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 new file mode 100644 index 0000000..d4d45e1 Binary files /dev/null and b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditor.dll.mdb differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditorGUI.dll.mdb.meta b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditor.dll.mdb.meta similarity index 64% rename from UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditorGUI.dll.mdb.meta rename to UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditor.dll.mdb.meta index 869fe62..ab008af 100644 --- a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditorGUI.dll.mdb.meta +++ b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditor.dll.mdb.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 3c30293ddc57adf42b4c0cb54dfb304d -timeCreated: 1430325782 +guid: 4ff112d1a82bddc4e866e8f49b9237b4 +timeCreated: 1430439738 licenseType: Free DefaultImporter: userData: diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditorGUI.dll.meta b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditor.dll.meta similarity index 83% rename from UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditorGUI.dll.meta rename to UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditor.dll.meta index d85ded5..907bb36 100644 --- a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditorGUI.dll.meta +++ b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditor.dll.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 8e6e9a21c7dc3914f869b264db71fe76 -timeCreated: 1430325788 +guid: 914a65673c240394c942b48b8293b955 +timeCreated: 1430439740 licenseType: Free PluginImporter: serializedVersion: 1 diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditorGUI.XML b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditorGUI.XML deleted file mode 100644 index ce65ea8..0000000 --- a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditorGUI.XML +++ /dev/null @@ -1,232 +0,0 @@ - - - - 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.dll b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditorGUI.dll deleted file mode 100644 index 249e516..0000000 Binary files a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditorGUI.dll and /dev/null differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditorGUI.dll.mdb b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditorGUI.dll.mdb deleted file mode 100644 index 4abc7e7..0000000 Binary files a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditorGUI.dll.mdb and /dev/null differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/Imgs.meta b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/Imgs.meta new file mode 100644 index 0000000..f478994 --- /dev/null +++ b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/Imgs.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 0ee8fa7541fa42f4fbe49ffcc419eabf +folderAsset: yes +timeCreated: 1430439738 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/Imgs/whiteSquare.png b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/Imgs/whiteSquare.png new file mode 100644 index 0000000..afc2459 Binary files /dev/null and b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/Imgs/whiteSquare.png differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/Imgs/whiteSquare.png.meta b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/Imgs/whiteSquare.png.meta new file mode 100644 index 0000000..0439b94 --- /dev/null +++ b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/Imgs/whiteSquare.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: 893c23ce13d59b14289a49ccdccad44b +timeCreated: 1430439760 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + linearTexture: 1 + 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: 16 + textureSettings: + filterMode: 0 + aniso: 1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 2 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/Imgs/whiteSquareAlpha50.png b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/Imgs/whiteSquareAlpha50.png new file mode 100644 index 0000000..ad90433 Binary files /dev/null and b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/Imgs/whiteSquareAlpha50.png differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/Imgs/whiteSquareAlpha50.png.meta b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/Imgs/whiteSquareAlpha50.png.meta new file mode 100644 index 0000000..c9bd682 --- /dev/null +++ b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/Imgs/whiteSquareAlpha50.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: a8a5494500ebeba47886c12e70f98bac +timeCreated: 1430440877 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + linearTexture: 1 + 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: 16 + textureSettings: + filterMode: 0 + aniso: 1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 2 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/Imgs/whiteSquareAlpha75.png b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/Imgs/whiteSquareAlpha75.png new file mode 100644 index 0000000..4da5e1e Binary files /dev/null and b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/Imgs/whiteSquareAlpha75.png differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/Imgs/whiteSquareAlpha75.png.meta b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/Imgs/whiteSquareAlpha75.png.meta new file mode 100644 index 0000000..26c1f2c --- /dev/null +++ b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/Imgs/whiteSquareAlpha75.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: dd8309cb7cac88445bd6d49a894d1622 +timeCreated: 1430440731 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + linearTexture: 1 + 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: 16 + textureSettings: + filterMode: 0 + aniso: 1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 2 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/_Tests PRO/BugsPro.unity b/UnityTests.Unity5/Assets/_Tests PRO/BugsPro.unity index 75be760..0eafc22 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/Paths.unity b/UnityTests.Unity5/Assets/_Tests PRO/Paths.unity index d958b80..318d315 100644 Binary files a/UnityTests.Unity5/Assets/_Tests PRO/Paths.unity and b/UnityTests.Unity5/Assets/_Tests PRO/Paths.unity differ diff --git a/UnityTests.Unity5/Assets/_Tests/Bugs/Temp.cs b/UnityTests.Unity5/Assets/_Tests/Bugs/Temp.cs index 4eff625..5eb7e7c 100644 --- a/UnityTests.Unity5/Assets/_Tests/Bugs/Temp.cs +++ b/UnityTests.Unity5/Assets/_Tests/Bugs/Temp.cs @@ -7,17 +7,28 @@ using System.Collections; public class Temp : BrainBase { public Transform target; - public bool independentUpdate = true; + Vector3 orPos; void Start() { - target.DORotate(new Vector3(0, 180, 0), 2, RotateMode.Fast).SetUpdate(independentUpdate).SetEase(Ease.Linear).SetLoops(-1, LoopType.Incremental); + orPos = target.position; } 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; + if (GUILayout.Button("Default")) CreateTween(); + if (GUILayout.Button("0")) CreateTween(0); + if (GUILayout.Button("1")) CreateTween(1); + if (GUILayout.Button("2")) CreateTween(2); + if (GUILayout.Button("3")) CreateTween(3); + } + + void CreateTween(float amplitude = -1) + { + DOTween.KillAll(); + + target.position = orPos; + if (amplitude > 0) target.DOMoveX(3, 2).SetEase(Ease.OutElastic, amplitude); + else target.DOMoveX(3, 2).SetEase(Ease.OutElastic); } } \ 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 ce70e00..b07c140 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 c1007d6..6227b02 100644 Binary files a/UnityTests.Unity5/ProjectSettings/QualitySettings.asset and b/UnityTests.Unity5/ProjectSettings/QualitySettings.asset differ diff --git a/_DOTween.Assembly/DOTweenEditor/Core/EditorGUIUtils.cs b/_DOTween.Assembly/DOTweenEditor/Core/EditorGUIUtils.cs index 0b99af0..5d56d20 100644 --- a/_DOTween.Assembly/DOTweenEditor/Core/EditorGUIUtils.cs +++ b/_DOTween.Assembly/DOTweenEditor/Core/EditorGUIUtils.cs @@ -168,7 +168,7 @@ namespace DG.DOTweenEditor.Core logoIconStyle = new GUIStyle(GUI.skin.box); logoIconStyle.active.background = logoIconStyle.normal.background = null; - logoIconStyle.margin = new RectOffset(0, 0, 4, 4); + logoIconStyle.margin = new RectOffset(0, 0, 0, 0); logoIconStyle.padding = new RectOffset(0, 0, 0, 0); // @@ -179,7 +179,7 @@ namespace DG.DOTweenEditor.Core sideLogoIconBoldLabelStyle = new GUIStyle(boldLabelStyle); sideLogoIconBoldLabelStyle.alignment = TextAnchor.MiddleLeft; - sideLogoIconBoldLabelStyle.padding.top = 6; + sideLogoIconBoldLabelStyle.padding.top = 2; wordWrapTextArea = new GUIStyle(GUI.skin.textArea); wordWrapTextArea.wordWrap = true; diff --git a/_DOTween.Assembly/bin/DOTween.dll b/_DOTween.Assembly/bin/DOTween.dll index 9fe7e97..49a9f90 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 13b1a87..452fc84 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 56ac2b3..fdc7744 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 d6433d9..a421f2f 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 6af6897..fbf46ae 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 42cf4d0..8c33349 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 137ea65..9533766 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 8dd89ba..ab46924 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 8c4894e..3ca71b8 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 fed8d92..ac8716a 100644 Binary files a/_DOTween.Assembly/bin/Editor/DOTweenEditor.dll.mdb and b/_DOTween.Assembly/bin/Editor/DOTweenEditor.dll.mdb differ