Skip to content
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
wants to merge 11 commits into
base: newmaster
Choose a base branch
from
Open

Fix TTS playback issue #236

wants to merge 11 commits into from

Commits on Jul 22, 2019

  1. Configuration menu
    Copy the full SHA
    bf4fdbe View commit details
    Browse the repository at this point in the history
  2. Updated data type

    akashdabhi03 committed Jul 22, 2019
    Configuration menu
    Copy the full SHA
    a392672 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2019

  1. Configuration menu
    Copy the full SHA
    3105872 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2019

  1. Configuration menu
    Copy the full SHA
    dfce2d5 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    68715a3 View commit details
    Browse the repository at this point in the history
  3. 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
    akashdabhi03 committed Jul 24, 2019
    Configuration menu
    Copy the full SHA
    47191e4 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    6afa675 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    59b1a56 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2019

  1. Configuration menu
    Copy the full SHA
    1ea29ac View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    78dd0cc View commit details
    Browse the repository at this point in the history
  3. Fixed TTS to stop if correct option in selected in the LRComprehensio…

    …n game.
    bikashtudu committed Jul 25, 2019
    Configuration menu
    Copy the full SHA
    d0a4e3b View commit details
    Browse the repository at this point in the history