forked from XPRIZE/GLEXP-Team-KitkitSchool
-
Notifications
You must be signed in to change notification settings - Fork 3
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix TTS playback issue #236
Open
bikashtudu
wants to merge
11
commits into
newmaster
Choose a base branch
from
Bikash/Fix_TTS
base: newmaster
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Commits on Jul 22, 2019
-
Configuration menu - View commit details
-
Copy full SHA for bf4fdbe - Browse repository at this point
Copy the full SHA bf4fdbeView commit details -
Configuration menu - View commit details
-
Copy full SHA for a392672 - Browse repository at this point
Copy the full SHA a392672View commit details
Commits on Jul 23, 2019
-
Configuration menu - View commit details
-
Copy full SHA for 3105872 - Browse repository at this point
Copy the full SHA 3105872View commit details
Commits on Jul 24, 2019
-
Configuration menu - View commit details
-
Copy full SHA for dfce2d5 - Browse repository at this point
Copy the full SHA dfce2d5View commit details -
Configuration menu - View commit details
-
Copy full SHA for 68715a3 - Browse repository at this point
Copy the full SHA 68715a3View commit details -
Merge remote-tracking branch 'origin/AnkitK/Fix_font_render' into Dev
# Conflicts: # pehlaschool/Classes/Common/Controls/CompletePopup.cpp # pehlaschool/Classes/Games/Books/BookPage.cpp # pehlaschool/Classes/Games/ComprehensionTest/ComprehensionScene.cpp # pehlaschool/Classes/Games/DigitalQuiz/Utils/DigitalQuizMainDepot.cpp # pehlaschool/Classes/Games/EggQuiz/EggQuizHeader.hpp # pehlaschool/Classes/Games/EggQuiz/EggQuizScene.cpp # pehlaschool/Classes/Games/FindTheMatch/ChildNodes/FindTheMatchCard.cpp # pehlaschool/Classes/Games/LRComprehension/LRComprehensionScene.cpp # pehlaschool/Classes/Games/MovingInsects/ChildNodes/MovingInsectsGameBoard.cpp # pehlaschool/Classes/Games/MultiplicationBoard/MultiplicationBoardScene.cpp # pehlaschool/Classes/Games/NumberTrain/TrainCar.cpp # pehlaschool/Classes/Games/PlaceValue/PlaceValueScene.cpp # pehlaschool/Classes/Games/ReadingBird/ReadingBirdScene.cpp # pehlaschool/Classes/Games/StarFall/Core/StarFallScene.cpp # pehlaschool/Classes/Games/WhatIsThis/WhatIsThisCard.cpp # pehlaschool/Classes/Games/WordMachine/WordMachineScene.cpp # pehlaschool/Classes/Games/WordTrace/Utils/WordTraceMainDepot.cpp # pehlaschool/Classes/Games/WordWindow/WordWindowScene.cpp # pehlaschool/Classes/Managers/LanguageManager.cpp # pehlaschool/Classes/Menu/CoopScene.cpp # pehlaschool/Classes/Menu/CoopScene2.cpp # pehlaschool/Classes/Menu/DailyScene2.cpp # pehlaschool/Classes/Menu/GradeSelector.cpp # pehlaschool/Classes/Utils/TodoUtil.h
Configuration menu - View commit details
-
Copy full SHA for 47191e4 - Browse repository at this point
Copy the full SHA 47191e4View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6afa675 - Browse repository at this point
Copy the full SHA 6afa675View commit details -
Configuration menu - View commit details
-
Copy full SHA for 59b1a56 - Browse repository at this point
Copy the full SHA 59b1a56View commit details
Commits on Jul 25, 2019
-
Configuration menu - View commit details
-
Copy full SHA for 1ea29ac - Browse repository at this point
Copy the full SHA 1ea29acView commit details -
Configuration menu - View commit details
-
Copy full SHA for 78dd0cc - Browse repository at this point
Copy the full SHA 78dd0ccView commit details -
Fixed TTS to stop if correct option in selected in the LRComprehensio…
…n game.
bikashtudu committedJul 25, 2019 Configuration menu - View commit details
-
Copy full SHA for d0a4e3b - Browse repository at this point
Copy the full SHA d0a4e3bView commit details
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.