Skip to content

Commit 6462ff5

Browse files
committed
Merge branch 'develop' into feature-ToneAnalyzer-jazzhub
2 parents 5a43508 + 8d58b61 commit 6462ff5

File tree

201 files changed

+4490
-4537
lines changed

Some content is hidden

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

201 files changed

+4490
-4537
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
File renamed without changes.

.github/issue_template.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
Remember, an issue is not the place to ask questions. You can use [Stack Overflow](http://stackoverflow.com/questions/tagged/ibm-watson) for that, or you may want to start a discussion on the [dW Answers](https://developer.ibm.com/answers/questions/ask/?topics=watson).
2+
3+
Before you open an issue, please check if a similar issue already exists or has been closed before.
4+
5+
### When reporting a bug, please be sure to include the following:
6+
7+
- [ ] Start the title with the service name in brackets: `[speech-to-text] websockets...`
8+
- [ ] Steps to reproduce
9+
- [ ] Expected behavior
10+
- [ ] Actual behavior
11+
- [ ] Unity SDK version
12+
13+
### When you open an issue for a feature request, please add as much detail as possible:
14+
- [ ] A descriptive title starting with the service name
15+
- [ ] A description of the problem you're trying to solve
16+
- [ ] A suggested solution if possible

.github/pull_request_template.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
### Summary
2+
3+
Provide a general description of the code changes in your pull
4+
request... were there any bugs you had fixed? If so, mention them. If
5+
these bugs have open GitHub issues, be sure to tag them here as well,
6+
to keep the conversation linked together.
7+
8+
### Other Information
9+
10+
If there's anything else that's important and relevant to your pull
11+
request, mention that information here.
12+
13+
14+
Thanks for contributing to the Watson Developer Cloud!

.gitignore

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ExportedObj/
1919
*.user
2020
*.unityproj
2121
*.booproj
22-
22+
2323
# ============ #
2424
# OS generated #
2525
# ============ #
@@ -38,3 +38,28 @@ ehthumbs.db
3838
/Clients
3939
Assets/StreamingAssets/Config.json
4040
Assets/StreamingAssets/Config.json.meta
41+
Resources.meta
42+
Scenes.meta
43+
Scripts.meta
44+
ThirdParty.meta
45+
Prefabs.meta
46+
Examples.meta
47+
Docs.meta
48+
Art.meta
49+
LICENSE.meta
50+
CHANGELOG.md.meta
51+
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/Banner_Watson_element.png.meta

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

Art/UI/Banner_logotype.png.meta

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

Art/UI/Base_BG.png.meta

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

0 commit comments

Comments
 (0)