Merge remote-tracking branch 'origin/master' into gsocSagarRenewable_energy
Description
Description
Details
Details
- Committed
scagarwal Sep 5 2015, 1:12 AM - Parents
- R2:9f0ffb3b1b07: watercycle, add audio effects
R2:12b1a55f1d0e: renewable_energy, minor naming change to suit qml rules - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
9f0ffb3b1b07 | bcoudoin | watercycle, add audio effects | Sep 2 2015 | |||
be3728840a8b | bcoudoin | money, some more layout adjustment, reuse the instructions area | Sep 1 2015 | |||
6989faae9d9a | bcoudoin | money, better layout for this image | Sep 1 2015 | |||
28f4e837ee7e | bcoudoin | money, layout adjustments to avoid item overflow | Sep 1 2015 | |||
1b1acf18c100 | bcoudoin | chess, add sound effects | Sep 1 2015 | |||
90d12ef1eeb0 | bcoudoin | target, make the entry length the size of the result plus 1 | Sep 1 2015 | |||
7d99f08ee6d2 | jjazeix | BUG:352078 remove extra //:, no empty other was found | Sep 1 2015 | |||
41d4c414789a | bcoudoin | chess, add a redo feature | Aug 31 2015 | |||
2673e24fbdf0 | bcoudoin | chess, some minor layout adjustments | Aug 31 2015 | |||
86ee587acfd8 | bcoudoin | chess, add support for drag and drop | Aug 30 2015 | |||
e0ac0a25a496 | hkaelberer/jjazeix | downloadManager, fix potential deadlock when loading resource in a row | Aug 27 2015 | |||
168f546fb76c | bcoudoin | chess, fix an off by one in pawn promotion | Aug 26 2015 | |||
09f1f4788559 | bcoudoin | chess, remove an undef reference to image on piece taken | Aug 25 2015 | |||
38417aec7172 | bcoudoin | chess, add a promotion animation | Aug 25 2015 | |||
fd0a5c84aa6e | bcoudoin | chess, better calculation of a white spot | Aug 24 2015 | |||
6299ac4b3927 | bcoudoin | chess, add queen promotion | Aug 24 2015 | |||
c3cfbe989bae | jjazeix | watercycle, fix typo + remove blinking if clicking on same element | Aug 24 2015 | |||
763bc73a013f | jjazeix | Combobo, vertical alignement of label text with the button | Aug 24 2015 | |||
548b3bd861e5 | jjazeix | chess, fix copyright header | Aug 24 2015 | |||
3004d19aa7a9 | Rajdeep Kaur/bcoudoin | gletters, minor fix a race could occurs on start | Aug 24 2015 | |||
06176754908f | bcoudoin | chess, add a missing qsTr in a manual | Aug 24 2015 | |||
29100351a228 | bcoudoin | chess, fix undo on first move | Aug 24 2015 | |||
206a741be21a | bcoudoin | chess, add a timer to let the computer play after the children | Aug 24 2015 | |||
fcdf389dd60e | bcoudoin | watercycle, removed exec flag on files | Aug 23 2015 | |||
11685b6f030c | bcoudoin | chess, improved instructions | Aug 23 2015 | |||
71f055c3df2d | bcoudoin | chess, added a nice background | Aug 23 2015 | |||
4e1a83768701 | bcoudoin | chess, add board and piece animation | Aug 23 2015 | |||
22b6f80ad5f7 | bcoudoin | chess, no more allow invalid moves | Aug 23 2015 | |||
d22b68553e53 | bcoudoin | chess, party end is always difficult | Aug 23 2015 | |||
1e79ae429eec | bcoudoin | chess, add a difficultyByLevel option | Aug 23 2015 | |||
4fe7563564b1 | bcoudoin | chess, more level for party end | Aug 23 2015 | |||
b980da805a94 | bcoudoin | chess, make a vertical symetrical view of the board | Aug 23 2015 | |||
f59d34d589a9 | bcoudoin | chess, add a message on invalid move | Aug 23 2015 | |||
abfdd32e370b | bcoudoin | chess, disable swap button when playing against Tux | Aug 23 2015 | |||
cc8bb489092d | bcoudoin | chess, better activity description | Aug 23 2015 | |||
4e06de223b26 | bcoudoin | chess, add a reload button | Aug 23 2015 | |||
b0a91af3538d | bcoudoin | chess, keep move selection on bad move | Aug 23 2015 | |||
45a665efb527 | bcoudoin | chess, hide the level button in 2 players mode | Aug 23 2015 | |||
2998b145ddb8 | bcoudoin | chess, fixes undo to get back on the right player turn | Aug 23 2015 | |||
1772c6d78c50 | bcoudoin | chess, fixes display of whose turn | Aug 23 2015 | |||
3f7d106b10a4 | bcoudoin | chess, make the engine do a 3 deep search | Aug 23 2015 | |||
991675ed8dbe | bcoudoin | chess, display a message about the position (check, mates) | Aug 23 2015 | |||
dea4cfd906bb | bcoudoin | chess, display whose turn | Aug 23 2015 | |||
5ea76a89a2fb | bcoudoin | old menus, removed chess | Aug 23 2015 | |||
0c02a3dfc63b | bcoudoin | chess_partyend, new activity to play end of chess game | Aug 23 2015 | |||
b3e07ba93992 | bcoudoin | chess_2players, add copyright, fix file naming | Aug 23 2015 | |||
ff0c6ecd0447 | bcoudoin | chess, add copyright info | Aug 23 2015 | |||
17fa8710f645 | bcoudoin | chess, pass the initial position for each level as param | Aug 23 2015 | |||
c31e3c9bfb37 | bcoudoin | chess_2players, new activity, a 2 players mode for the chess | Aug 23 2015 | |||
85b5bd69652b | bcoudoin | chess, manual and icon improved | Aug 23 2015 |