Manually merged with base changes and my changes

rodrigograca31 / Samaritan

Samaritan interface - Person of Interest (TV series) 📺

154 stars 66 forks source link

Manually merged with base changes and my changes #24

Closed AlexandruSimandi closed 8 years ago

AlexandruSimandi commented 8 years ago

boot animation
check for browser speech recognition
major refactoring

I manually merged with all your changes until Jun 27, 2016. You can directly override on your base. live

Check the coding style if you like it. I found it necessary to get rid of global variabiles. Also renamed #executeSamaritan into #write since it was unclear. Use samaritanModule.write(txt) to make samaritan say txt.

Now there is one single $(document).ready and that is in the new file main.js

Don't forget the readme :smile:

rodrigograca31 commented 8 years ago

"This branch has conflicts that must be resolved" .... I need to take a closer look at this before approving the changes....

I'm still at work... I will take a closer look later...

AlexandruSimandi commented 8 years ago

That's the point of a manual merge...

rodrigograca31 commented 8 years ago

All changes were merged! :)

AlexandruSimandi commented 8 years ago

Actually not. It's still the old version of speech.js and samaritan.js This beats the purpose of main.js

rodrigograca31 commented 8 years ago

You are right.... I will just copy and paste your repo..... (That should do it...)

AlexandruSimandi commented 8 years ago

I am also not sure about the font url which one is the good one.

rodrigograca31 commented 8 years ago

Hey @AlexandruSimandi I've just manually merged your repo.