diff --git a/.gitignore b/.gitignore index f0b7064..83ed7eb 100644 --- a/.gitignore +++ b/.gitignore @@ -21,4 +21,5 @@ ExternalPluginsTestsAndExamples* *.Unity*/Assets/-tk2d* *.Unity*/Assets/Console*Pro* *.Unity*/Assets/Text*Mesh*Pro* -*HOPoolOperator* \ No newline at end of file +*HOPoolOperator* +zz builds \ No newline at end of file diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.XML b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.XML index 33da8e8..2f5592e 100644 --- a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.XML +++ b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.XML @@ -35,6 +35,12 @@ 2D side-scroller path + + + A surrogate for Vector2/3/4 values to work around Unity's bug when trying to cast to + a Vector2/3/4 plugin on WP8.1 + + Used internally @@ -532,29 +538,29 @@ Options for float tweens If TRUE the tween will smoothly snap all values to integers - + Options for Vector2 tweens If TRUE the tween will smoothly snap all values to integers - + Options for Vector2 tweens Selecting an axis will tween the vector only on that axis, leaving the others untouched If TRUE the tween will smoothly snap all values to integers - + Options for Vector3 tweens If TRUE the tween will smoothly snap all values to integers - + Options for Vector3 tweens Selecting an axis will tween the vector only on that axis, leaving the others untouched If TRUE the tween will smoothly snap all values to integers - + Options for Vector4 tweens If TRUE the tween will smoothly snap all values to integers - + Options for Vector4 tweens Selecting an axis will tween the vector only on that axis, leaving the others untouched If TRUE the tween will smoothly snap all values to integers @@ -1304,6 +1310,12 @@ and returns the total number of tweens involved. + + + A surrogate for Vector2/3/4 values to work around Unity's bug when trying to cast to + a Vector2/3/4 plugin on WP8.1 + + Type of path to use with DOPath tweens @@ -1484,7 +1496,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 @@ -1492,7 +1504,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 @@ -1500,7 +1512,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 @@ -1551,7 +1563,7 @@ Example usage with lambda:x=> myProperty = x The end value to reachThe tween's duration - + Tweens only one axis of a Vector3 to the given value using default plugins. A getter for the field or property to tween. Example usage with lambda:()=> myProperty @@ -1821,6 +1833,12 @@ Continuously increments the tween at the end of each loop cycle (A to B, B to B+(A-B), and so on), thus always moving "onward". In case of String tweens works only if the tween is set as relative + + + A surrogate for Vector2/3/4 values to work around Unity's bug when trying to cast to + a Vector2/3/4 plugin on WP8.1 + + Animates a single value diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll index 4d6377f..b15f08a 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 817bcd8..35fcd3f 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 58ae7f6..d15208d 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 17789d5..a578411 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 5d1cf36..e3c13e1 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 05b41ca..a6b5307 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 567a0c5..c26db7d 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 bc50b5e..a367d5f 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 718bd84..5cf138f 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 b5bc434..c4208c4 100644 Binary files a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb and b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb differ diff --git a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.XML b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.XML index 33da8e8..2f5592e 100644 --- a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.XML +++ b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.XML @@ -35,6 +35,12 @@ 2D side-scroller path + + + A surrogate for Vector2/3/4 values to work around Unity's bug when trying to cast to + a Vector2/3/4 plugin on WP8.1 + + Used internally @@ -532,29 +538,29 @@ Options for float tweens If TRUE the tween will smoothly snap all values to integers - + Options for Vector2 tweens If TRUE the tween will smoothly snap all values to integers - + Options for Vector2 tweens Selecting an axis will tween the vector only on that axis, leaving the others untouched If TRUE the tween will smoothly snap all values to integers - + Options for Vector3 tweens If TRUE the tween will smoothly snap all values to integers - + Options for Vector3 tweens Selecting an axis will tween the vector only on that axis, leaving the others untouched If TRUE the tween will smoothly snap all values to integers - + Options for Vector4 tweens If TRUE the tween will smoothly snap all values to integers - + Options for Vector4 tweens Selecting an axis will tween the vector only on that axis, leaving the others untouched If TRUE the tween will smoothly snap all values to integers @@ -1304,6 +1310,12 @@ and returns the total number of tweens involved. + + + A surrogate for Vector2/3/4 values to work around Unity's bug when trying to cast to + a Vector2/3/4 plugin on WP8.1 + + Type of path to use with DOPath tweens @@ -1484,7 +1496,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 @@ -1492,7 +1504,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 @@ -1500,7 +1512,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 @@ -1551,7 +1563,7 @@ Example usage with lambda:x=> myProperty = x The end value to reachThe tween's duration - + Tweens only one axis of a Vector3 to the given value using default plugins. A getter for the field or property to tween. Example usage with lambda:()=> myProperty @@ -1821,6 +1833,12 @@ Continuously increments the tween at the end of each loop cycle (A to B, B to B+(A-B), and so on), thus always moving "onward". In case of String tweens works only if the tween is set as relative + + + A surrogate for Vector2/3/4 values to work around Unity's bug when trying to cast to + a Vector2/3/4 plugin on WP8.1 + + Animates a single value diff --git a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.dll b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.dll index 4d6377f..b15f08a 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 817bcd8..35fcd3f 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 58ae7f6..d15208d 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 17789d5..a578411 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 5d1cf36..e3c13e1 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 05b41ca..a6b5307 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 567a0c5..c26db7d 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 bc50b5e..a367d5f 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 718bd84..5cf138f 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 b5bc434..c4208c4 100644 Binary files a/UnityTests.Unity4/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb and b/UnityTests.Unity4/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.XML b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.XML index 33da8e8..2f5592e 100644 --- a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.XML +++ b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.XML @@ -35,6 +35,12 @@ 2D side-scroller path + + + A surrogate for Vector2/3/4 values to work around Unity's bug when trying to cast to + a Vector2/3/4 plugin on WP8.1 + + Used internally @@ -532,29 +538,29 @@ Options for float tweens If TRUE the tween will smoothly snap all values to integers - + Options for Vector2 tweens If TRUE the tween will smoothly snap all values to integers - + Options for Vector2 tweens Selecting an axis will tween the vector only on that axis, leaving the others untouched If TRUE the tween will smoothly snap all values to integers - + Options for Vector3 tweens If TRUE the tween will smoothly snap all values to integers - + Options for Vector3 tweens Selecting an axis will tween the vector only on that axis, leaving the others untouched If TRUE the tween will smoothly snap all values to integers - + Options for Vector4 tweens If TRUE the tween will smoothly snap all values to integers - + Options for Vector4 tweens Selecting an axis will tween the vector only on that axis, leaving the others untouched If TRUE the tween will smoothly snap all values to integers @@ -1304,6 +1310,12 @@ and returns the total number of tweens involved. + + + A surrogate for Vector2/3/4 values to work around Unity's bug when trying to cast to + a Vector2/3/4 plugin on WP8.1 + + Type of path to use with DOPath tweens @@ -1484,7 +1496,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 @@ -1492,7 +1504,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 @@ -1500,7 +1512,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 @@ -1551,7 +1563,7 @@ Example usage with lambda:x=> myProperty = x The end value to reachThe tween's duration - + Tweens only one axis of a Vector3 to the given value using default plugins. A getter for the field or property to tween. Example usage with lambda:()=> myProperty @@ -1821,6 +1833,12 @@ Continuously increments the tween at the end of each loop cycle (A to B, B to B+(A-B), and so on), thus always moving "onward". In case of String tweens works only if the tween is set as relative + + + A surrogate for Vector2/3/4 values to work around Unity's bug when trying to cast to + a Vector2/3/4 plugin on WP8.1 + + Animates a single value diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll index 4d6377f..b15f08a 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 817bcd8..35fcd3f 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 58ae7f6..d15208d 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 17789d5..a578411 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 5d1cf36..e3c13e1 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 05b41ca..a6b5307 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 567a0c5..c26db7d 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 bc50b5e..a367d5f 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 718bd84..5cf138f 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 b5bc434..c4208c4 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/UnityVS/Editor/UnityVS.VersionSpecific.dll b/UnityTests.Unity5/Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll index a5205cd..aa9d1bb 100644 Binary files a/UnityTests.Unity5/Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll and b/UnityTests.Unity5/Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll differ diff --git a/UnityTests.Unity5/Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll.meta b/UnityTests.Unity5/Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll.meta index a3a6d5a..bcc7fff 100644 --- a/UnityTests.Unity5/Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll.meta +++ b/UnityTests.Unity5/Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 guid: 42c12149efdc035458bffa42058b9a04 -timeCreated: 1426681070 -licenseType: Pro +timeCreated: 1429055804 +licenseType: Free PluginImporter: serializedVersion: 1 iconMap: {} diff --git a/UnityTests.Unity5/Assets/_Tests/Bugs/Temp.cs b/UnityTests.Unity5/Assets/_Tests/Bugs/Temp.cs index dc31c89..890da2c 100644 --- a/UnityTests.Unity5/Assets/_Tests/Bugs/Temp.cs +++ b/UnityTests.Unity5/Assets/_Tests/Bugs/Temp.cs @@ -9,14 +9,7 @@ public class Temp : BrainBase IEnumerator Start() { - target.DOMoveX(2, 3).OnComplete(()=> { - Debug.Log("call"); - target.GetComponent().Goco(); - Debug.Log("after call"); - }); - - yield return new WaitForSeconds(1); - - target.gameObject.SetActive(false); + yield return new WaitForSeconds(0.6f); + target.DORotate(new Vector3(0,0,20f), 3f).SetRelative(); } } \ No newline at end of file diff --git a/UnityTests.Unity5/ProjectSettings/EditorBuildSettings.asset b/UnityTests.Unity5/ProjectSettings/EditorBuildSettings.asset index e469ea7..9c6420b 100644 Binary files a/UnityTests.Unity5/ProjectSettings/EditorBuildSettings.asset and b/UnityTests.Unity5/ProjectSettings/EditorBuildSettings.asset differ diff --git a/UnityTests.Unity5/ProjectSettings/ProjectSettings.asset b/UnityTests.Unity5/ProjectSettings/ProjectSettings.asset index 9727819..1bf74ea 100644 Binary files a/UnityTests.Unity5/ProjectSettings/ProjectSettings.asset and b/UnityTests.Unity5/ProjectSettings/ProjectSettings.asset differ diff --git a/Win81CompatibilityTest.Unity4/Assets/Scripts/DOTween/DOTween.XML b/Win81CompatibilityTest.Unity4/Assets/Scripts/DOTween/DOTween.XML index 21d6356..c159e43 100644 --- a/Win81CompatibilityTest.Unity4/Assets/Scripts/DOTween/DOTween.XML +++ b/Win81CompatibilityTest.Unity4/Assets/Scripts/DOTween/DOTween.XML @@ -532,29 +532,29 @@ Options for float tweens If TRUE the tween will smoothly snap all values to integers - + Options for Vector2 tweens If TRUE the tween will smoothly snap all values to integers - + Options for Vector2 tweens Selecting an axis will tween the vector only on that axis, leaving the others untouched If TRUE the tween will smoothly snap all values to integers - + Options for Vector3 tweens If TRUE the tween will smoothly snap all values to integers - + Options for Vector3 tweens Selecting an axis will tween the vector only on that axis, leaving the others untouched If TRUE the tween will smoothly snap all values to integers - + Options for Vector4 tweens If TRUE the tween will smoothly snap all values to integers - + Options for Vector4 tweens Selecting an axis will tween the vector only on that axis, leaving the others untouched If TRUE the tween will smoothly snap all values to integers @@ -918,6 +918,14 @@ Also stores the material as the tween's target so it can be used for filtered operations The end value to reachThe duration of the tween + + Tweens a Material's alpha color to the given value + (will have no effect unless your material supports transparency). + Also stores the material as the tween's target so it can be used for filtered operations + The end value to reach + The name of the material property to tween (like _Tint or _SpecColor) + The duration of the tween + Tweens a Material's named float property to the given value. Also stores the material as the tween's target so it can be used for filtered operations @@ -1476,7 +1484,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 @@ -1484,7 +1492,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 @@ -1492,7 +1500,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 @@ -1543,7 +1551,7 @@ Example usage with lambda:x=> myProperty = x The end value to reachThe tween's duration - + Tweens only one axis of a Vector3 to the given value using default plugins. A getter for the field or property to tween. Example usage with lambda:()=> myProperty @@ -2039,5 +2047,23 @@ Public only so custom shortcuts can access some of these methods + + + A surrogate for Vector2/3/4 values to work around Unity's bug when trying to cast to + a Vector2/3/4 plugin on WP8.1 + + + + + A surrogate for Vector2/3/4 values to work around Unity's bug when trying to cast to + a Vector2/3/4 plugin on WP8.1 + + + + + A surrogate for Vector2/3/4 values to work around Unity's bug when trying to cast to + a Vector2/3/4 plugin on WP8.1 + + diff --git a/Win81CompatibilityTest.Unity4/Assets/Scripts/DOTween/DOTween.dll b/Win81CompatibilityTest.Unity4/Assets/Scripts/DOTween/DOTween.dll index a07c2a1..6d3fdb0 100644 Binary files a/Win81CompatibilityTest.Unity4/Assets/Scripts/DOTween/DOTween.dll and b/Win81CompatibilityTest.Unity4/Assets/Scripts/DOTween/DOTween.dll differ diff --git a/Win81CompatibilityTest.Unity4/Assets/Scripts/DOTween/DOTween.dll.mdb b/Win81CompatibilityTest.Unity4/Assets/Scripts/DOTween/DOTween.dll.mdb index d730cef..43052ed 100644 Binary files a/Win81CompatibilityTest.Unity4/Assets/Scripts/DOTween/DOTween.dll.mdb and b/Win81CompatibilityTest.Unity4/Assets/Scripts/DOTween/DOTween.dll.mdb differ diff --git a/Win81CompatibilityTest.Unity4/Assets/Scripts/DOTween/Editor/DOTweenEditor.dll b/Win81CompatibilityTest.Unity4/Assets/Scripts/DOTween/Editor/DOTweenEditor.dll index 405fd43..21681c9 100644 Binary files a/Win81CompatibilityTest.Unity4/Assets/Scripts/DOTween/Editor/DOTweenEditor.dll and b/Win81CompatibilityTest.Unity4/Assets/Scripts/DOTween/Editor/DOTweenEditor.dll differ diff --git a/Win81CompatibilityTest.Unity4/Assets/Scripts/DOTween/Editor/DOTweenEditor.dll.mdb b/Win81CompatibilityTest.Unity4/Assets/Scripts/DOTween/Editor/DOTweenEditor.dll.mdb index 9702dbf..774012d 100644 Binary files a/Win81CompatibilityTest.Unity4/Assets/Scripts/DOTween/Editor/DOTweenEditor.dll.mdb and b/Win81CompatibilityTest.Unity4/Assets/Scripts/DOTween/Editor/DOTweenEditor.dll.mdb differ diff --git a/Win81CompatibilityTest.Unity4/Assets/Scripts/TestScene.cs b/Win81CompatibilityTest.Unity4/Assets/Scripts/TestScene.cs index ee2e535..cbe6c88 100644 --- a/Win81CompatibilityTest.Unity4/Assets/Scripts/TestScene.cs +++ b/Win81CompatibilityTest.Unity4/Assets/Scripts/TestScene.cs @@ -22,7 +22,7 @@ public class TestScene : MonoBehaviour SampleFloatClass sampleFloatClass; SampleVector3Class sampleV3Class; ISampleClass isampleClass; - Vector3Plugin dotweenV3Class; + // Vector3Plugin dotweenV3Class; ITweenPlugin idotweenClass; string testId; @@ -33,8 +33,8 @@ public class TestScene : MonoBehaviour FloatTest(); log += "\n"; Vector3Test(); - log += "\n"; - DOTweenVector3Test(); + // log += "\n"; + // DOTweenVector3Test(); log += "\n\nFIRST TEST ENDED"; log += "\n\nNOW WAITING 1 SECOND..."; @@ -53,72 +53,72 @@ public class TestScene : MonoBehaviour // DOTween.To(()=>intToTween, x=> intToTween = x, 100, 4).OnUpdate(()=> text.text = intToTween.ToString()); } - void DOTweenVector3Test() - { - testId = "DOVector3 Class AsCast:"; - try { - dotweenV3Class = new Vector3Plugin(); - log += string.Format("{0}{1} " + ((dotweenV3Class as ABSTweenPlugin) == null ? "{2}" : "{3}"), logPrefix, testId, failStr, successStr); - } catch (Exception e) { - log += string.Format("{0}{1} error > " + e.Message + "", logPrefix, testId); - } + // void DOTweenVector3Test() + // { + // testId = "DOVector3 Class AsCast:"; + // try { + // dotweenV3Class = new Vector3Plugin(); + // log += string.Format("{0}{1} " + ((dotweenV3Class as ABSTweenPlugin) == null ? "{2}" : "{3}"), logPrefix, testId, failStr, successStr); + // } catch (Exception e) { + // log += string.Format("{0}{1} error > " + e.Message + "", logPrefix, testId); + // } - testId = "DOVector3 Class AsCast (object):"; - try { - dotweenV3Class = new Vector3Plugin(); - log += string.Format("{0}{1} " + (((object)dotweenV3Class as ABSTweenPlugin) == null ? "{2}" : "{3}"), logPrefix, testId, failStr, successStr); - } catch (Exception e) { - log += string.Format("{0}{1} error > " + e.Message + "", logPrefix, testId); - } + // testId = "DOVector3 Class AsCast (object):"; + // try { + // dotweenV3Class = new Vector3Plugin(); + // log += string.Format("{0}{1} " + (((object)dotweenV3Class as ABSTweenPlugin) == null ? "{2}" : "{3}"), logPrefix, testId, failStr, successStr); + // } catch (Exception e) { + // log += string.Format("{0}{1} error > " + e.Message + "", logPrefix, testId); + // } - testId = "DOVector3 Class PrefCast:"; - try { - dotweenV3Class = new Vector3Plugin(); - log += string.Format("{0}{1} " + ((ABSTweenPlugin)dotweenV3Class == null ? "{2}" : "{3}"), logPrefix, testId, failStr, successStr); - } catch (Exception e) { - log += string.Format("{0}{1} error > " + e.Message + "", logPrefix, testId); - } + // testId = "DOVector3 Class PrefCast:"; + // try { + // dotweenV3Class = new Vector3Plugin(); + // log += string.Format("{0}{1} " + ((ABSTweenPlugin)dotweenV3Class == null ? "{2}" : "{3}"), logPrefix, testId, failStr, successStr); + // } catch (Exception e) { + // log += string.Format("{0}{1} error > " + e.Message + "", logPrefix, testId); + // } - testId = "DOVector3 Class PrefCast (object):"; - try { - dotweenV3Class = new Vector3Plugin(); - log += string.Format("{0}{1} " + ((ABSTweenPlugin)((object)dotweenV3Class) == null ? "{2}" : "{3}"), logPrefix, testId, failStr, successStr); - } catch (Exception e) { - log += string.Format("{0}{1} error > " + e.Message + "", logPrefix, testId); - } + // testId = "DOVector3 Class PrefCast (object):"; + // try { + // dotweenV3Class = new Vector3Plugin(); + // log += string.Format("{0}{1} " + ((ABSTweenPlugin)((object)dotweenV3Class) == null ? "{2}" : "{3}"), logPrefix, testId, failStr, successStr); + // } catch (Exception e) { + // log += string.Format("{0}{1} error > " + e.Message + "", logPrefix, testId); + // } - testId = "DOVector3 Interface AsCast:"; - try { - idotweenClass = new Vector3Plugin(); - log += string.Format("{0}{1} " + ((idotweenClass as ABSTweenPlugin) == null ? "{2}" : "{3}"), logPrefix, testId, failStr, successStr); - } catch (Exception e) { - log += string.Format("{0}{1} error > " + e.Message + "", logPrefix, testId); - } + // testId = "DOVector3 Interface AsCast:"; + // try { + // idotweenClass = new Vector3Plugin(); + // log += string.Format("{0}{1} " + ((idotweenClass as ABSTweenPlugin) == null ? "{2}" : "{3}"), logPrefix, testId, failStr, successStr); + // } catch (Exception e) { + // log += string.Format("{0}{1} error > " + e.Message + "", logPrefix, testId); + // } - testId = "DOVector3 Interface AsCast (object):"; - try { - idotweenClass = new Vector3Plugin(); - log += string.Format("{0}{1} " + (((object)idotweenClass as ABSTweenPlugin) == null ? "{2}" : "{3}"), logPrefix, testId, failStr, successStr); - } catch (Exception e) { - log += string.Format("{0}{1} error > " + e.Message + "", logPrefix, testId); - } + // testId = "DOVector3 Interface AsCast (object):"; + // try { + // idotweenClass = new Vector3Plugin(); + // log += string.Format("{0}{1} " + (((object)idotweenClass as ABSTweenPlugin) == null ? "{2}" : "{3}"), logPrefix, testId, failStr, successStr); + // } catch (Exception e) { + // log += string.Format("{0}{1} error > " + e.Message + "", logPrefix, testId); + // } - testId = "DOVector3 Interface PrefCast:"; - try { - idotweenClass = new Vector3Plugin(); - log += string.Format("{0}{1} " + ((ABSTweenPlugin)idotweenClass == null ? "{2}" : "{3}"), logPrefix, testId, failStr, successStr); - } catch (Exception e) { - log += string.Format("{0}{1} error > " + e.Message + "", logPrefix, testId); - } + // testId = "DOVector3 Interface PrefCast:"; + // try { + // idotweenClass = new Vector3Plugin(); + // log += string.Format("{0}{1} " + ((ABSTweenPlugin)idotweenClass == null ? "{2}" : "{3}"), logPrefix, testId, failStr, successStr); + // } catch (Exception e) { + // log += string.Format("{0}{1} error > " + e.Message + "", logPrefix, testId); + // } - testId = "DOVector3 Interface PrefCast (object):"; - try { - idotweenClass = new Vector3Plugin(); - log += string.Format("{0}{1} " + ((ABSTweenPlugin)((object)idotweenClass) == null ? "{2}" : "{3}"), logPrefix, testId, failStr, successStr); - } catch (Exception e) { - log += string.Format("{0}{1} error > " + e.Message + "", logPrefix, testId); - } - } + // testId = "DOVector3 Interface PrefCast (object):"; + // try { + // idotweenClass = new Vector3Plugin(); + // log += string.Format("{0}{1} " + ((ABSTweenPlugin)((object)idotweenClass) == null ? "{2}" : "{3}"), logPrefix, testId, failStr, successStr); + // } catch (Exception e) { + // log += string.Format("{0}{1} error > " + e.Message + "", logPrefix, testId); + // } + // } void Vector3Test() { diff --git a/Win81CompatibilityTest.unitypackage b/Win81CompatibilityTest.unitypackage index 6044364..b5824f0 100644 Binary files a/Win81CompatibilityTest.unitypackage and b/Win81CompatibilityTest.unitypackage differ diff --git a/_DOTween.Assembly/DOTween/Core/Surrogates/Vector2Surrogate.cs b/_DOTween.Assembly/DOTween/Core/Surrogates/Vector2Surrogate.cs index 844c60a..ab03771 100644 --- a/_DOTween.Assembly/DOTween/Core/Surrogates/Vector2Surrogate.cs +++ b/_DOTween.Assembly/DOTween/Core/Surrogates/Vector2Surrogate.cs @@ -47,9 +47,14 @@ namespace DG.Tweening.Core.Surrogates #region Conversions - public static explicit operator Vector3(Vector2Surrogate v) + public static implicit operator Vector2(Vector2Surrogate v) { - return new Vector3(v.x, v.y); + return new Vector2(v.x, v.y); + } + + public static implicit operator Vector2Surrogate(Vector2 v) + { + return new Vector2Surrogate(v.x, v.y); } #endregion diff --git a/_DOTween.Assembly/DOTween/Core/Surrogates/Vector3Surrogate.cs b/_DOTween.Assembly/DOTween/Core/Surrogates/Vector3Surrogate.cs index 0ec9c8f..8e72183 100644 --- a/_DOTween.Assembly/DOTween/Core/Surrogates/Vector3Surrogate.cs +++ b/_DOTween.Assembly/DOTween/Core/Surrogates/Vector3Surrogate.cs @@ -15,6 +15,10 @@ namespace DG.Tweening.Core.Surrogates { public float x, y, z; + public static Vector3Surrogate zero { + get { return new Vector3Surrogate(0, 0, 0); } + } + public float magnitude { get { return Mathf.Sqrt(x * x + y * y + z * z); } } @@ -48,11 +52,16 @@ namespace DG.Tweening.Core.Surrogates #region Conversions - public static explicit operator Vector3(Vector3Surrogate v) + public static implicit operator Vector3(Vector3Surrogate v) { return new Vector3(v.x, v.y, v.z); } + public static implicit operator Vector3Surrogate(Vector3 v) + { + return new Vector3Surrogate(v.x, v.y, v.z); + } + #endregion } } diff --git a/_DOTween.Assembly/DOTween/Core/Surrogates/Vector4Surrogate.cs b/_DOTween.Assembly/DOTween/Core/Surrogates/Vector4Surrogate.cs index 1c29b17..44eaa1f 100644 --- a/_DOTween.Assembly/DOTween/Core/Surrogates/Vector4Surrogate.cs +++ b/_DOTween.Assembly/DOTween/Core/Surrogates/Vector4Surrogate.cs @@ -87,21 +87,26 @@ namespace DG.Tweening.Core.Surrogates #region Conversions -// public static explicit operator Vector2(Vector4Surrogate v) +// public static implicit operator Vector2(Vector4Surrogate v) // { // return new Vector2(v.x, v.y); // } // -// public static explicit operator Vector3(Vector4Surrogate v) +// public static implicit operator Vector3(Vector4Surrogate v) // { // return new Vector3(v.x, v.y, v.z); // } - public static explicit operator Vector4(Vector4Surrogate v) + public static implicit operator Vector4(Vector4Surrogate v) { return new Vector4(v.x, v.y, v.z, v.w); } + public static implicit operator Vector4Surrogate(Vector4 v) + { + return new Vector4Surrogate(v.x, v.y, v.z, v.w); + } + #endregion } } diff --git a/_DOTween.Assembly/DOTween/DOTween.cs b/_DOTween.Assembly/DOTween/DOTween.cs index 7ae6851..8ee57ba 100644 --- a/_DOTween.Assembly/DOTween/DOTween.cs +++ b/_DOTween.Assembly/DOTween/DOTween.cs @@ -4,6 +4,9 @@ // License Copyright (c) Daniele Giardini. // This work is subject to the terms at http://dotween.demigiant.com/license.php +#if WP81 +using DG.Tweening.Core.Surrogates; +#endif using System; using System.Collections; using System.Collections.Generic; @@ -21,7 +24,7 @@ namespace DG.Tweening public class DOTween { /// DOTween's version - public static readonly string Version = "1.0.490"; + public static readonly string Version = "1.0.510"; /////////////////////////////////////////////// // Options //////////////////////////////////// @@ -304,24 +307,39 @@ namespace DG.Tweening /// A setter for the field or property to tween /// Example usage with lambda:x=> myProperty = x /// The end value to reachThe tween's duration +#if WP81 + public static TweenerCore To(DOGetter getter, DOSetter setter, Vector2 endValue, float duration) + { return ApplyTo(getter, setter, endValue, duration); } +#else public static TweenerCore To(DOGetter getter, DOSetter setter, Vector2 endValue, float duration) { return ApplyTo(getter, setter, endValue, duration); } +#endif /// 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 /// A setter for the field or property to tween /// Example usage with lambda:x=> myProperty = x /// The end value to reachThe tween's duration +#if WP81 + public static TweenerCore To(DOGetter getter, DOSetter setter, Vector3 endValue, float duration) + { return ApplyTo(getter, setter, endValue, duration); } +#else public static TweenerCore To(DOGetter getter, DOSetter setter, Vector3 endValue, float duration) { return ApplyTo(getter, setter, endValue, duration); } +#endif /// 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 /// A setter for the field or property to tween /// Example usage with lambda:x=> myProperty = x /// The end value to reachThe tween's duration +#if WP81 + public static TweenerCore To(DOGetter getter, DOSetter setter, Vector4 endValue, float duration) + { return ApplyTo(getter, setter, endValue, duration); } +#else public static TweenerCore To(DOGetter getter, DOSetter setter, Vector4 endValue, float duration) { return ApplyTo(getter, setter, endValue, duration); } +#endif /// 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 @@ -377,12 +395,21 @@ namespace DG.Tweening /// Example usage with lambda:x=> myProperty = x /// The end value to reachThe tween's duration /// The axis to tween +#if WP81 + public static TweenerCore ToAxis(DOGetter getter, DOSetter setter, float endValue, float duration, AxisConstraint axisConstraint = AxisConstraint.X) + { + TweenerCore t = ApplyTo(getter, setter, new Vector3Surrogate(endValue, endValue, endValue), duration); + t.plugOptions.axisConstraint = axisConstraint; + return t; + } +#else public static TweenerCore ToAxis(DOGetter getter, DOSetter setter, float endValue, float duration, AxisConstraint axisConstraint = AxisConstraint.X) { TweenerCore t = ApplyTo(getter, setter, new Vector3(endValue, endValue, endValue), duration); t.plugOptions.axisConstraint = axisConstraint; return t; } +#endif /// Tweens only the alpha of a Color to the given value using default plugins /// A getter for the field or property to tween. /// Example usage with lambda:()=> myProperty diff --git a/_DOTween.Assembly/DOTween/DOTween.csproj b/_DOTween.Assembly/DOTween/DOTween.csproj index c2cb172..75ccfbf 100644 --- a/_DOTween.Assembly/DOTween/DOTween.csproj +++ b/_DOTween.Assembly/DOTween/DOTween.csproj @@ -71,6 +71,8 @@ + + @@ -88,6 +90,7 @@ + @@ -96,6 +99,7 @@ + diff --git a/_DOTween.Assembly/DOTween/Plugins/Core/PluginsManager.cs b/_DOTween.Assembly/DOTween/Plugins/Core/PluginsManager.cs index 2758a3d..9b0dd59 100644 --- a/_DOTween.Assembly/DOTween/Plugins/Core/PluginsManager.cs +++ b/_DOTween.Assembly/DOTween/Plugins/Core/PluginsManager.cs @@ -4,10 +4,12 @@ // License Copyright (c) Daniele Giardini. // This work is subject to the terms at http://dotween.demigiant.com/license.php +#if WP81 +using DG.Tweening.Core.Surrogates; +#endif using System; using System.Collections.Generic; using DG.Tweening.Core; -using DG.Tweening.Plugins.Options; using UnityEngine; namespace DG.Tweening.Plugins.Core @@ -43,7 +45,15 @@ namespace DG.Tweening.Plugins.Core Type t1 = typeof(T1); Type t2 = typeof(T2); ITweenPlugin plugin = null; - +#if WP81 + if (t1 == typeof(Vector3Surrogate) && t1 == t2) { + if (_vector3Plugin == null) _vector3Plugin = new Vector3SurrogatePlugin(); + plugin = _vector3Plugin; + } else if (t1 == typeof(Vector3) && t2 == typeof(Vector3[])) { + if (_vector3ArrayPlugin == null) _vector3ArrayPlugin = new Vector3ArrayPlugin(); + plugin = _vector3ArrayPlugin; + } +#else if (t1 == typeof(Vector3)) { if (t1 == t2) { if (_vector3Plugin == null) _vector3Plugin = new Vector3Plugin(); @@ -52,16 +62,27 @@ namespace DG.Tweening.Plugins.Core if (_vector3ArrayPlugin == null) _vector3ArrayPlugin = new Vector3ArrayPlugin(); plugin = _vector3ArrayPlugin; } - } else if (t1 == typeof(Quaternion)) { + } +#endif + else if (t1 == typeof(Quaternion)) { if (t2 == typeof(Quaternion)) Debugger.LogError("Quaternion tweens require a Vector3 endValue"); else { if (_quaternionPlugin == null) _quaternionPlugin = new QuaternionPlugin(); plugin = _quaternionPlugin; } - } else if (t1 == typeof(Vector2)) { + } +#if WP81 + else if (t1 == typeof(Vector2Surrogate)) { + if (_vector2Plugin == null) _vector2Plugin = new Vector2SurrogatePlugin(); + plugin = _vector2Plugin; + } +#else + else if (t1 == typeof(Vector2)) { if (_vector2Plugin == null) _vector2Plugin = new Vector2Plugin(); plugin = _vector2Plugin; - } else if (t1 == typeof(float)) { + } +#endif + else if (t1 == typeof(float)) { if (_floatPlugin == null) _floatPlugin = new FloatPlugin(); plugin = _floatPlugin; } else if (t1 == typeof(Color)) { @@ -70,10 +91,19 @@ namespace DG.Tweening.Plugins.Core } else if (t1 == typeof(int)) { if (_intPlugin == null) _intPlugin = new IntPlugin(); plugin = _intPlugin; - } else if (t1 == typeof(Vector4)) { + } +#if WP81 + else if (t1 == typeof(Vector4Surrogate)) { + if (_vector4Plugin == null) _vector4Plugin = new Vector4SurrogatePlugin(); + plugin = _vector4Plugin; + } +#else + else if (t1 == typeof(Vector4)) { if (_vector4Plugin == null) _vector4Plugin = new Vector4Plugin(); plugin = _vector4Plugin; - } else if (t1 == typeof(Rect)) { + } +#endif + else if (t1 == typeof(Rect)) { if (_rectPlugin == null) _rectPlugin = new RectPlugin(); plugin = _rectPlugin; } else if (t1 == typeof(RectOffset)) { diff --git a/_DOTween.Assembly/DOTween/Plugins/Vector2Plugin.cs b/_DOTween.Assembly/DOTween/Plugins/Vector2Plugin.cs index d34f95b..b3c664d 100644 --- a/_DOTween.Assembly/DOTween/Plugins/Vector2Plugin.cs +++ b/_DOTween.Assembly/DOTween/Plugins/Vector2Plugin.cs @@ -1,4 +1,5 @@ -// Author: Daniele Giardini - http://www.demigiant.com +#if !WP81 +// Author: Daniele Giardini - http://www.demigiant.com // Created: 2014/07/10 16:51 // // License Copyright (c) Daniele Giardini. @@ -106,4 +107,5 @@ namespace DG.Tweening.Plugins } } } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/_DOTween.Assembly/DOTween/Plugins/Vector3Plugin.cs b/_DOTween.Assembly/DOTween/Plugins/Vector3Plugin.cs index 349e2b2..df65b2f 100644 --- a/_DOTween.Assembly/DOTween/Plugins/Vector3Plugin.cs +++ b/_DOTween.Assembly/DOTween/Plugins/Vector3Plugin.cs @@ -1,4 +1,5 @@ -// Author: Daniele Giardini - http://www.demigiant.com +#if !WP81 +// Author: Daniele Giardini - http://www.demigiant.com // Created: 2014/05/06 19:35 // // License Copyright (c) Daniele Giardini. @@ -121,4 +122,5 @@ namespace DG.Tweening.Plugins } } } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/_DOTween.Assembly/DOTween/Plugins/Vector4Plugin.cs b/_DOTween.Assembly/DOTween/Plugins/Vector4Plugin.cs index 3b30fa6..2b73206 100644 --- a/_DOTween.Assembly/DOTween/Plugins/Vector4Plugin.cs +++ b/_DOTween.Assembly/DOTween/Plugins/Vector4Plugin.cs @@ -1,4 +1,5 @@ -// Author: Daniele Giardini - http://www.demigiant.com +#if !WP81 +// Author: Daniele Giardini - http://www.demigiant.com // Created: 2014/07/10 16:53 // // License Copyright (c) Daniele Giardini. @@ -136,4 +137,5 @@ namespace DG.Tweening.Plugins } } } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/_DOTween.Assembly/DOTween/ShortcutExtensions.cs b/_DOTween.Assembly/DOTween/ShortcutExtensions.cs index 9006aa1..0a09ba5 100644 --- a/_DOTween.Assembly/DOTween/ShortcutExtensions.cs +++ b/_DOTween.Assembly/DOTween/ShortcutExtensions.cs @@ -4,6 +4,9 @@ // License Copyright (c) Daniele Giardini. // This work is subject to the terms at http://dotween.demigiant.com/license.php +#if WP81 +using DG.Tweening.Core.Surrogates; +#endif using System.Collections.Generic; using DG.Tweening.Core; using DG.Tweening.Core.Enums; @@ -235,7 +238,11 @@ namespace DG.Tweening /// If TRUE the tween will smoothly snap all values to integers public static Tweener DOMove(this Rigidbody target, Vector3 endValue, float duration, bool snapping = false) { +#if WP81 + return DOTween.To(() => target.position, x=> target.MovePosition(x), endValue, duration) +#else return DOTween.To(() => target.position, target.MovePosition, endValue, duration) +#endif .SetOptions(snapping).SetTarget(target); } @@ -245,7 +252,11 @@ namespace DG.Tweening /// If TRUE the tween will smoothly snap all values to integers public static Tweener DOMoveX(this Rigidbody target, float endValue, float duration, bool snapping = false) { +#if WP81 + return DOTween.To(() => target.position, x => target.MovePosition(x), new Vector3(endValue, 0, 0), duration) +#else return DOTween.To(() => target.position, target.MovePosition, new Vector3(endValue, 0, 0), duration) +#endif .SetOptions(AxisConstraint.X, snapping).SetTarget(target); } @@ -255,7 +266,11 @@ namespace DG.Tweening /// If TRUE the tween will smoothly snap all values to integers public static Tweener DOMoveY(this Rigidbody target, float endValue, float duration, bool snapping = false) { +#if WP81 + return DOTween.To(() => target.position, x => target.MovePosition(x), new Vector3(0, endValue, 0), duration) +#else return DOTween.To(() => target.position, target.MovePosition, new Vector3(0, endValue, 0), duration) +#endif .SetOptions(AxisConstraint.Y, snapping).SetTarget(target); } @@ -265,7 +280,11 @@ namespace DG.Tweening /// If TRUE the tween will smoothly snap all values to integers public static Tweener DOMoveZ(this Rigidbody target, float endValue, float duration, bool snapping = false) { +#if WP81 + return DOTween.To(() => target.position, x => target.MovePosition(x), new Vector3(0, 0, endValue), duration) +#else return DOTween.To(() => target.position, target.MovePosition, new Vector3(0, 0, endValue), duration) +#endif .SetOptions(AxisConstraint.Z, snapping).SetTarget(target); } @@ -674,12 +693,21 @@ namespace DG.Tweening /// If TRUE the tween will smoothly snap all values to integers public static Tweener DOBlendableMoveBy(this Transform target, Vector3 byValue, float duration, bool snapping = false) { +#if WP81 + Vector3Surrogate to = Vector3Surrogate.zero; + return DOTween.To(() => to, x => { + Vector3 diff = x - to; + to = x; + target.position += diff; + }, byValue, duration) +#else Vector3 to = Vector3.zero; return DOTween.To(() => to, x => { Vector3 diff = x - to; to = x; target.position += diff; }, byValue, duration) +#endif .Blendable().SetOptions(snapping).SetTarget(target); } @@ -691,12 +719,21 @@ namespace DG.Tweening /// If TRUE the tween will smoothly snap all values to integers public static Tweener DOBlendableLocalMoveBy(this Transform target, Vector3 byValue, float duration, bool snapping = false) { +#if WP81 + Vector3Surrogate to = Vector3Surrogate.zero; + return DOTween.To(() => to, x => { + Vector3 diff = x - to; + to = x; + target.localPosition += diff; + }, byValue, duration) +#else Vector3 to = Vector3.zero; return DOTween.To(() => to, x => { Vector3 diff = x - to; to = x; target.localPosition += diff; }, byValue, duration) +#endif .Blendable().SetOptions(snapping).SetTarget(target); } @@ -745,12 +782,21 @@ namespace DG.Tweening /// The value to tween byThe duration of the tween public static Tweener DOBlendableScaleBy(this Transform target, Vector3 byValue, float duration) { +#if WP81 + Vector3Surrogate to = Vector3Surrogate.zero; + return DOTween.To(() => to, x => { + Vector3 diff = x - to; + to = x; + target.localScale += diff; + }, byValue, duration) +#else Vector3 to = Vector3.zero; return DOTween.To(() => to, x => { Vector3 diff = x - to; to = x; target.localScale += diff; }, byValue, duration) +#endif .Blendable().SetTarget(target); } diff --git a/_DOTween.Assembly/DOTween/TweenSettingsExtensions.cs b/_DOTween.Assembly/DOTween/TweenSettingsExtensions.cs index bcd3fdf..3ca3b4b 100644 --- a/_DOTween.Assembly/DOTween/TweenSettingsExtensions.cs +++ b/_DOTween.Assembly/DOTween/TweenSettingsExtensions.cs @@ -4,6 +4,9 @@ // License Copyright (c) Daniele Giardini. // This work is subject to the terms at http://dotween.demigiant.com/license.php +#if WP81 +using DG.Tweening.Core.Surrogates; +#endif using DG.Tweening.Core; using DG.Tweening.Core.Easing; using DG.Tweening.Plugins; @@ -581,7 +584,11 @@ namespace DG.Tweening /// Options for Vector2 tweens /// If TRUE the tween will smoothly snap all values to integers +#if WP81 + public static Tweener SetOptions(this TweenerCore t, bool snapping) +#else public static Tweener SetOptions(this TweenerCore t, bool snapping) +#endif { if (t == null || !t.active) return t; @@ -591,7 +598,11 @@ namespace DG.Tweening /// Options for Vector2 tweens /// Selecting an axis will tween the vector only on that axis, leaving the others untouched /// If TRUE the tween will smoothly snap all values to integers +#if WP81 + public static Tweener SetOptions(this TweenerCore t, AxisConstraint axisConstraint, bool snapping = false) +#else public static Tweener SetOptions(this TweenerCore t, AxisConstraint axisConstraint, bool snapping = false) +#endif { if (t == null || !t.active) return t; @@ -602,7 +613,11 @@ namespace DG.Tweening /// Options for Vector3 tweens /// If TRUE the tween will smoothly snap all values to integers +#if WP81 + public static Tweener SetOptions(this TweenerCore t, bool snapping) +#else public static Tweener SetOptions(this TweenerCore t, bool snapping) +#endif { if (t == null || !t.active) return t; @@ -612,7 +627,11 @@ namespace DG.Tweening /// Options for Vector3 tweens /// Selecting an axis will tween the vector only on that axis, leaving the others untouched /// If TRUE the tween will smoothly snap all values to integers +#if WP81 + public static Tweener SetOptions(this TweenerCore t, AxisConstraint axisConstraint, bool snapping = false) +#else public static Tweener SetOptions(this TweenerCore t, AxisConstraint axisConstraint, bool snapping = false) +#endif { if (t == null || !t.active) return t; @@ -623,7 +642,11 @@ namespace DG.Tweening /// Options for Vector4 tweens /// If TRUE the tween will smoothly snap all values to integers +#if WP81 + public static Tweener SetOptions(this TweenerCore t, bool snapping) +#else public static Tweener SetOptions(this TweenerCore t, bool snapping) +#endif { if (t == null || !t.active) return t; @@ -633,7 +656,11 @@ namespace DG.Tweening /// Options for Vector4 tweens /// Selecting an axis will tween the vector only on that axis, leaving the others untouched /// If TRUE the tween will smoothly snap all values to integers +#if WP81 + public static Tweener SetOptions(this TweenerCore t, AxisConstraint axisConstraint, bool snapping = false) +#else public static Tweener SetOptions(this TweenerCore t, AxisConstraint axisConstraint, bool snapping = false) +#endif { if (t == null || !t.active) return t; diff --git a/_DOTween.Assembly/DOTween/Tweener.cs b/_DOTween.Assembly/DOTween/Tweener.cs index a0bcffe..04c488e 100644 --- a/_DOTween.Assembly/DOTween/Tweener.cs +++ b/_DOTween.Assembly/DOTween/Tweener.cs @@ -78,7 +78,7 @@ namespace DG.Tweening if (t.tweenPlugin == null) t.tweenPlugin = PluginsManager.GetDefaultPlugin(); if (t.tweenPlugin == null) { // No suitable plugin found. Kill - Debugger.LogError("No suitable plugin found for this type"); + Debugger.LogError(string.Format("No suitable plugin found for this type (<{0}, {1}, {2}>)", typeof(T1), typeof(T2), typeof(TPlugOptions))); return false; } // WP8.1 fix tries diff --git a/_DOTween.Assembly/DOTween43/DOTween43.csproj b/_DOTween.Assembly/DOTween43/DOTween43.csproj index 1edc18e..8bd78ed 100644 --- a/_DOTween.Assembly/DOTween43/DOTween43.csproj +++ b/_DOTween.Assembly/DOTween43/DOTween43.csproj @@ -36,7 +36,7 @@ ..\bin\ - TRACE + TRACE;WP81 ..\bin\DOTween43.xml true 1573 diff --git a/_DOTween.Assembly/DOTween43/ShortcutExtensions.cs b/_DOTween.Assembly/DOTween43/ShortcutExtensions.cs index 5ad489b..d419ba8 100644 --- a/_DOTween.Assembly/DOTween43/ShortcutExtensions.cs +++ b/_DOTween.Assembly/DOTween43/ShortcutExtensions.cs @@ -46,7 +46,11 @@ namespace DG.Tweening /// If TRUE the tween will smoothly snap all values to integers public static Tweener DOMove(this Rigidbody2D target, Vector2 endValue, float duration, bool snapping = false) { +#if WP81 + return DOTween.To(() => target.position, x=> target.MovePosition(x), endValue, duration) +#else return DOTween.To(() => target.position, target.MovePosition, endValue, duration) +#endif .SetOptions(snapping).SetTarget(target); } @@ -56,7 +60,11 @@ namespace DG.Tweening /// If TRUE the tween will smoothly snap all values to integers public static Tweener DOMoveX(this Rigidbody2D target, float endValue, float duration, bool snapping = false) { +#if WP81 + return DOTween.To(() => target.position, x => target.MovePosition(x), new Vector2(endValue, 0), duration) +#else return DOTween.To(() => target.position, target.MovePosition, new Vector2(endValue, 0), duration) +#endif .SetOptions(AxisConstraint.X, snapping).SetTarget(target); } @@ -66,7 +74,11 @@ namespace DG.Tweening /// If TRUE the tween will smoothly snap all values to integers public static Tweener DOMoveY(this Rigidbody2D target, float endValue, float duration, bool snapping = false) { +#if WP81 + return DOTween.To(() => target.position, x => target.MovePosition(x), new Vector2(0, endValue), duration) +#else return DOTween.To(() => target.position, target.MovePosition, new Vector2(0, endValue), duration) +#endif .SetOptions(AxisConstraint.Y, snapping).SetTarget(target); } diff --git a/_DOTween.Assembly/DOTweenEditor/DOTweenEditor.csproj b/_DOTween.Assembly/DOTweenEditor/DOTweenEditor.csproj index 2aa56f2..4a9fddf 100644 --- a/_DOTween.Assembly/DOTweenEditor/DOTweenEditor.csproj +++ b/_DOTween.Assembly/DOTweenEditor/DOTweenEditor.csproj @@ -36,7 +36,7 @@ ..\bin\Editor\ - TRACE + TRACE;WP81 ..\bin\Editor\DOTweenEditor.XML true 1591 diff --git a/_DOTween.Assembly/DOTweenEditor/DOTweenUtilityWindow.cs b/_DOTween.Assembly/DOTweenEditor/DOTweenUtilityWindow.cs index 3d93716..ed11b98 100644 --- a/_DOTween.Assembly/DOTweenEditor/DOTweenUtilityWindow.cs +++ b/_DOTween.Assembly/DOTweenEditor/DOTweenUtilityWindow.cs @@ -80,7 +80,11 @@ namespace DG.DOTweenEditor void OnEnable() { +#if WP81 + _innerTitle = "DOTween v" + DOTween.Version + (DOTween.isDebugBuild ? " [Debug WP8.1 build]" : " [Release WP8.1 build]"); +#else _innerTitle = "DOTween v" + DOTween.Version + (DOTween.isDebugBuild ? " [Debug build]" : " [Release build]"); +#endif if (EditorUtils.hasPro) _innerTitle += "\nDOTweenPro v" + EditorUtils.proVersion; else _innerTitle += "\nDOTweenPro not installed"; diff --git a/_DOTween.Assembly/bin/DOTween.XML b/_DOTween.Assembly/bin/DOTween.XML index 33da8e8..2f5592e 100644 --- a/_DOTween.Assembly/bin/DOTween.XML +++ b/_DOTween.Assembly/bin/DOTween.XML @@ -35,6 +35,12 @@ 2D side-scroller path + + + A surrogate for Vector2/3/4 values to work around Unity's bug when trying to cast to + a Vector2/3/4 plugin on WP8.1 + + Used internally @@ -532,29 +538,29 @@ Options for float tweens If TRUE the tween will smoothly snap all values to integers - + Options for Vector2 tweens If TRUE the tween will smoothly snap all values to integers - + Options for Vector2 tweens Selecting an axis will tween the vector only on that axis, leaving the others untouched If TRUE the tween will smoothly snap all values to integers - + Options for Vector3 tweens If TRUE the tween will smoothly snap all values to integers - + Options for Vector3 tweens Selecting an axis will tween the vector only on that axis, leaving the others untouched If TRUE the tween will smoothly snap all values to integers - + Options for Vector4 tweens If TRUE the tween will smoothly snap all values to integers - + Options for Vector4 tweens Selecting an axis will tween the vector only on that axis, leaving the others untouched If TRUE the tween will smoothly snap all values to integers @@ -1304,6 +1310,12 @@ and returns the total number of tweens involved. + + + A surrogate for Vector2/3/4 values to work around Unity's bug when trying to cast to + a Vector2/3/4 plugin on WP8.1 + + Type of path to use with DOPath tweens @@ -1484,7 +1496,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 @@ -1492,7 +1504,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 @@ -1500,7 +1512,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 @@ -1551,7 +1563,7 @@ Example usage with lambda:x=> myProperty = x The end value to reachThe tween's duration - + Tweens only one axis of a Vector3 to the given value using default plugins. A getter for the field or property to tween. Example usage with lambda:()=> myProperty @@ -1821,6 +1833,12 @@ Continuously increments the tween at the end of each loop cycle (A to B, B to B+(A-B), and so on), thus always moving "onward". In case of String tweens works only if the tween is set as relative + + + A surrogate for Vector2/3/4 values to work around Unity's bug when trying to cast to + a Vector2/3/4 plugin on WP8.1 + + Animates a single value diff --git a/_DOTween.Assembly/bin/DOTween.dll b/_DOTween.Assembly/bin/DOTween.dll index 4d6377f..b15f08a 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 817bcd8..35fcd3f 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 58ae7f6..d15208d 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 17789d5..a578411 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 5d1cf36..e3c13e1 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 05b41ca..a6b5307 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 567a0c5..c26db7d 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 bc50b5e..a367d5f 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 718bd84..5cf138f 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 b5bc434..c4208c4 100644 Binary files a/_DOTween.Assembly/bin/Editor/DOTweenEditor.dll.mdb and b/_DOTween.Assembly/bin/Editor/DOTweenEditor.dll.mdb differ