Commit Graph

279 Commits

Author SHA1 Message Date
Snek 03717e674c Merge branch 'master' of https://github.com/RIP95/Amadeus 2017-03-03 21:06:12 +03:00
Snek 37047eac8a Little cleanup. 2017-03-03 21:04:33 +03:00
Yuri 794f72d1cb Rename voiceLine.java to VoiceLine.java 2017-03-03 20:32:39 +03:00
Snek d1abec8468 VoiceLine 2017-03-03 20:30:32 +03:00
Nille 34e69e9e41 Merge pull request #2 from RIP95/master
Recent changes
2017-03-03 18:27:07 +01:00
Snek f99aa1429c Fix VoiceLines class and compilation error 2017-03-03 20:17:13 +03:00
Snek ba9febc33e Remove unused lines. Ignore build folder. 2017-03-03 19:59:13 +03:00
Snek 2ad67b52c3 Revert "Remove unused lines."
This reverts commit 234997a2c7.
2017-03-03 19:56:43 +03:00
Snek 234997a2c7 Remove unused lines. 2017-03-03 19:50:40 +03:00
Snek 99e56b9f36 Probably this icon suits better 2017-03-03 19:44:36 +03:00
Snek 1f0565c5be Remove unused images 2017-03-03 19:42:16 +03:00
Yink f4cc8a41b8 Refactoring, RIP95's changes 2017-03-03 16:55:42 +01:00
Yink 2fc5b06da7 Refactoring, RIP95's changes 2017-03-03 16:45:01 +01:00
Yink 343bb9b991 Merge remote-tracking branch 'origin/master' 2017-03-02 14:47:32 +01:00
Yink 607eda45bb Fixed recognized phrases 2017-03-02 14:47:24 +01:00
Nille ef2da6577f Update README.md 2017-03-02 14:47:09 +01:00
Nille 33ab1f48a6 Update README.md 2017-03-02 14:24:18 +01:00
Yink 9c2cff7819 Merge remote-tracking branch 'origin/master' 2017-03-02 14:20:20 +01:00
Yink 442692d25c Voice Recognition, Voice files 2017-03-02 14:20:02 +01:00
Nille e7fdeee0a7 Update README.md 2017-03-01 01:41:48 +01:00
Nille b4ada9106b Update README.md 2017-03-01 01:24:16 +01:00
Yink 5deb3a13ee Merge remote-tracking branch 'origin/master' 2017-03-01 01:19:54 +01:00
Yink c4a053408d Screenshots 2017-03-01 01:19:32 +01:00
Nille ae9b922709 Update README.md 2017-03-01 01:16:43 +01:00
Nille 047fb3f508 Create README.md 2017-03-01 01:16:06 +01:00
Yink 91dde8ebdf Calling Screen 2017-03-01 00:53:53 +01:00
Yink fc11c56de3 different emotion states 2017-02-27 15:58:35 +01:00
Yink d438502669 different emotion states 2017-02-27 15:57:53 +01:00
Yink 63861c2129 Initial commit 2017-02-27 14:53:48 +01:00