Skip to content

Commit 83e79f0

Browse files
committed
merge in develop
2 parents ad0e660 + b2d864d commit 83e79f0

36 files changed

Lines changed: 126 additions & 4637 deletions

CHANGELOG.md

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,20 @@
11
Change Log
22
==========
3+
## Version 0.9.0
4+
_2016-08-26_
5+
6+
* Deprecated: Retired `Dialog` service.
7+
* Fix: `ExampleLanguageTranslation` now is using `LanguageTranslator` before `LanguageTranslation` service goes live.
8+
* Fix: Abstracted custom voice model methods in `Text to Speech` service.
9+
* Fix: Error when pasting credentials from the new Bluemix site into the `Config Editor`.
10+
* New: Added `CameraWidget` and `CameraDisplayWidget` to get video from device camera.
11+
312
## Version 0.8.0
413
_2016-08-12_
514

6-
* Fixed: Removed tag stripping from `ToSpeech()` method of the `TextToSpeech` service.
15+
* Fix: Removed tag stripping from `ToSpeech()` method of the `TextToSpeech` service.
716
* New: The `Conversation` service now accepts full conversation payload in overloaded `Message()` method.
8-
* Fixed: Removed `SetLastWriteTime()` for Android platform in the data cache because of a known android issue.
17+
* Fix: Removed `SetLastWriteTime()` for Android platform in the data cache because of a known android issue.
918
```https://code.google.com/p/android/issues/detail?id=15480```
1019

1120

Examples/ServiceExamples/Scripts/ExampleDIalog.cs

Lines changed: 0 additions & 37 deletions
This file was deleted.

Examples/ServiceExamples/Scripts/ExampleDIalog.cs.meta

Lines changed: 0 additions & 12 deletions
This file was deleted.

Examples/ServiceExamples/ServiceExamples.unity

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ Transform:
129129
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
130130
m_Children: []
131131
m_Father: {fileID: 0}
132-
m_RootOrder: 9
132+
m_RootOrder: 8
133133
--- !u!1 &525603453
134134
GameObject:
135135
m_ObjectHideFlags: 0
@@ -169,7 +169,7 @@ Transform:
169169
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
170170
m_Children: []
171171
m_Father: {fileID: 0}
172-
m_RootOrder: 3
172+
m_RootOrder: 2
173173
--- !u!1 &659829311
174174
GameObject:
175175
m_ObjectHideFlags: 0
@@ -209,7 +209,7 @@ Transform:
209209
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
210210
m_Children: []
211211
m_Father: {fileID: 0}
212-
m_RootOrder: 12
212+
m_RootOrder: 11
213213
--- !u!1 &725710367
214214
GameObject:
215215
m_ObjectHideFlags: 0
@@ -296,7 +296,7 @@ Transform:
296296
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
297297
m_Children: []
298298
m_Father: {fileID: 0}
299-
m_RootOrder: 6
299+
m_RootOrder: 5
300300
--- !u!1 &748186939
301301
GameObject:
302302
m_ObjectHideFlags: 0
@@ -336,7 +336,7 @@ Transform:
336336
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
337337
m_Children: []
338338
m_Father: {fileID: 0}
339-
m_RootOrder: 11
339+
m_RootOrder: 10
340340
--- !u!1 &859102722
341341
GameObject:
342342
m_ObjectHideFlags: 0
@@ -376,7 +376,7 @@ Transform:
376376
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
377377
m_Children: []
378378
m_Father: {fileID: 0}
379-
m_RootOrder: 5
379+
m_RootOrder: 4
380380
--- !u!1 &1053617509
381381
GameObject:
382382
m_ObjectHideFlags: 0
@@ -416,7 +416,7 @@ Transform:
416416
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
417417
m_Children: []
418418
m_Father: {fileID: 0}
419-
m_RootOrder: 13
419+
m_RootOrder: 12
420420
--- !u!1 &1073418922
421421
GameObject:
422422
m_ObjectHideFlags: 0
@@ -456,7 +456,7 @@ Transform:
456456
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
457457
m_Children: []
458458
m_Father: {fileID: 0}
459-
m_RootOrder: 7
459+
m_RootOrder: 6
460460
--- !u!1 &1160237478
461461
GameObject:
462462
m_ObjectHideFlags: 0
@@ -537,7 +537,7 @@ Transform:
537537
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
538538
m_Children: []
539539
m_Father: {fileID: 0}
540-
m_RootOrder: 4
540+
m_RootOrder: 3
541541
--- !u!1 &1310649318
542542
GameObject:
543543
m_ObjectHideFlags: 0
@@ -577,7 +577,7 @@ Transform:
577577
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
578578
m_Children: []
579579
m_Father: {fileID: 0}
580-
m_RootOrder: 14
580+
m_RootOrder: 13
581581
--- !u!1 &1713392457
582582
GameObject:
583583
m_ObjectHideFlags: 0
@@ -617,7 +617,7 @@ Transform:
617617
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
618618
m_Children: []
619619
m_Father: {fileID: 0}
620-
m_RootOrder: 8
620+
m_RootOrder: 7
621621
--- !u!1 &1740459831
622622
GameObject:
623623
m_ObjectHideFlags: 0
@@ -685,6 +685,7 @@ MonoBehaviour:
685685
m_Script: {fileID: 11500000, guid: e8b52562568714a48a89536c62fb978e, type: 3}
686686
m_Name:
687687
m_EditorClassIdentifier:
688+
m_DialogID: 61343031353936302d333963322d346436622d393537312d333863373461656366666664
688689
--- !u!4 &1979050316
689690
Transform:
690691
m_ObjectHideFlags: 0
@@ -737,4 +738,4 @@ Transform:
737738
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
738739
m_Children: []
739740
m_Father: {fileID: 0}
740-
m_RootOrder: 10
741+
m_RootOrder: 9

Examples/WidgetExamples/ExampleDialog.unity

Lines changed: 0 additions & 177 deletions
This file was deleted.

Examples/WidgetExamples/ExampleDialog.unity.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)