merge in develop and encrypt credentials

Author: mediumTaj

Config.json.enc

@@ -26,7 +26,7 @@ public class ExampleDocumentConversion : MonoBehaviour
 
   void Start()
   {
-    LogSystem.InstallDefaultReactors(); LogSystem.InstallDefaultReactors();
+    LogSystem.InstallDefaultReactors(); 
     string examplePath = Application.dataPath + "/Watson/Examples/ServiceExamples/TestData/watson_beats_jeopardy.html";
 
     if (!m_DocumentConversion.ConvertDocument(OnConvertDocument, examplePath, ConversionTarget.NORMALIZED_TEXT))

Examples/ServiceExamples/Scripts/ExampleDocumentConversion.cs

@@ -18,4 +18,4 @@ Be sure a microphone is connected and enabled on your computer. Play the scene i
 [text_to_speech]: http://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/doc/text-to-speech/
 [language_translation]: http://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/doc/language-translation/
 [dialog]: http://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/doc/dialog/
-[natural_language_classifier]: http://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/doc/nl-classifier/
+[natural_language_classifier]: http://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/doc/natural-language-classifier/index.html

Examples/WidgetExamples/README.md

@@ -5,20 +5,20 @@ GameObject:
   m_ObjectHideFlags: 0
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 4
+  serializedVersion: 5
   m_Component:
-  - 4: {fileID: 456440}
-  - 114: {fileID: 11447296}
-  - 114: {fileID: 11482954}
-  - 114: {fileID: 11437114}
-  - 114: {fileID: 11479124}
-  - 114: {fileID: 11457544}
-  - 114: {fileID: 11469728}
-  - 114: {fileID: 11459306}
-  - 114: {fileID: 11461230}
-  - 114: {fileID: 11479102}
-  - 114: {fileID: 11417566}
-  - 114: {fileID: 11495534}
+  - component: {fileID: 456440}
+  - component: {fileID: 11447296}
+  - component: {fileID: 11482954}
+  - component: {fileID: 11437114}
+  - component: {fileID: 11479124}
+  - component: {fileID: 11457544}
+  - component: {fileID: 11469728}
+  - component: {fileID: 11459306}
+  - component: {fileID: 11461230}
+  - component: {fileID: 11479102}
+  - component: {fileID: 11417566}
+  - component: {fileID: 11495534}
   m_Layer: 0
   m_Name: TouchManager
   m_TagString: Untagged
@@ -31,10 +31,10 @@ GameObject:
   m_ObjectHideFlags: 0
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 4
+  serializedVersion: 5
   m_Component:
-  - 4: {fileID: 438902}
-  - 114: {fileID: 11412284}
+  - component: {fileID: 438902}
+  - component: {fileID: 11412284}
   m_Layer: 0
   m_Name: Inputs
   m_TagString: Untagged
@@ -47,11 +47,11 @@ GameObject:
   m_ObjectHideFlags: 0
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 4
+  serializedVersion: 5
   m_Component:
-  - 224: {fileID: 22440388}
-  - 114: {fileID: 11455964}
-  - 223: {fileID: 22308338}
+  - component: {fileID: 22440388}
+  - component: {fileID: 11455964}
+  - component: {fileID: 22308338}
   m_Layer: 0
   m_Name: Touch Visualizer Watson
   m_TagString: Untagged
@@ -68,10 +68,10 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_Children: []
   m_Father: {fileID: 456440}
   m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &456440
 Transform:
   m_ObjectHideFlags: 1
@@ -81,12 +81,12 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_Children:
   - {fileID: 438902}
   - {fileID: 22440388}
   m_Father: {fileID: 0}
   m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &11412284
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -351,7 +351,8 @@ MonoBehaviour:
   useSendMessage: 0
   sendMessageEvents: 60
   sendMessageTarget: {fileID: 0}
-  layers: []
+  layers:
+  - {fileID: 0}
 --- !u!114 &11495534
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -403,10 +404,10 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0, y: 0, z: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_Children: []
   m_Father: {fileID: 456440}
   m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}

Prefabs/TouchManager.prefab

@@ -2432,29 +2432,29 @@ This library is licensed under Apache 2.0. Full license text is available in [LI
 ## Contributing
 See [CONTRIBUTING.md](.github/CONTRIBUTING.md).
 
-[wdc]: http://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/
+[wdc]: http://www.ibm.com/watson/developercloud/
 [wdc_unity_sdk]: https://github.com/watson-developer-cloud/unity-sdk
 [latest_release]: https://github.com/watson-developer-cloud/unity-sdk/releases/latest
 [bluemix_registration]: http://bluemix.net/registration
 [get_unity]: https://unity3d.com/get-unity
 
-[speech_to_text]: http://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/doc/speech-to-text/
-[text_to_speech]: http://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/doc/text-to-speech/
-[language_translator]: http://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/doc/language-translator/
-[dialog]: http://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/doc/dialog/
-[natural_language_classifier]: http://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/doc/nl-classifier/
+[speech_to_text]: http://www.ibm.com/watson/developercloud/doc/speech-to-text/
+[text_to_speech]: http://www.ibm.com/watson/developercloud/doc/text-to-speech/
+[language_translator]: http://www.ibm.com/watson/developercloud/doc/language-translator/
+[dialog]: http://www.ibm.com/watson/developercloud/doc/dialog/
+[natural_language_classifier]: http://www.ibm.com/watson/developercloud/doc/natural-language-classifier/index.html
 
 [alchemy_language]: http://www.alchemyapi.com/products/alchemylanguage
-[alchemyData_news]: http://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/alchemy-data-news.html
+[alchemyData_news]: http://www.ibm.com/watson/developercloud/alchemy-data-news.html
 [sentiment_analysis]: http://www.alchemyapi.com/products/alchemylanguage/sentiment-analysis
-[tone_analyzer]: http://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/doc/tone-analyzer/
-[tradeoff_analytics]: http://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/doc/tradeoff-analytics/
-[conversation]:http://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/doc/conversation/
-[visual_recognition]: http://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/visual-recognition/api/v3/
-[personality_insights]: http://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/personality-insights/api/v2/
+[tone_analyzer]: http://www.ibm.com/watson/developercloud/doc/tone-analyzer/
+[tradeoff_analytics]: http://www.ibm.com/watson/developercloud/doc/tradeoff-analytics/
+[conversation]:http://www.ibm.com/watson/developercloud/doc/conversation/
+[visual_recognition]: http://www.ibm.com/watson/developercloud/visual-recognition/api/v3/
+[personality_insights]: http://www.ibm.com/watson/developercloud/personality-insights/api/v2/
 [conversation_tooling]: https://www.ibmwatsonconversation.com
 [retrieve_and_rank]: http://www.ibm.com/watson/developercloud/retrieve-and-rank/api/v1/
-[document_conversion]: http://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/document-conversion/api/v1/
+[document_conversion]: http://www.ibm.com/watson/developercloud/document-conversion/api/v1/
 [expressive_ssml]: http://www.ibm.com/watson/developercloud/doc/text-to-speech/http.shtml#expressive
 [ssml]: http://www.ibm.com/watson/developercloud/doc/text-to-speech/SSML.shtml
 

README.md

@@ -15,6 +15,7 @@
 *
 */
 
+
 #if UNITY_EDITOR
 
 using UnityEngine;
@@ -45,6 +46,13 @@ public static BuildOptions BuildOptions
         get { return (BuildOptions)EditorPrefs.GetInt(Application.productName + "BuildOptions"); }
         set { EditorPrefs.SetInt(Application.productName + "BuildOptions", (int)value); }
     }
+
+    public static string[] BuildScenes
+    {
+        get { return string.IsNullOrEmpty( EditorPrefs.GetString(Application.productName + "BuildScenes"))? null :  EditorPrefs.GetString(Application.productName + "BuildScenes").Split('|'); }
+        set { if (value == null || value.Length == 0) EditorPrefs.SetString(Application.productName + "BuildScenes", null); else EditorPrefs.SetString(Application.productName + "BuildScenes",string.Join("|", value)); }
+    }
+
     #endregion
 
     [UnityEditor.Callbacks.DidReloadScripts]
@@ -60,15 +68,23 @@ private static void OnScriptsReloaded()
 
     private static string[] GetBuildScenes()
     {
-        List<string> scenes = new List<string>();
-        foreach (EditorBuildSettingsScene scene in EditorBuildSettings.scenes)
+        if (BuildScenes != null && BuildScenes.Length > 0)
+        {
+            return BuildScenes;
+        }
+        else
         {
-            if (scene == null || !scene.enabled)
-                continue;
-            scenes.Add(scene.path);
+            List<string> scenes = new List<string>();
+            foreach (EditorBuildSettingsScene scene in EditorBuildSettings.scenes)
+            {
+                if (scene == null || !scene.enabled)
+                    continue;
+                scenes.Add(scene.path);
+            }
+
+            return scenes.ToArray();
         }
 
-        return scenes.ToArray();
     }
 
     /// <summary>

Scripts/Editor/Build.cs

@@ -151,6 +151,12 @@ protected virtual void drawLimitTouches()
                     minTouchesFloat = 0;
                     maxTouchesFloat = 10;
                 }
+                else
+                {
+                    minTouchesFloat = (float) minTouches.intValue;
+                    maxTouchesFloat = (float) maxTouches.intValue;
+                }
+                //or this values doesn't change from script properly
                 EditorGUI.indentLevel++;
                 EditorGUILayout.LabelField("Min: " + (int)minTouchesFloat + ", Max: " + (int)maxTouchesFloat);
                 EditorGUILayout.MinMaxSlider(ref minTouchesFloat, ref maxTouchesFloat, 0, 10);
@@ -338,4 +344,4 @@ private void removeFromArray(SerializedProperty array, int index)
 
         #endregion
     }
-}
+}