Commit Graph

279 Commits

Author SHA1 Message Date
unknown 129af39120 Merge branch 'master' of https://github.com/RIP93/Amadeus 2017-03-05 06:16:58 +03:00
unknown a8b60d760c Temp voice recognition fix 2017-03-05 06:15:55 +03:00
Yink c75b750089 Fixed else 2017-03-05 02:24:54 +01:00
Yink 26db320063 fixed missing else 2017-03-05 02:21:52 +01:00
Nille 3b62d5849c Merge pull request #12 from RIP95/master
Attempt to fix app for android < 5.0
2017-03-05 02:18:52 +01:00
Nille 657f5a242a Merge branch 'master' into master 2017-03-05 02:18:39 +01:00
Yink 19f53b389a Fix Merging Error 2017-03-05 02:17:31 +01:00
unknown 30ccd7a724 Attempt to fix app for android < 5.0 2017-03-05 04:14:54 +03:00
Yink 78ad678857 Fix SDK Versio 2017-03-05 02:03:18 +01:00
Yink 51b99e5e1e Refactoring 2017-03-05 01:59:50 +01:00
Nille 529d00f263 Merge pull request #11 from RIP95/master
Remove focus
2017-03-05 01:01:24 +01:00
Nille 8c32920a30 Merge pull request #10 from RIP95/master
Change required SDK version for requestPermissions() to 23
2017-03-05 00:59:23 +01:00
unknown 8af0bb5665 Remove focus 2017-03-05 02:58:31 +03:00
Nille dd227b34b3 Update README.md 2017-03-05 00:55:52 +01:00
unknown 907ffcdf2c Reduntant else 2017-03-05 02:28:24 +03:00
unknown 869de1788c Change required SDK version for requestPermissions() to 23 2017-03-05 02:25:20 +03:00
Yink b5ac3c0a05 Check Target SDK Fix 2017-03-04 23:30:06 +01:00
Nille c69b7341b2 Merge pull request #9 from RIP95/master
Fix permission request
2017-03-04 23:22:51 +01:00
unknown 9f2588a68c Fix permission request 2017-03-05 01:18:09 +03:00
Nille 7a933c1ec1 Update README.md 2017-03-04 23:10:38 +01:00
Nille e85536fdb6 Update README.md 2017-03-04 23:10:00 +01:00
Yink 72120f6dd8 RequestPermission 2017-03-04 19:10:41 +01:00
Nille af75013715 Merge pull request #8 from RIP95/master
Cosmetics
2017-03-04 13:24:58 +01:00
Snek 123b9e9ece 'Disconnected.' string if LaunchActivity resumed. 2017-03-04 12:57:30 +03:00
Snek 122ea57e7f Revert app icon 2017-03-04 12:46:18 +03:00
Snek 116bb95923 Set version info 2017-03-04 12:35:39 +03:00
Snek c553d1022e Fix for call simulation. Animation fine tuning. 2017-03-04 12:10:56 +03:00
Yink 6023fa6ade Launch animation 2017-03-04 04:37:24 +01:00
Nille 1f36c6309a Merge pull request #7 from RIP95/master
Small additions and fixes
2017-03-04 00:55:21 +01:00
Snek fc2f31f3ba Call simulation. 2017-03-04 02:22:21 +03:00
Snek cebfaac015 Small refactor 2017-03-04 01:04:23 +03:00
Snek b148720311 Ignore app.iml 2017-03-04 00:23:00 +03:00
Snek fd3790a4cf Ignore app.iml 2017-03-04 00:22:20 +03:00
Nille 0122bea8b3 Merge pull request #6 from RIP95/master
Small fixes and refactor
2017-03-03 22:16:25 +01:00
Snek 04373812b7 Remove unneeded junit tests 2017-03-03 23:58:32 +03:00
Snek 7efe80ab13 Refactor answerSpeech() argument. Small fixes in speak(). 2017-03-03 23:56:07 +03:00
Snek d841ce561b Revert "Refactor answerSpeech() argument. Small fixes in speak()."
This reverts commit 86393dc200.
2017-03-03 23:53:55 +03:00
Snek 86393dc200 Refactor answerSpeech() argument. Small fixes in speak(). 2017-03-03 23:50:55 +03:00
Yink 60ff72214f Fixed speech request while speaking 2017-03-03 21:24:45 +01:00
Nille 589189f056 Merge pull request #5 from RIP95/master
Prevent voice input while loop is active.
2017-03-03 21:19:45 +01:00
Snek 9d1b423f50 Prevent voice input while loop is active. 2017-03-03 23:16:18 +03:00
Yink 2f5deea6aa Fixed interaction 2017-03-03 20:57:24 +01:00
Yink f40742ae52 Many new voicelines and interaction 2017-03-03 20:17:34 +01:00
Yink 9b6bf298df Many new voicelines and interaction 2017-03-03 20:03:58 +01:00
Yink 3ea32eadb3 Merge branch 'master' of https://github.com/Yink/Amadeus 2017-03-03 19:56:39 +01:00
Yink e1c804a715 Many new voicelines and interaction 2017-03-03 19:54:20 +01:00
Nille 59353188e8 Merge pull request #4 from RIP95/master
Update build tools. Change min SDK version to 15 (4.0.3).
2017-03-03 19:53:16 +01:00
Snek 9dfbb93fe2 Compress PNGs for mdpi. 2017-03-03 21:49:49 +03:00
Snek b89b569270 Update build tools. Change min SDK version to 15 (4.0.3). 2017-03-03 21:35:42 +03:00
Nille c476274a42 Merge pull request #3 from RIP95/master
Cleanup
2017-03-03 19:09:45 +01:00