Skip to content

Commit ea4aba5

Browse files
authored
Merge pull request #78 from watson-developer-cloud/develop
Release 0.4.0
2 parents 66ab37c + a03fcd4 commit ea4aba5

File tree

281 files changed

+7820
-1670
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

281 files changed

+7820
-1670
lines changed

.gitattributes

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
* text=auto
2+
3+
# These files are text and should be normalized (convert crlf to lf)
4+
*.rb text
5+
*.test text
6+
*.c text
7+
*.cpp text
8+
*.h text
9+
*.txt text
10+
*.yml text
11+
*.s79 text
12+
*.bat text
13+
*.xcl text
14+
*.inc text
15+
*.info text
16+
*.md text
17+
makefile text
18+
rakefile text
19+
20+
21+
#These files are binary and should not be normalized
22+
*.doc binary
23+
*.odt binary
24+
*.pdf binary
25+
*.ewd binary
26+
*.eww binary
27+
*.dni binary
28+
*.wsdt binary
29+
*.dbgdt binary
30+
*.mac binary

.gitignore

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,3 +49,17 @@ Art.meta
4949
LICENSE.meta
5050
CHANGELOG.md.meta
5151
README.md.meta
52+
Travis.meta
53+
/Travis/UnityTestProject/Assets/StreamingAssets/Config.json
54+
/Travis/UnityTestProject/Assets/StreamingAssets/Config.json.meta
55+
/Travis/UnityTestProject/Assets/StreamingAssets/Config.json.enc.meta
56+
/Config.json
57+
/Config.json.meta
58+
/Config.json.enc.meta
59+
/Travis/build.sh.meta
60+
/Travis/createProject.sh.meta
61+
/Travis/installSDK.sh.meta
62+
/Travis/installUnity.sh.meta
63+
/Travis/README.md.meta
64+
/Travis/runTests.sh.meta
65+
/Travis/TravisBuild.cs.meta

.travis.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
language: objective-c
2+
osx_image: xcode61
3+
rvm:
4+
- 2.1.2
5+
install:
6+
- ./Travis/installUnity.sh
7+
script:
8+
- ./Travis/createProject.sh
9+
- ./Travis/installSDK.sh
10+
- ./Travis/runTests.sh
11+
- ./Travis/build.sh

Art/UI/base-bg.png.meta

Lines changed: 20 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

CHANGELOG.md

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
Change Log
22
==========
3+
## Version 0.4.0
4+
5+
_2016-06-09_
6+
7+
* New: Added Tone Analyzer v3 abstraction
8+
* New: Added Tradeoff Analytics abstraction
9+
* New: Added Conversation abstraction
10+
* New: Added Visual Recognition v3 abstraction
11+
* Fix: Creating test project dynamically for Travis CL integration
12+
* Fix: Refactored Language Translation to Language Translator
13+
* Fix: Widget examples sprite references were disconnected
314

415
## Version 0.3.0
516

@@ -10,4 +21,4 @@ _2016-04-29_
1021
* New: Added example code snippets showing how to access low level services
1122
* Fix: Restructured SDK to put non-core components in Examples
1223
* Fix: Fixed several usability issues
13-
* Fix: Revised several aspects of the SDK to match the formats of other WDC SDKs
24+
* Fix: Revised several aspects of the SDK to match the formats of other WDC SDKs

Config.json.enc

2.66 KB
Binary file not shown.
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
/**
2+
* Copyright 2015 IBM Corp. All Rights Reserved.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*
16+
*/
17+
18+
using UnityEngine;
19+
using System.Collections;
20+
using IBM.Watson.DeveloperCloud.Services.Conversation.v1;
21+
22+
public class ExampleConversation : MonoBehaviour
23+
{
24+
private Conversation m_Conversation = new Conversation();
25+
private string m_WorkspaceID = "car_demo_1";
26+
private string m_Input = "Can you unlock the door?";
27+
28+
void Start () {
29+
Debug.Log("User: " + m_Input);
30+
m_Conversation.Message(m_WorkspaceID, m_Input, OnMessage);
31+
}
32+
33+
void OnMessage (DataModels.MessageResponse resp)
34+
{
35+
foreach(DataModels.MessageIntent mi in resp.intents)
36+
Debug.Log("intent: " + mi.intent + ", confidence: " + mi.confidence);
37+
38+
Debug.Log("response: " + resp.output.text);
39+
}
40+
}

Examples/ServiceExamples/Scripts/ExampleConversation.cs.meta

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Examples/ServiceExamples/Scripts/ExampleDIalog.cs

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,21 @@
1-
using UnityEngine;
1+
/**
2+
* Copyright 2015 IBM Corp. All Rights Reserved.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*
16+
*/
17+
18+
using UnityEngine;
219
using IBM.Watson.DeveloperCloud.Services.Dialog.v1;
320

421
public class ExampleDIalog : MonoBehaviour

Examples/ServiceExamples/Scripts/ExampleLanguageTranslation.cs

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

0 commit comments

Comments
 (0)