Merge branch 'master' of git://anongit.kde.org/gcompris into gsoc…

Authored by stefant on Jun 26 2016, 7:16 AM.

Description

Merge branch 'master' of git://anongit.kde.org/gcompris into gsoc-alphabetical_order

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
0d8faf6ee7e2bcoudoin
windows build, add a script to help prepare windows build from linux 
Jun 25 2016
5cd083871fb8bcoudoin
build windows, better uninstall icon 
Jun 25 2016
4789650ece54jjazeix
letter-in-word, play the audio of the word when select a good one 
Jun 25 2016
6d5a84b4143cbcoudoin/jjazeix
letter-in-word, restart plane display on window resize 
Jun 25 2016
238151397655bcoudoin/jjazeix
letterinword, minor fix plane ratio 
Jun 25 2016
1b409e19bc49jjazeix
letter-in-word, make the coloration work on android, update activity version 
Jun 25 2016
4c896a054eb7jjazeix
letter-in-word, if only one big word, wrap it anywhere 
Jun 25 2016
cd8f8ea97426jjazeix
letter-in-word, better display on multiple words 
Jun 25 2016
57826b5c3e54jjazeix
letter-in-word, set difficulty to 2 + code formatting 
Jun 25 2016
405f30e7a86ejjazeix
letter-in-word, update icon 
Jun 25 2016
03e1cbc92bcdjjazeix
letter-in-word, add keyboard navigation 
Jun 25 2016
5b2e59928e25tandon/jjazeix
letter-in-word, disable clicks until the level changes. 
Jun 25 2016
6a110497442ftandon/jjazeix
letter-in-word, image locations now taken from their native activities. 
Jun 25 2016
d7099dd97088tandon/jjazeix
letter-in-word, adjusted margins to prevent cluds from going out of screen. 
Jun 25 2016
5f188ed88ad5tandon/jjazeix
letter-in-word, made plane size relative to screen. 
Jun 25 2016
bd95bb935e6ftandon/jjazeix
letter-in-word, prevent image overriding the text. 
Jun 25 2016
ffded503f037jjazeix
letter-in-word, remove 2 global variables, horizontally align text 
Jun 25 2016
3bf64cc77213tandon/jjazeix
letter-in-word, corrected fixed locale error, made locale variable global. 
Jun 25 2016
3495ebde99d6tandon/jjazeix
letter-in-word, added spacing between clouds. 
Jun 25 2016
fcf7fe774f22tandon/jjazeix
letter-in-word, removed junk files and comments. 
Jun 25 2016
e5cc29e9e165tandon/jjazeix
letter-in-word, only english alphabets or accented latin characters are choosen… 
Jun 25 2016
0af6d67b3623tandon/jjazeix
letter-in-word, displaying plane even in case of voice error. 
Jun 25 2016
3b3a63fbc155tandon/jjazeix
letter-in-word, corrected hovering over images. Previously when the mouse was… 
Jun 25 2016
c91b34377022tandon/jjazeix
letter-in-word, stopping plane at lower levels so that the letter stays there. 
Jun 25 2016
7b987935a83ftandon/jjazeix
letter-in-word, added letter highlighting for correct word selection. 
Jun 25 2016
1020231431e8tandon/jjazeix
letter-in-word, corrected CMakeLists.txt 
Jun 25 2016
9057c4337c48tandon/jjazeix
letter-in-word, appending wrongly answered questions at the end. 
Jun 25 2016
519ccfeaaebctandon/jjazeix
letter-in-word, added ability to see the plane again. 
Jun 25 2016
c247ec9e34f9tandon/jjazeix
letter-in-word, prevented plane from showing up at higher levels. 
Jun 25 2016
4c79eb615d28tandon/jjazeix
letter-in-word, adjusted text on plane. 
Jun 25 2016
2ee5feab1de4tandon/jjazeix
letter-in-word, added version number 
Jun 25 2016
0078ea00dc9etandon/jjazeix
letter-in-word, restricted number of words shown in a level 
Jun 25 2016
62295b64e94ctandon/jjazeix
letter-in-word, integrated lang image dataset 
Jun 25 2016
f4d585b755c7tandon/jjazeix
letter-in-word, remove activities_out.txt 
Jun 25 2016
ce3883694587tandon/jjazeix
letter-in-word, rectified copyrights, made a few other rectifications 
Jun 25 2016
9cb98470df92tandon/jjazeix
letter-in-word, rectified levels 
Jun 25 2016
479fdd592397tandon/jjazeix
letter-in-word, corrected the position of words,added more words and levels 
Jun 25 2016
831b8ec4a3aetandon/jjazeix
letter-in-word, rectified coordinates, added few more levels. 
Jun 25 2016
7c5b02a36235tandon/jjazeix
letter-in-word, corrected rotation of clouds. 
Jun 25 2016
3b5f6e961583tandon/jjazeix
letter-in-word, initial working version 
Jun 25 2016
5de7cea683f0bcoudoin
build, minor wrapping lines to 80 columns 
Jun 25 2016
5a783c078feebcoudoin
build, add version number in bundled converted oggs 
Jun 25 2016
81970c2cc702bcoudoin
build, move converted ogg blob after the calc of $COMPRESSED_AUDIO 
Jun 24 2016
c0219fe382e7bcoudoin
build, fix extract of the 7z for compressed audio 
Jun 24 2016
e69d906831a4bcoudoin
build, add support for bundling, downloading and installing converted oggs 
Jun 24 2016
7206f716ee4dbcoudoin
build, minor comment update 
Jun 24 2016
55ee5da33bbbbcoudoin
build windows, simplified code curl is available on appveyor 
Jun 24 2016
cd0e86249bb1bcoudoin
build windows, implement an appveyor specific download for the translations 
Jun 24 2016
91fb9fb106c1bcoudoin
build, add a target DlAndInstallBundledTranslations 
Jun 24 2016
89f42b77d29fbcoudoin
build windows, shorter installer description name 
Jun 24 2016