diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll index 50affcb..72f45a8 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 1fe341a..1afa8fd 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 5f20031..401fbc4 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 0077d67..46fb1dc 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 55f4fdb..93f2147 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 75c48c1..cf650ad 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 b7578e0..11b958b 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 1f4a428..2e449cb 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 bb76a07..e441bac 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 35e0482..e062d7a 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/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween.XML b/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween.XML index cc2064b..33c9717 100644 --- a/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween.XML +++ b/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween.XML @@ -188,6 +188,43 @@ Used for custom and animationCurve-based ease functions. Must return a value between 0 and 1. + + + Straight Quaternion plugin. Instead of using Vector3 values accepts Quaternion values directly. + Beware: doesn't work with LoopType.Incremental (neither directly nor if inside a LoopType.Incremental Sequence). + To use it, call DOTween.To with the plugin parameter overload, passing it PureQuaternionPlugin.Plug() as first parameter + (do not use any of the other public PureQuaternionPlugin methods): + DOTween.To(PureQuaternionPlugin.Plug(), ()=> myQuaternionProperty, x=> myQuaternionProperty = x, myQuaternionEndValue, duration); + + + + + Plug this plugin inside a DOTween.To call. + Example: + DOTween.To(PureQuaternionPlugin.Plug(), ()=> myQuaternionProperty, x=> myQuaternionProperty = x, myQuaternionEndValue, duration); + + + + INTERNAL: do not use + + + INTERNAL: do not use + + + INTERNAL: do not use + + + INTERNAL: do not use + + + INTERNAL: do not use + + + INTERNAL: do not use + + + INTERNAL: do not use + Main DOTween class. Contains static methods to create and control tweens in a generic way @@ -331,7 +368,7 @@ Example usage with lambda:x=> myProperty = x The end value to reachThe tween's duration - + Tweens a property or field to the given value using default plugins A getter for the field or property to tween. Example usage with lambda:()=> myProperty @@ -1419,12 +1456,30 @@ The end value to reachThe duration of the tween Rotation mode + + Tweens a Transform's rotation to the given value using pure quaternion values. + Also stores the transform as the tween's target so it can be used for filtered operations. + PLEASE NOTE: DORotate, which takes Vector3 values, is the preferred rotation method. + This method was implemented for very special cases, and doesn't support LoopType.Incremental loops + (neither for itself nor if placed inside a LoopType.Incremental Sequence) + + The end value to reachThe duration of the tween + Tweens a Transform's localRotation to the given value. Also stores the transform as the tween's target so it can be used for filtered operations The end value to reachThe duration of the tween Rotation mode + + Tweens a Transform's rotation to the given value using pure quaternion values. + Also stores the transform as the tween's target so it can be used for filtered operations. + PLEASE NOTE: DOLocalRotate, which takes Vector3 values, is the preferred rotation method. + This method was implemented for very special cases, and doesn't support LoopType.Incremental loops + (neither for itself nor if placed inside a LoopType.Incremental Sequence) + + The end value to reachThe duration of the tween + Tweens a Transform's localScale to the given value. Also stores the transform as the tween's target so it can be used for filtered operations @@ -1984,13 +2039,23 @@ Sets the ease of the tween. If applied to Sequences eases the whole sequence animation - Eventual overshoot to use with Back ease (default is 1.70158) + + Eventual overshoot to use with Back or Flash ease (default is 1.70158). + In case of Flash ease it sets the total number of flashes that will happen. + Using an even number will complete the tween on the starting value, while an odd one will complete it on the end value. + Sets the ease of the tween. If applied to Sequences eases the whole sequence animation - Eventual amplitude to use with Elastic easeType (default is 1.70158) - Eventual period to use with Elastic easeType (default is 0) + Eventual amplitude to use with Elastic easeType or overshoot to use with Flash easeType (default is 1.70158). + In case of Flash ease it sets the total number of flashes that will happen. + Using an even number will complete the tween on the starting value, while an odd one will complete it on the end value. + + Eventual period to use with Elastic or Flash easeType (default is 0). + In case of Flash ease it indicates the power in time of the ease, and must be between -1 and 1. + 0 is balanced, 1 weakens the ease with time, -1 starts the ease weakened and gives it power towards the end. + Sets the ease of the tween using an AnimationCurve. @@ -2083,7 +2148,8 @@ The tween to prepend - Inserts the given tween at the same time position of the last tween added to the Sequence. + Inserts the given tween at the same time position of the last tween, callback or intervale added to the Sequence. + Note that, in case of a Join after an interval, the insertion time will be the time where the interval starts, not where it finishes. Has no effect if the Sequence has already started diff --git a/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween.dll b/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween.dll index 869bbdd..9a44744 100644 Binary files a/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween.dll and b/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween.dll differ diff --git a/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween.dll.mdb b/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween.dll.mdb index 20d3998..c970dea 100644 Binary files a/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween.dll.mdb and b/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween.dll.mdb differ diff --git a/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween.dll.meta b/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween.dll.meta index e53c187..e437e75 100644 --- a/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween.dll.meta +++ b/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween.dll.meta @@ -15,6 +15,10 @@ PluginImporter: enabled: 0 settings: DefaultValueInitialized: true + WindowsStoreApps: + enabled: 0 + settings: + CPU: AnyCPU userData: assetBundleName: assetBundleVariant: diff --git a/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween43.dll b/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween43.dll index 687e2ef..508fad4 100644 Binary files a/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween43.dll and b/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween43.dll differ diff --git a/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween43.dll.mdb b/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween43.dll.mdb index 6c7e725..1aaeac4 100644 Binary files a/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween43.dll.mdb and b/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween43.dll.mdb differ diff --git a/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween43.dll.meta b/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween43.dll.meta index 7729885..4230b41 100644 --- a/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween43.dll.meta +++ b/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween43.dll.meta @@ -15,6 +15,10 @@ PluginImporter: enabled: 0 settings: DefaultValueInitialized: true + WindowsStoreApps: + enabled: 0 + settings: + CPU: AnyCPU userData: assetBundleName: assetBundleVariant: diff --git a/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween46.dll b/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween46.dll index ad38203..9c38424 100644 Binary files a/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween46.dll and b/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween46.dll differ diff --git a/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween46.dll.mdb b/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween46.dll.mdb index 7b5d0f8..a54c005 100644 Binary files a/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween46.dll.mdb and b/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween46.dll.mdb differ diff --git a/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween46.dll.meta b/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween46.dll.meta index b0e604a..2bcabf3 100644 --- a/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween46.dll.meta +++ b/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween46.dll.meta @@ -15,6 +15,10 @@ PluginImporter: enabled: 0 settings: DefaultValueInitialized: true + WindowsStoreApps: + enabled: 0 + settings: + CPU: AnyCPU userData: assetBundleName: assetBundleVariant: diff --git a/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween50.dll b/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween50.dll index 521959e..3353626 100644 Binary files a/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween50.dll and b/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween50.dll differ diff --git a/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween50.dll.mdb b/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween50.dll.mdb index 4aeb906..e80e6db 100644 Binary files a/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween50.dll.mdb and b/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween50.dll.mdb differ diff --git a/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween50.dll.meta b/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween50.dll.meta index 1d8726f..3ff8968 100644 --- a/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween50.dll.meta +++ b/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween50.dll.meta @@ -15,6 +15,10 @@ PluginImporter: enabled: 0 settings: DefaultValueInitialized: true + WindowsStoreApps: + enabled: 0 + settings: + CPU: AnyCPU userData: assetBundleName: assetBundleVariant: diff --git a/UnityExamples.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll b/UnityExamples.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll index f7b7215..261d278 100644 Binary files a/UnityExamples.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll and b/UnityExamples.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll differ diff --git a/UnityExamples.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb b/UnityExamples.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb index b85c449..33a66b1 100644 Binary files a/UnityExamples.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb and b/UnityExamples.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb differ diff --git a/UnityExamples.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.meta b/UnityExamples.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.meta index 63a3e06..de0ba1a 100644 --- a/UnityExamples.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.meta +++ b/UnityExamples.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.meta @@ -15,6 +15,10 @@ PluginImporter: enabled: 1 settings: DefaultValueInitialized: true + WindowsStoreApps: + enabled: 0 + settings: + CPU: AnyCPU userData: assetBundleName: assetBundleVariant: diff --git a/UnityExamples.Unity5/Assets/Example Assets/MAT Emission.mat b/UnityExamples.Unity5/Assets/Example Assets/MAT Emission.mat new file mode 100644 index 0000000..7695310 Binary files /dev/null and b/UnityExamples.Unity5/Assets/Example Assets/MAT Emission.mat differ diff --git a/UnityExamples.Unity5/Assets/Example Assets/MAT Emission.mat.meta b/UnityExamples.Unity5/Assets/Example Assets/MAT Emission.mat.meta new file mode 100644 index 0000000..60db956 --- /dev/null +++ b/UnityExamples.Unity5/Assets/Example Assets/MAT Emission.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c4775907cc139d5489cc651771b80bbb +timeCreated: 1453204813 +licenseType: Pro +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityExamples.Unity5/Assets/Example Assets/TEX Storm.jpg b/UnityExamples.Unity5/Assets/Example Assets/TEX Storm.jpg new file mode 100644 index 0000000..fcc3d89 Binary files /dev/null and b/UnityExamples.Unity5/Assets/Example Assets/TEX Storm.jpg differ diff --git a/UnityExamples.Unity5/Assets/Example Assets/TEX Storm.jpg.meta b/UnityExamples.Unity5/Assets/Example Assets/TEX Storm.jpg.meta new file mode 100644 index 0000000..3b52f8e --- /dev/null +++ b/UnityExamples.Unity5/Assets/Example Assets/TEX Storm.jpg.meta @@ -0,0 +1,57 @@ +fileFormatVersion: 2 +guid: 86b0d859282444340b46b22d7d3c2189 +timeCreated: 1453205070 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 512 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityExamples.Unity5/Assets/Materials.cs b/UnityExamples.Unity5/Assets/Materials.cs new file mode 100644 index 0000000..189318c --- /dev/null +++ b/UnityExamples.Unity5/Assets/Materials.cs @@ -0,0 +1,48 @@ +using UnityEngine; +using DG.Tweening; + +public class Materials : MonoBehaviour +{ + public GameObject target; + public Color toColor; + + Tween colorTween, emissionTween, offsetTween; + + void Start() + { + // NOTE: all tweens will be created in a paused state, so they can be toggled via the UI + + // Store the material, since we will tween that + Material mat = target.GetComponent().material; + + // COLOR + colorTween = mat.DOColor(toColor, 1).SetLoops(-1, LoopType.Yoyo).Pause(); + + // EMISSION + // Note that the float value you see in Unity's inspector, next to the emission's color, + // doesn't really exist in the shader (it's generated by Unity's inspector and applied to the material's color), + // se we have to tween the full _EmissionColor. + emissionTween = mat.DOColor(new Color(0, 0, 0, 0), "_EmissionColor", 1).SetLoops(-1, LoopType.Yoyo).Pause(); + + // OFFSET + // In this case we set the loop to Incremental and the ease to Linear, because it's cooler + offsetTween = mat.DOOffset(new Vector2(1, 1), 1).SetEase(Ease.Linear).SetLoops(-1, LoopType.Incremental).Pause(); + } + + // Toggle methods (called by UI events) + + public void ToggleColor() + { + colorTween.TogglePause(); + } + + public void ToggleEmission() + { + emissionTween.TogglePause(); + } + + public void ToggleOffset() + { + offsetTween.TogglePause(); + } +} \ No newline at end of file diff --git a/UnityExamples.Unity5/Assets/Materials.cs.meta b/UnityExamples.Unity5/Assets/Materials.cs.meta new file mode 100644 index 0000000..9957dc5 --- /dev/null +++ b/UnityExamples.Unity5/Assets/Materials.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 8430b262989beaa4f90757c3f1057d83 +timeCreated: 1453204682 +licenseType: Pro +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityExamples.Unity5/Assets/Materials.unity b/UnityExamples.Unity5/Assets/Materials.unity new file mode 100644 index 0000000..ec6dbd6 Binary files /dev/null and b/UnityExamples.Unity5/Assets/Materials.unity differ diff --git a/UnityExamples.Unity5/Assets/Materials.unity.meta b/UnityExamples.Unity5/Assets/Materials.unity.meta new file mode 100644 index 0000000..34cf0c0 --- /dev/null +++ b/UnityExamples.Unity5/Assets/Materials.unity.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4581558edb2b8e04da2eb7a7c34dd2c3 +timeCreated: 1453204634 +licenseType: Pro +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityExamples.Unity5/ProjectSettings/ClusterInputManager.asset b/UnityExamples.Unity5/ProjectSettings/ClusterInputManager.asset new file mode 100644 index 0000000..25f957d Binary files /dev/null and b/UnityExamples.Unity5/ProjectSettings/ClusterInputManager.asset differ diff --git a/UnityExamples.Unity5/ProjectSettings/GraphicsSettings.asset b/UnityExamples.Unity5/ProjectSettings/GraphicsSettings.asset index d75e792..c5dd1f2 100644 Binary files a/UnityExamples.Unity5/ProjectSettings/GraphicsSettings.asset and b/UnityExamples.Unity5/ProjectSettings/GraphicsSettings.asset differ diff --git a/UnityExamples.Unity5/ProjectSettings/ProjectSettings.asset b/UnityExamples.Unity5/ProjectSettings/ProjectSettings.asset index 95df289..968cf45 100644 Binary files a/UnityExamples.Unity5/ProjectSettings/ProjectSettings.asset and b/UnityExamples.Unity5/ProjectSettings/ProjectSettings.asset differ diff --git a/UnityExamples.Unity5/ProjectSettings/ProjectVersion.txt b/UnityExamples.Unity5/ProjectSettings/ProjectVersion.txt index 8a062e6..961ebb9 100644 --- a/UnityExamples.Unity5/ProjectSettings/ProjectVersion.txt +++ b/UnityExamples.Unity5/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 5.2.1f1 +m_EditorVersion: 5.3.1f1 m_StandardAssetsVersion: 0 diff --git a/UnityExamples.Unity5/ProjectSettings/UnityAnalyticsManager.asset b/UnityExamples.Unity5/ProjectSettings/UnityConnectSettings.asset similarity index 84% rename from UnityExamples.Unity5/ProjectSettings/UnityAnalyticsManager.asset rename to UnityExamples.Unity5/ProjectSettings/UnityConnectSettings.asset index e52c94d..fbf5f05 100644 Binary files a/UnityExamples.Unity5/ProjectSettings/UnityAnalyticsManager.asset and b/UnityExamples.Unity5/ProjectSettings/UnityConnectSettings.asset differ diff --git a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.dll b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.dll index 50affcb..72f45a8 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 1fe341a..1afa8fd 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 5f20031..401fbc4 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 0077d67..46fb1dc 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 55f4fdb..93f2147 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 75c48c1..cf650ad 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 b7578e0..11b958b 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 1f4a428..2e449cb 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 bb76a07..e441bac 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 35e0482..e062d7a 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 50affcb..72f45a8 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 1fe341a..1afa8fd 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/DOTween.dll.meta b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll.meta index 3780d6c..efcadc0 100644 --- a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll.meta +++ b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll.meta @@ -15,6 +15,10 @@ PluginImporter: enabled: 0 settings: DefaultValueInitialized: true + WindowsStoreApps: + enabled: 0 + settings: + CPU: AnyCPU userData: assetBundleName: assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween43.dll b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween43.dll index 5f20031..401fbc4 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 0077d67..46fb1dc 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/DOTween43.dll.meta b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween43.dll.meta index cbe6f40..e3b9c77 100644 --- a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween43.dll.meta +++ b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween43.dll.meta @@ -15,6 +15,10 @@ PluginImporter: enabled: 0 settings: DefaultValueInitialized: true + WindowsStoreApps: + enabled: 0 + settings: + CPU: AnyCPU userData: assetBundleName: assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween46.dll b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween46.dll index 55f4fdb..93f2147 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 75c48c1..cf650ad 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/DOTween46.dll.meta b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween46.dll.meta index 29a023d..5379401 100644 --- a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween46.dll.meta +++ b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween46.dll.meta @@ -15,6 +15,10 @@ PluginImporter: enabled: 0 settings: DefaultValueInitialized: true + WindowsStoreApps: + enabled: 0 + settings: + CPU: AnyCPU userData: assetBundleName: assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween50.dll b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween50.dll index b7578e0..11b958b 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 1f4a428..2e449cb 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/DOTween50.dll.meta b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween50.dll.meta index 5f2d206..006af13 100644 --- a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween50.dll.meta +++ b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween50.dll.meta @@ -15,6 +15,10 @@ PluginImporter: enabled: 0 settings: DefaultValueInitialized: true + WindowsStoreApps: + enabled: 0 + settings: + CPU: AnyCPU userData: assetBundleName: assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll b/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll index bb76a07..e441bac 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 35e0482..e062d7a 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/DOTween/Editor/DOTweenEditor.dll.meta b/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.meta index 0019db6..e354233 100644 --- a/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.meta +++ b/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.meta @@ -15,6 +15,10 @@ PluginImporter: enabled: 1 settings: DefaultValueInitialized: true + WindowsStoreApps: + enabled: 0 + settings: + CPU: AnyCPU userData: assetBundleName: assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/Imgs/Footer.png.meta b/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/Imgs/Footer.png.meta index 21d8f83..4a3eca9 100644 --- a/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/Imgs/Footer.png.meta +++ b/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/Imgs/Footer.png.meta @@ -1,14 +1,14 @@ fileFormatVersion: 2 guid: cbbac93ae244da644b3399f418baca2c -timeCreated: 1431691500 -licenseType: Free +timeCreated: 1452683633 +licenseType: Pro TextureImporter: fileIDToRecycleName: {} serializedVersion: 2 mipmaps: mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 + enableMipMap: 0 + linearTexture: 1 correctGamma: 0 fadeOut: 0 borderMipMap: 0 @@ -17,7 +17,7 @@ TextureImporter: bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 grayScaleToAlpha: 0 @@ -26,29 +26,31 @@ TextureImporter: cubemapConvolutionSteps: 8 cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 2048 + textureFormat: -3 + maxTextureSize: 256 textureSettings: - filterMode: -1 - aniso: -1 + filterMode: 1 + aniso: 1 mipBias: -1 - wrapMode: -1 - nPOTScale: 1 + wrapMode: 1 + nPOTScale: 0 lightmap: 0 rGBM: 0 compressionQuality: 50 + allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} + spritePivot: {x: 0.5, y: 0.5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 - alphaIsTransparency: 0 - textureType: -1 + alphaIsTransparency: 1 + textureType: 2 buildTargetSettings: [] spriteSheet: sprites: [] + outline: [] spritePackingTag: userData: assetBundleName: diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/DemiLib.dll b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/DemiLib.dll index 89f4e7b..154582e 100644 Binary files a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/DemiLib.dll and b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/DemiLib.dll differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/DemiLib.dll.mdb b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/DemiLib.dll.mdb index c6cc86b..715bb82 100644 Binary files a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/DemiLib.dll.mdb and b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/DemiLib.dll.mdb differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/DemiLib.dll.meta b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/DemiLib.dll.meta index 544e80e..00028c5 100644 --- a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/DemiLib.dll.meta +++ b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/DemiLib.dll.meta @@ -15,6 +15,10 @@ PluginImporter: enabled: 0 settings: DefaultValueInitialized: true + WindowsStoreApps: + enabled: 0 + settings: + CPU: AnyCPU userData: assetBundleName: assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/DemiLib.pdb.meta b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/DemiLib.pdb.meta new file mode 100644 index 0000000..d054dc2 --- /dev/null +++ b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/DemiLib.pdb.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9bb63fd0cf03cdc4d9e59294bc161dfc +timeCreated: 1452683141 +licenseType: Pro +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/DemiEditor.dll b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/DemiEditor.dll index c78928a..c8d7d73 100644 Binary files a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/DemiEditor.dll and b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/DemiEditor.dll differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/DemiEditor.dll.mdb b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/DemiEditor.dll.mdb index 51e344b..d28d2a9 100644 Binary files a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/DemiEditor.dll.mdb and b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/DemiEditor.dll.mdb differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/DemiEditor.dll.meta b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/DemiEditor.dll.meta index 48fa824..ca54949 100644 --- a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/DemiEditor.dll.meta +++ b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/DemiEditor.dll.meta @@ -15,6 +15,10 @@ PluginImporter: enabled: 1 settings: DefaultValueInitialized: true + WindowsStoreApps: + enabled: 0 + settings: + CPU: AnyCPU userData: assetBundleName: assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/DemiEditor.xml b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/DemiEditor.xml index 2221b6a..1e7193a 100644 --- a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/DemiEditor.xml +++ b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/DemiEditor.xml @@ -36,12 +36,27 @@ Converts the given project-relative path to a full path + + + Converts the given full path to a project-relative path + + Returns TRUE if the file/directory at the given path exists. Path, relative to Unity's project folder + + + Checks if the given directory (full path) is empty or not + + + + + Deletes all files and subdirectories from the given directory + + Returns the asset path of the given GUID (relative to Unity project's folder), @@ -60,6 +75,13 @@ Returns the adb directory that contains the given MonoBehaviour without final slash + + + Returns the adb paths to the selected folders in the Project panel, or NULL if there is none. + Contrary to Selection.activeObject, which only returns folders selected in the right side of the panel, + this method also works with folders selected in the left side. + + Sets the script execution order of the given MonoBehaviour @@ -75,7 +97,7 @@ Utilities for Editor Panels. - + Connects to a asset. If the asset already exists at the given path, loads it and returns it. @@ -84,6 +106,105 @@ Asset type File path (relative to Unity's project folder) If TRUE and the requested asset doesn't exist, forces its creation + If TRUE also creates the path folders if they don't exist + + + Calls the given action after the given delay + + + Nothing is being dragged + + + Dragging + + + Dragging concluced and accepted + + + Dragging concluced but item position didn't change + + + Dragging canceled + + + Dragging concluced but not accepted because too short + + + + Manages the dragging of GUI elements + + + + + True if a GUI element is currently being dragged + + + + + Return the current item being dragged, or NULL if there is none + + + + + Type of current item being dragged, or NULL if there is none + + + + + Starting index of current item being dragged, or NULL if there is none + + + + + Retrieves the eventual optional data stored via the StartDrag method + + + + + Starts a drag operation on a GUI element. + + ID for this drag operation (must be the same for both StartDrag and Drag + Reference to the current editor drawing the GUI (used when a Repaint is needed) + List containing the dragged item and all other relative draggable items + DraggableList index of the item being dragged + Optional data that can be retrieved via the static property + + + + Starts a drag operation on a GUI element. + + ID for this drag operation (must be the same for both StartDrag and Drag + Reference to the current editor drawing the GUI (used when a Repaint is needed) + List containing the dragged item and all other relative draggable items + DraggableList index of the item being dragged + Optional data that can be retrieved via the static property + + + + Call this after each draggable GUI block, to calculate and draw the current drag state + (or complete it if the mouse was released). + + ID for this drag operation (must be the same for both StartDrag and Drag + List containing the draggable item and all other relative draggable items + Current index of the draggable item being drawn + + + + Call this after each draggable GUI block, to calculate and draw the current drag state + (or complete it if the mouse was released). + + ID for this drag operation (must be the same for both StartDrag and Drag + List containing the draggable item and all other relative draggable items + Current index of the draggable item being drawn + Color to use for drag divider and selection + + + + Ends the drag operations, and eventually applies the drag outcome. + Returns TRUE if the position of the dragged item actually changed. + Called automatically by Drag method. Use it only if you want to force the end of a drag operation. + + If TRUE applies the drag results, otherwise simply cancels the drag @@ -139,7 +260,7 @@ Sets the border of the style - + Sets the background of the style @@ -149,6 +270,11 @@ Sets the contentOffset of the style + + + Sets the contentOffset of the style + + Sets the X contentOffset of the style @@ -169,6 +295,11 @@ Sets the margin of the style + + + Sets the margin of the style + + Sets the left margin of the style @@ -189,6 +320,41 @@ Sets the bottom margin of the style + + + Sets the overflow of the style + + + + + Sets the overflow of the style + + + + + Sets the overflow of the style + + + + + Sets the left overflow of the style + + + + + Sets the right overflow of the style + + + + + Sets the top overflow of the style + + + + + Sets the bottom overflow of the style + + Sets the padding of the style @@ -199,6 +365,11 @@ Sets the padding of the style + + + Sets the padding of the style + + Sets the left padding of the style @@ -263,20 +434,41 @@ GUILayout methods + + Shaded button + + + Shaded button + + + Shaded button + + + Shaded button + - Button that can be toggled on and off + Colored button - Button that can be toggled on and off + Colored button - Button that can be toggled on and off + Colored button - Button that can be toggled on and off - Button that can be toggled on and off + Colored button - + + + Draws a button that returns TRUE the first time it's pressed, instead than when its released. + + + + + Draws a button that returns TRUE the first time it's pressed, instead than when its released. + + + Toolbar foldout button @@ -341,14 +533,14 @@ End vertical box layout - Divider + Horizontal Divider Scene field - Global Demigiant GUI manager + Global Demigiant GUI manager. Call to initialize it inside GUI calls. @@ -362,15 +554,19 @@ - - TRUE if we're using the PRO skin - + TRUE if we're using the PRO skin Call this at the beginning of GUI methods - + Eventual to use + Eventual to use + + + + Exits the current event correctly, also taking care of eventual drag operations + @@ -378,9 +574,107 @@ (or resets them to the default ones if NULL) + + + Resets the GUI colors to the default ones (only available if BeginGUI was called first) + + + + + Sets the GUI colors to the given ones + + + + Shaded button + + + Shaded button + + + Shaded button + + + Shaded button + + + Colored button + + + Colored button + + + Colored button + + + Colored button + + + + Draws a button that returns TRUE the first time it's pressed, instead than when its released. + + + + + Draws a button that returns TRUE the first time it's pressed, instead than when its released. + + + + 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 + Scene field + + Box with style and color options + + + Draws a colored square + + + + A text field that becomes editable only on double-click + + Area + Editor reference + A unique ID to use in order to determine if the text is selected or not + Text + Style for default (non-editing mode) appearance + Style for editing mode + + + + A text field that becomes editable only on double-click and can also be dragged + + Area + Editor reference + A unique ID to use in order to determine if the text is selected or not + Text + ID for this drag operation (must be the same for both this and Drag + List containing the dragged item and all other relative draggable items + DraggableList index of the item being dragged + Style for default (non-editing mode) appearance + Style for editing mode + + + + Divider + String extensions @@ -392,12 +686,19 @@ with or without final slash depending on the original directory format + + + If the string is a directory, returns the directory name, + if instead it's a file returns its name without extension. + Works better than Path.GetDirectoryName, which kind of sucks imho + + 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/Core/Editor/Imgs/blackSquare.png b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/blackSquare.png new file mode 100644 index 0000000..6fbcc51 Binary files /dev/null and b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/blackSquare.png differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/blackSquare.png.meta b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/blackSquare.png.meta new file mode 100644 index 0000000..1b6957d --- /dev/null +++ b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/blackSquare.png.meta @@ -0,0 +1,57 @@ +fileFormatVersion: 2 +guid: 0bac800a9d3a3c4409a02af3889d0ae3 +timeCreated: 1452683148 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/blackSquareAlpha10.png b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/blackSquareAlpha10.png new file mode 100644 index 0000000..21afc7b Binary files /dev/null and b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/blackSquareAlpha10.png differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/blackSquareAlpha10.png.meta b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/blackSquareAlpha10.png.meta new file mode 100644 index 0000000..5a1fce1 --- /dev/null +++ b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/blackSquareAlpha10.png.meta @@ -0,0 +1,57 @@ +fileFormatVersion: 2 +guid: 075601ea4053d6a459e9a6fc564baaf6 +timeCreated: 1452683148 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/blackSquareAlpha15.png b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/blackSquareAlpha15.png new file mode 100644 index 0000000..3097db8 Binary files /dev/null and b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/blackSquareAlpha15.png differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/blackSquareAlpha15.png.meta b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/blackSquareAlpha15.png.meta new file mode 100644 index 0000000..0c0ad9e --- /dev/null +++ b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/blackSquareAlpha15.png.meta @@ -0,0 +1,57 @@ +fileFormatVersion: 2 +guid: 8c4a3aedf465fa94e8f096d116121f4a +timeCreated: 1452683148 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/blackSquareAlpha25.png b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/blackSquareAlpha25.png new file mode 100644 index 0000000..521e6dc Binary files /dev/null and b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/blackSquareAlpha25.png differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/blackSquareAlpha25.png.meta b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/blackSquareAlpha25.png.meta new file mode 100644 index 0000000..baa1341 --- /dev/null +++ b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/blackSquareAlpha25.png.meta @@ -0,0 +1,57 @@ +fileFormatVersion: 2 +guid: 6b8889d7c57c2304e999be660f79e6cb +timeCreated: 1452683148 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/blackSquareAlpha50.png b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/blackSquareAlpha50.png new file mode 100644 index 0000000..700b9de Binary files /dev/null and b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/blackSquareAlpha50.png differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/blackSquareAlpha50.png.meta b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/blackSquareAlpha50.png.meta new file mode 100644 index 0000000..1bd4aa0 --- /dev/null +++ b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/blackSquareAlpha50.png.meta @@ -0,0 +1,57 @@ +fileFormatVersion: 2 +guid: 87d358aa49e69b74f963678bbfa0d288 +timeCreated: 1452683148 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/blackSquareAlpha80.png b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/blackSquareAlpha80.png new file mode 100644 index 0000000..f4a47c3 Binary files /dev/null and b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/blackSquareAlpha80.png differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/blackSquareAlpha80.png.meta b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/blackSquareAlpha80.png.meta new file mode 100644 index 0000000..6f102af --- /dev/null +++ b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/blackSquareAlpha80.png.meta @@ -0,0 +1,57 @@ +fileFormatVersion: 2 +guid: 942f637ed4a036b4d8a0ead3b4271b1f +timeCreated: 1452683148 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/blueSquare.png b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/blueSquare.png new file mode 100644 index 0000000..9d8a19a Binary files /dev/null and b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/blueSquare.png differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/blueSquare.png.meta b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/blueSquare.png.meta new file mode 100644 index 0000000..1b53c58 --- /dev/null +++ b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/blueSquare.png.meta @@ -0,0 +1,57 @@ +fileFormatVersion: 2 +guid: ecfd19347394a924496a6d6d793a5f58 +timeCreated: 1452683148 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/greenSquare.png b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/greenSquare.png new file mode 100644 index 0000000..63ef49a Binary files /dev/null and b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/greenSquare.png differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/greenSquare.png.meta b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/greenSquare.png.meta new file mode 100644 index 0000000..05748f8 --- /dev/null +++ b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/greenSquare.png.meta @@ -0,0 +1,57 @@ +fileFormatVersion: 2 +guid: aa46edaa4806a01468190ebc1e797562 +timeCreated: 1452683148 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/orangeSquare.png b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/orangeSquare.png new file mode 100644 index 0000000..c272180 Binary files /dev/null and b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/orangeSquare.png differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/orangeSquare.png.meta b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/orangeSquare.png.meta new file mode 100644 index 0000000..9615ef7 --- /dev/null +++ b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/orangeSquare.png.meta @@ -0,0 +1,57 @@ +fileFormatVersion: 2 +guid: 815d51dc93583bf41877ee87d4904f12 +timeCreated: 1452683148 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/purpleSquare.png b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/purpleSquare.png new file mode 100644 index 0000000..dd219ac Binary files /dev/null and b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/purpleSquare.png differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/purpleSquare.png.meta b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/purpleSquare.png.meta new file mode 100644 index 0000000..27209e5 --- /dev/null +++ b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/purpleSquare.png.meta @@ -0,0 +1,57 @@ +fileFormatVersion: 2 +guid: 7afdea32092f47d4e8b8646ce982e582 +timeCreated: 1452683148 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/redSquare.png b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/redSquare.png new file mode 100644 index 0000000..798457f Binary files /dev/null and b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/redSquare.png differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/redSquare.png.meta b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/redSquare.png.meta new file mode 100644 index 0000000..45f905a --- /dev/null +++ b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/redSquare.png.meta @@ -0,0 +1,57 @@ +fileFormatVersion: 2 +guid: 4f330615fb8b5dd4c9c9d3ba8db73497 +timeCreated: 1452683148 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/whiteSquareAlpha15.png b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/whiteSquareAlpha15.png new file mode 100644 index 0000000..e6f3c42 Binary files /dev/null and b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/whiteSquareAlpha15.png differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/whiteSquareAlpha15.png.meta b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/whiteSquareAlpha15.png.meta new file mode 100644 index 0000000..ba54e8d --- /dev/null +++ b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/whiteSquareAlpha15.png.meta @@ -0,0 +1,57 @@ +fileFormatVersion: 2 +guid: 2bebe7c0614655142bce1fef90d49f3d +timeCreated: 1452683148 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/whiteSquareAlpha80.png b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/whiteSquareAlpha80.png new file mode 100644 index 0000000..def9ea9 Binary files /dev/null and b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/whiteSquareAlpha80.png differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/whiteSquareAlpha80.png.meta b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/whiteSquareAlpha80.png.meta new file mode 100644 index 0000000..87b195a --- /dev/null +++ b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/whiteSquareAlpha80.png.meta @@ -0,0 +1,57 @@ +fileFormatVersion: 2 +guid: 8c2726030f537aa4bac7fe24a16400a5 +timeCreated: 1452683148 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/yellowSquare.png b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/yellowSquare.png new file mode 100644 index 0000000..c41f635 Binary files /dev/null and b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/yellowSquare.png differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/yellowSquare.png.meta b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/yellowSquare.png.meta new file mode 100644 index 0000000..b2b7157 --- /dev/null +++ b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/yellowSquare.png.meta @@ -0,0 +1,57 @@ +fileFormatVersion: 2 +guid: 3213ba932c9a2d04884a27c8f6b9bba4 +timeCreated: 1452683148 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/ExternalPluginsStubs/Tk2DStubs.cs b/UnityTests.Unity5/Assets/ExternalPluginsStubs/Tk2DStubs.cs index 7f6d123..24567fd 100644 --- a/UnityTests.Unity5/Assets/ExternalPluginsStubs/Tk2DStubs.cs +++ b/UnityTests.Unity5/Assets/ExternalPluginsStubs/Tk2DStubs.cs @@ -13,6 +13,7 @@ public class tk2dSlicedSprite : tk2dBaseSprite public class tk2dTextMesh : MonoBehaviour { + public Vector3 scale; public Color color; public string text; } \ No newline at end of file diff --git a/UnityTests.Unity5/Assets/Resources/DOTweenSettings.asset b/UnityTests.Unity5/Assets/Resources/DOTweenSettings.asset index 67e23da..6eff246 100644 Binary files a/UnityTests.Unity5/Assets/Resources/DOTweenSettings.asset and b/UnityTests.Unity5/Assets/Resources/DOTweenSettings.asset differ diff --git a/UnityTests.Unity5/Assets/_Tests PRO/ExecuteInEditMode.unity b/UnityTests.Unity5/Assets/_Tests PRO/ExecuteInEditMode.unity new file mode 100644 index 0000000..309e8b1 Binary files /dev/null and b/UnityTests.Unity5/Assets/_Tests PRO/ExecuteInEditMode.unity differ diff --git a/UnityTests.Unity5/Assets/_Tests PRO/ExecuteInEditMode.unity.meta b/UnityTests.Unity5/Assets/_Tests PRO/ExecuteInEditMode.unity.meta new file mode 100644 index 0000000..5c62369 --- /dev/null +++ b/UnityTests.Unity5/Assets/_Tests PRO/ExecuteInEditMode.unity.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 328d279023fd54f44aac61377d486f42 +timeCreated: 1452682838 +licenseType: Pro +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/_Tests PRO/TempPro.unity b/UnityTests.Unity5/Assets/_Tests PRO/TempPro.unity index d6e5cf7..e8f8392 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/Basics.cs b/UnityTests.Unity5/Assets/_Tests/Basics.cs index 099e4bf..eac71cf 100644 --- a/UnityTests.Unity5/Assets/_Tests/Basics.cs +++ b/UnityTests.Unity5/Assets/_Tests/Basics.cs @@ -1,6 +1,7 @@ using DG.Tweening; using DG.Tweening.Plugins; using UnityEngine; +using UnityEngine.SceneManagement; public class Basics : BrainBase { @@ -213,9 +214,9 @@ public class Basics : BrainBase } if (GUILayout.Button("Clear & Reload")) { Debug.Log(":::::::::::: CLEAR AND RELOAD"); - int level = Application.loadedLevel; + int level = SceneManager.GetActiveScene().buildIndex; DOTween.Clear(); - Application.LoadLevel(level); + SceneManager.LoadScene(level); } GUILayout.EndHorizontal(); GUILayout.BeginHorizontal(); diff --git a/UnityTests.Unity5/Assets/_Tests/MaterialLerp.cs b/UnityTests.Unity5/Assets/_Tests/MaterialLerp.cs new file mode 100644 index 0000000..2b1447d --- /dev/null +++ b/UnityTests.Unity5/Assets/_Tests/MaterialLerp.cs @@ -0,0 +1,15 @@ +using UnityEngine; +using System.Collections; + +public class MaterialLerp : MonoBehaviour { + + // Use this for initialization + void Start () { + + } + + // Update is called once per frame + void Update () { + + } +} diff --git a/UnityTests.Unity5/Assets/_Tests/MaterialLerp.cs.meta b/UnityTests.Unity5/Assets/_Tests/MaterialLerp.cs.meta new file mode 100644 index 0000000..198f29b --- /dev/null +++ b/UnityTests.Unity5/Assets/_Tests/MaterialLerp.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 3f75a0512b693ca4f835505f55d8f273 +timeCreated: 1454675437 +licenseType: Pro +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/_Tests/MaterialLerp.unity b/UnityTests.Unity5/Assets/_Tests/MaterialLerp.unity new file mode 100644 index 0000000..247a671 Binary files /dev/null and b/UnityTests.Unity5/Assets/_Tests/MaterialLerp.unity differ diff --git a/UnityTests.Unity5/Assets/_Tests/MaterialLerp.unity.meta b/UnityTests.Unity5/Assets/_Tests/MaterialLerp.unity.meta new file mode 100644 index 0000000..cd976ce --- /dev/null +++ b/UnityTests.Unity5/Assets/_Tests/MaterialLerp.unity.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 944d8d88186f2a542bdbe8854629ce90 +timeCreated: 1454675428 +licenseType: Pro +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/_Tests/PathsFree.cs b/UnityTests.Unity5/Assets/_Tests/PathsFree.cs index 4572894..fbc0b4f 100644 --- a/UnityTests.Unity5/Assets/_Tests/PathsFree.cs +++ b/UnityTests.Unity5/Assets/_Tests/PathsFree.cs @@ -14,6 +14,7 @@ public class PathsFree : BrainBase { yield return new WaitForSeconds(1); - target.DOPath(waypoints, 3, pathType).SetOptions(closePath).SetEase(ease); + target.DOPath(waypoints, 3f, pathType).SetOptions(closePath).SetEase(ease) + .OnWaypointChange(x=> Debug.Log("CHANGE > " + x + " - " + target.position)); } } \ No newline at end of file diff --git a/UnityTests.Unity5/Assets/_Tests/TempTests.cs b/UnityTests.Unity5/Assets/_Tests/TempTests.cs index 12294a2..c2a53d5 100644 --- a/UnityTests.Unity5/Assets/_Tests/TempTests.cs +++ b/UnityTests.Unity5/Assets/_Tests/TempTests.cs @@ -4,21 +4,17 @@ using System.Collections.Generic; using System.Reflection; using DG.Tweening; using DG.Tweening.Core; +using DG.Tweening.Plugins.Options; using UnityEngine; using UnityEngine.UI; public class TempTests : BrainBase { public Transform target; - public float duration = 8; - public Ease ease; - public float amplitude = 8; - public float period = 1; - IEnumerator Start() + void Start() { - yield return new WaitForSeconds(0.5f); - - target.DOMoveY(2, duration).SetRelative().SetEase(ease, amplitude, period); + Sequence s = DOTween.Sequence() + .Append(target.DOMoveX(2, 2)); } } \ No newline at end of file diff --git a/UnityTests.Unity5/Assets/_Tests/TempTests.unity b/UnityTests.Unity5/Assets/_Tests/TempTests.unity index 4fa0681..247a671 100644 Binary files a/UnityTests.Unity5/Assets/_Tests/TempTests.unity and b/UnityTests.Unity5/Assets/_Tests/TempTests.unity differ diff --git a/UnityTests.Unity5/Assets/_Tests/_Shared Prefabs/TMP.meta b/UnityTests.Unity5/Assets/_Tests/_Shared Prefabs/TMP.meta new file mode 100644 index 0000000..d881904 --- /dev/null +++ b/UnityTests.Unity5/Assets/_Tests/_Shared Prefabs/TMP.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 20dcd93078d08024f83a27c5c9be5ba7 +folderAsset: yes +timeCreated: 1449652947 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/_Tests/_Shared Prefabs/TMP/Rotor.prefab b/UnityTests.Unity5/Assets/_Tests/_Shared Prefabs/TMP/Rotor.prefab new file mode 100644 index 0000000..211a1b5 Binary files /dev/null and b/UnityTests.Unity5/Assets/_Tests/_Shared Prefabs/TMP/Rotor.prefab differ diff --git a/UnityTests.Unity5/Assets/_Tests/_Shared Prefabs/TMP/Rotor.prefab.meta b/UnityTests.Unity5/Assets/_Tests/_Shared Prefabs/TMP/Rotor.prefab.meta new file mode 100644 index 0000000..93c6f1d --- /dev/null +++ b/UnityTests.Unity5/Assets/_Tests/_Shared Prefabs/TMP/Rotor.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: eccdddb6e130a0d43bd139ea4df171a9 +timeCreated: 1449652950 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/_Tests/_Shared Scripts/DGUtils.cs b/UnityTests.Unity5/Assets/_Tests/_Shared Scripts/DGUtils.cs index e910abb..565b138 100644 --- a/UnityTests.Unity5/Assets/_Tests/_Shared Scripts/DGUtils.cs +++ b/UnityTests.Unity5/Assets/_Tests/_Shared Scripts/DGUtils.cs @@ -1,5 +1,6 @@ using DG.Tweening; using UnityEngine; +using UnityEngine.SceneManagement; public static class DGUtils { @@ -17,7 +18,7 @@ public static class DGUtils GUILayout.BeginVertical(); GUILayout.BeginHorizontal(); - if (GUILayout.Button("RELOAD SCENE")) Application.LoadLevel(Application.loadedLevel); + if (GUILayout.Button("RELOAD SCENE")) SceneManager.LoadScene(SceneManager.GetActiveScene().buildIndex); if (GUILayout.Button("VALIDATE TWEENS")) Debug.Log("Invalid tweens found: " + DOTween.Validate()); GUILayout.EndHorizontal(); } diff --git a/UnityTests.Unity5/ProjectSettings/ClusterInputManager.asset b/UnityTests.Unity5/ProjectSettings/ClusterInputManager.asset new file mode 100644 index 0000000..aaa5770 Binary files /dev/null and b/UnityTests.Unity5/ProjectSettings/ClusterInputManager.asset differ diff --git a/UnityTests.Unity5/ProjectSettings/GraphicsSettings.asset b/UnityTests.Unity5/ProjectSettings/GraphicsSettings.asset index d75e792..c5dd1f2 100644 Binary files a/UnityTests.Unity5/ProjectSettings/GraphicsSettings.asset and b/UnityTests.Unity5/ProjectSettings/GraphicsSettings.asset differ diff --git a/UnityTests.Unity5/ProjectSettings/ProjectSettings.asset b/UnityTests.Unity5/ProjectSettings/ProjectSettings.asset index cb9c5e7..ed088b3 100644 Binary files a/UnityTests.Unity5/ProjectSettings/ProjectSettings.asset and b/UnityTests.Unity5/ProjectSettings/ProjectSettings.asset differ diff --git a/UnityTests.Unity5/ProjectSettings/ProjectVersion.txt b/UnityTests.Unity5/ProjectSettings/ProjectVersion.txt index a6bc721..961ebb9 100644 --- a/UnityTests.Unity5/ProjectSettings/ProjectVersion.txt +++ b/UnityTests.Unity5/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 5.2.3f1 +m_EditorVersion: 5.3.1f1 m_StandardAssetsVersion: 0 diff --git a/UnityTests.Unity5/ProjectSettings/UnityAnalyticsManager.asset b/UnityTests.Unity5/ProjectSettings/UnityConnectSettings.asset similarity index 84% rename from UnityTests.Unity5/ProjectSettings/UnityAnalyticsManager.asset rename to UnityTests.Unity5/ProjectSettings/UnityConnectSettings.asset index e3dbe99..ff80668 100644 Binary files a/UnityTests.Unity5/ProjectSettings/UnityAnalyticsManager.asset and b/UnityTests.Unity5/ProjectSettings/UnityConnectSettings.asset differ diff --git a/_DOTween.Assembly/DOTween/DOTween.cs b/_DOTween.Assembly/DOTween/DOTween.cs index c4eaa39..9b352af 100644 --- a/_DOTween.Assembly/DOTween/DOTween.cs +++ b/_DOTween.Assembly/DOTween/DOTween.cs @@ -32,7 +32,7 @@ namespace DG.Tweening public class DOTween { /// DOTween's version - public static readonly string Version = "1.1.145"; + public static readonly string Version = "1.1.150"; /////////////////////////////////////////////// // Options //////////////////////////////////// diff --git a/_DOTween.Assembly/DOTween/Plugins/PathPlugin.cs b/_DOTween.Assembly/DOTween/Plugins/PathPlugin.cs index 28ce495..1bb00fb 100644 --- a/_DOTween.Assembly/DOTween/Plugins/PathPlugin.cs +++ b/_DOTween.Assembly/DOTween/Plugins/PathPlugin.cs @@ -120,8 +120,17 @@ namespace DG.Tweening.Plugins if (t.isBackwards) isForward = !isForward; int newWaypointIndex = changeValue.GetWaypointIndexFromPerc(pathPerc, isForward); if (newWaypointIndex != t.miscInt) { + int prevWPIndex = t.miscInt; t.miscInt = newWaypointIndex; - if (t.onWaypointChange != null) Tween.OnTweenCallback(t.onWaypointChange, newWaypointIndex); + if (t.onWaypointChange != null) { + // If more than one waypoint changed, dispatch multiple callbacks + bool isBackwards = newWaypointIndex < prevWPIndex; + if (isBackwards) { + for (int i = prevWPIndex - 1; i > newWaypointIndex - 1; --i) Tween.OnTweenCallback(t.onWaypointChange, i); + } else { + for (int i = prevWPIndex + 1; i < newWaypointIndex + 1; ++i) Tween.OnTweenCallback(t.onWaypointChange, i); + } + } } } diff --git a/_DOTween.Assembly/bin/DOTween.dll b/_DOTween.Assembly/bin/DOTween.dll index 50affcb..72f45a8 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 1fe341a..1afa8fd 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 5f20031..401fbc4 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 0077d67..46fb1dc 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 55f4fdb..93f2147 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 75c48c1..cf650ad 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 b7578e0..11b958b 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 1f4a428..2e449cb 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 bb76a07..e441bac 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 35e0482..e062d7a 100644 Binary files a/_DOTween.Assembly/bin/Editor/DOTweenEditor.dll.mdb and b/_DOTween.Assembly/bin/Editor/DOTweenEditor.dll.mdb differ diff --git a/screenshots/assetStore/dotweenPro_assetStore_01.png b/screenshots/assetStore/dotweenPro_assetStore_01.png new file mode 100644 index 0000000..64c3e0b Binary files /dev/null and b/screenshots/assetStore/dotweenPro_assetStore_01.png differ