Merge remote-tracking branch 'origin/master' into gsocSagarRenewable_energy
Description
Description
Details
Details
- Committed
scagarwal Sep 13 2015, 3:02 AM - Parents
- R2:4710cf41c0c2: renewable, minor
R2:59404eb32589: intro_gravity, fix ship distance calculation for hdpi - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 59404eb32589 | bcoudoin | intro_gravity, fix ship distance calculation for hdpi | Sep 11 2015 | |||
| f6925a696b52 | bcoudoin | intro_gravity, fix asteroid size on hdpi | Sep 11 2015 | |||
| ef83b7e837a8 | bcoudoin | core combobox, better layout on hdpi | Sep 11 2015 | |||
| 8a8afd4a124b | bcoudoin | core combobox, better sizing for the selected item in hdpi | Sep 11 2015 | |||
| e9684ced96e4 | bcoudoin | missing letter, now follow global casing setting | Sep 11 2015 | |||
| 5a6f95f400fc | bcoudoin | missing letter, add repeat button and keyboard support | Sep 11 2015 | |||
| b9bd78e17ef7 | bcoudoin | missing letter, major rework to use the lang dataset | Sep 11 2015 | |||
| 580393dea9e4 | bcoudoin | melody, add jingle audio before playing | Sep 10 2015 | |||
| e68565374756 | bcoudoin | melody, add a score to have sublevels | Sep 10 2015 | |||
| edecb75f9930 | bcoudoin | melody, first playable version | Sep 10 2015 | |||
| 6a866be8afc9 | bcoudoin | melody, port of Gtk+ melody activity | Sep 10 2015 | |||
| 13efa8bddcef | l10n daemon script | SVN_SILENT made messages (after extraction) | Sep 10 2015 | |||
| bc24c31a5fd5 | jjazeix | lang, use resources from imageid | Sep 9 2015 | |||
| 3e4fe4687538 | bcoudoin | lang, fix support for the escape key in mini games | Sep 8 2015 | |||
| 9ccc74cec980 | bcoudoin | lang, remove debug traces | Sep 8 2015 | |||
| 34d22f45421b | bcoudoin | align4, improve quality of the pieces | Sep 8 2015 | |||
| 7cb34355dacf | bcoudoin | lang, fix support for the virtual keyboard in spell it minigame | Sep 8 2015 | |||
| 99b4c5ea7c39 | bcoudoin | lang, fix config button not to appear in sub panels | Sep 8 2015 | |||
| 6ff41a6fa803 | bcoudoin | imageid, remove this activity, it is replaced by lang | Sep 8 2015 | |||
| 5b019dd6cc48 | bcoudoin | lang, use existing words.rcc immediately, update in background | Sep 8 2015 | |||
| d11a0bdca53b | bcoudoin | lang, set difficulty level to 4 | Sep 8 2015 | |||
| a6964f4c521d | bcoudoin | Merge branch 'lang' | Sep 8 2015 | |||
| c08c4a6ebe86 | bcoudoin | lang, fix the shading on the menuScreen list bottom | Sep 8 2015 | |||
| e06c78f00cae | bcoudoin | lang, set back default values with all the mini games | Sep 8 2015 | |||
| 1bbd2340b272 | bcoudoin | lang, fix progress saving, was confused on the index | Sep 8 2015 | |||
| c54e984b7508 | bcoudoin | lang, add repeat button in quiz and spell it mini games | Sep 8 2015 | |||
| 52e265687f6a | bcoudoin | lang, remove extra comment | Sep 8 2015 | |||
| 3e05e7bd4971 | bcoudoin | lang, better activity description | Sep 8 2015 | |||
| 0c29c91efc43 | bcoudoin | lang, now play the voices in the user selected locale | Sep 8 2015 | |||
| becd8add7ecf | bcoudoin | core, add getAudioFilePathForLocale | Sep 8 2015 | |||
| 4c3a5294935e | bcoudoin | dialogActivityConfig, made it invisible on startup | Sep 8 2015 | |||
| 490920b40eff | bcoudoin | lang, fix configuration saving | Sep 8 2015 | |||
| f26078860d4e | bcoudoin | lang, better management of the bar home button | Sep 8 2015 | |||
| 1760de305d1b | bcoudoin | lang, fixes click issues on non initialized items | Sep 8 2015 | |||
| 9b4c924054ee | bcoudoin | lang, fix the algorithm that creates the sublessons slices | Sep 8 2015 | |||
| a9681c80844c | bcoudoin | lang, fix api to use the voice as a key instead of the description | Sep 8 2015 | |||
| d8bd921aec32 | bcoudoin | lang, complete the dataset to have the last set full | Sep 8 2015 | |||
| ff9128f50333 | bcoudoin | lang, major rework to improve coding style | Sep 8 2015 | |||
| a7016b5b21cd | bcoudoin | lang, minor layout adjustment to the highlight | Sep 8 2015 | |||
| e384631334f7 | siddhism/bcoudoin | Added nextPressed function for handling return/enter/space pressed in lang.qml | Sep 8 2015 | |||
| d8b206d5ff39 | siddhism/bcoudoin | Code cleaning. removed unused imports | Sep 8 2015 | |||
| 64826e46b71a | siddhism/bcoudoin | option to reset the partitions passed of a particular level | Sep 8 2015 | |||
| ce97f36d5c09 | siddhism/bcoudoin | Added functionallity to restart the level from the exact partition where we left | Sep 8 2015 | |||
| 5a80e5eb55a3 | siddhism/bcoudoin | saved progress and favorites for different locales with key value as there… | Sep 8 2015 | |||
| cf6e0cab1919 | siddhism/bcoudoin | Real language instead of system for saving progress. | Sep 8 2015 | |||
| e0a96fe2713a | siddhism/bcoudoin | Added cheat code for mini games ctrl-1, ctrl-2 upto ctrl-5 for launching view… | Sep 8 2015 | |||
| 39a7d7247db2 | siddhism/bcoudoin | 1. Added support for saving progress in multiple languages. 2. favorites reload… | Sep 8 2015 | |||
| 2fd70c7afc87 | siddhism/bcoudoin | sorted categories in menu screen according to favorite status | Sep 8 2015 | |||
| 4e5d9a30726a | siddhism/bcoudoin | pushing changes. remaining work: displaying the correct favorite value and… | Sep 8 2015 | |||
| ef19df75f679 | siddhism/bcoudoin | Able to save the lang progress. minor fixes like image going out of box | Sep 8 2015 |
