Merge branch 'master' into sok-parachute
Description
Description
Details
Details
- Committed
rkaur Feb 29 2016, 7:05 AM - Parents
- R2:96072e682fb4: tux plane technically fixed tux speed is adjusted
R2:16fb1547bc86: chess, display reload button when finishing a 2 players game - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 16fb1547bc86 | jjazeix | chess, display reload button when finishing a 2 players game | Feb 28 2016 | |||
| 31f4506b4ecf | jjazeix | core, adding effect when pressing buttons of IntroMessage | Feb 28 2016 | |||
| 79137f3f1dc2 | bcoudoin | imagename, moved to level3, obviously not a level 1 | Feb 28 2016 | |||
| 260d2949675d | jjazeix | template, put 2016 for the copyright year | Feb 27 2016 | |||
| 17fae95e6475 | bcoudoin | hangman, remove exec flag on fog.png | Feb 24 2016 | |||
| d997367e2efa | Andrey Cygankov/jjazeix | REVIEW: 126534, guessnumber, adding 3 levels | Feb 24 2016 | |||
| 9a3675631668 | rkaur | cloud1, cloud2, content.json has removed from hangman | Feb 24 2016 | |||
| 31e108215cb3 | bcoudoin | tangram, add a train level very rotated | Feb 22 2016 | |||
| 77c8b3a346d8 | bcoudoin | tangram, add createdInVersion | Feb 22 2016 | |||
| 6a1bb11d59e1 | bcoudoin | simplepaint, add more colors in the color selector | Feb 22 2016 | |||
| 35f2738b8b57 | hkaelberer | lang: update some german words to current orthography | Feb 22 2016 | |||
| df453bd2bc9f | hkaelberer | hangman: fix handling of upper case letters | Feb 22 2016 | |||
| f369ad051738 | bcoudoin | tangram, add support for moving items with arrow key in edition mode | Feb 22 2016 | |||
| 8dc6a67e7b4d | bcoudoin | tangram, fix little gaps in shadow images | Feb 22 2016 | |||
| faa9fa0f5501 | bcoudoin | old menus, remove ported activities | Feb 22 2016 | |||
| cb1b87de463e | bcoudoin | old menus, remove lang it is ported now | Feb 22 2016 | |||
| 9cb3c4da5299 | bcoudoin | explore, remove a bonus good when the children as a good answer | Feb 22 2016 | |||
| d5beaaca9bf2 | bcoudoin | tangram, remove ability to drag rotate items that don't support it | Feb 22 2016 | |||
| aa162f6607a2 | bcoudoin | tangram, normalized tangram image size. | Feb 22 2016 | |||
| 8e3db512e966 | bcoudoin | Merge branch 'tangram' | Feb 22 2016 | |||
| f934d01405b6 | bcoudoin | tangram, make the target shadow more visible | Feb 22 2016 | |||
| 22158aa28fc0 | bcoudoin | tangram, make the train shapes easier to distinguish | Feb 22 2016 | |||
| 8d3a0d70aae2 | bcoudoin | tangram, make moduloRotation==0 disable the rotation button | Feb 22 2016 | |||
| 390855409fee | bcoudoin | tangram, updated documentation | Feb 22 2016 | |||
| 03f96f6b7975 | bcoudoin | trangram, add a first level set with a train | Feb 22 2016 | |||
| 3559e76c4861 | bcoudoin | tangram, added an edition mode | Feb 22 2016 | |||
| 6829212a4d3f | bcoudoin | tangram, make the color of the target item a common option | Feb 22 2016 | |||
| 29f79ab60eec | bcoudoin | tangram, remove debug traces | Feb 22 2016 | |||
| da3cee4cea95 | bcoudoin | tangram, move dataset in a specific file | Feb 22 2016 | |||
| a3a5f34e6bbc | bcoudoin | tangram, made the rotation button active | Feb 22 2016 | |||
| 86bffe5decda | bcoudoin | tangram, no more deselect on drop | Feb 22 2016 | |||
| 7a9624758b6c | bcoudoin | tangram, better colorize of the shadow items. | Feb 22 2016 | |||
| edc4d6c329fb | bcoudoin | tangram, add a real tangram level for testing | Feb 22 2016 | |||
| 910745365463 | bcoudoin | tangram, car background cleanup, remove extra file | Feb 22 2016 | |||
| 81a36734d94a | bcoudoin | tangram, make the items centered instead of top left x,y | Feb 22 2016 | |||
| e723a62e5d42 | bcoudoin | tangram, avoid double bonus display due to timer latency | Feb 22 2016 | |||
| c7d5eb63c3e2 | bcoudoin | tangram, add bonus support | Feb 22 2016 | |||
| db91e76702e4 | bcoudoin | tangram, fix rotation calc if an item is flipped but not flippable | Feb 22 2016 | |||
| ef49aaacccae | bcoudoin | tangram, add another level (front view car) | Feb 22 2016 | |||
| 091f4e759c0d | bcoudoin | tangram, renamed traffic in truck | Feb 22 2016 | |||
| 0fa54a11385f | bcoudoin | tangram, improved tans control buttons | Feb 22 2016 | |||
| 5d52e70da125 | bcoudoin | tangram, add rotation and flip control button | Feb 22 2016 | |||
| 2068f1283f82 | bcoudoin | tangram, add support for initial item opacity | Feb 22 2016 | |||
| 009117b50c37 | bcoudoin | tangram, improved the concept by starting simpler | Feb 22 2016 | |||
| 5b6ca6538dc3 | bcoudoin | tangram, add resizing support | Feb 22 2016 | |||
| 7291af6db0e0 | bcoudoin | tangram, normalized all pieces to 100x100 | Feb 22 2016 | |||
| 72f1ec6c0fd6 | bcoudoin | tangram, now properly check win situation | Feb 22 2016 | |||
| def279da3e9f | bcoudoin | tangram, add support for displaying levels | Feb 22 2016 | |||
| 291084850460 | bcoudoin | tangram, initial port. not functionnal yes, just move and rotate UI. | Feb 22 2016 |
