Merge branch 'master' into sok_A_Jarvis_object_classification
Description
Description
Details
Details
- Committed
ayushagrawal Feb 6 2016, 12:39 PM - Parents
- R2:a7f89937ada2: object_classification, Added Question Bar
R2:b7dfb01bf7fc: enumerate, moved the turtle out of the background - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| b7dfb01bf7fc | bcoudoin | enumerate, moved the turtle out of the background | Feb 2 2016 | |||
| ca8ac414ee01 | jjazeix | changelog, default value for the GCompris version is 0 not the current one | Jan 31 2016 | |||
| e007223e9996 | Sergobot | Update Docbook to Qt version | Jan 31 2016 | |||
| 936857df7f4b | Yuri Chornoivan | Fix minor typos | Jan 31 2016 | |||
| 2437bbecb050 | jjazeix | explore, fix reload button | Jan 30 2016 | |||
| a957d0adabd0 | jjazeix | explore_monuments, add createdInVersion | Jan 30 2016 | |||
| 50ed1ba47c43 | jjazeix | explore_monuments, update difficulty | Jan 30 2016 | |||
| d76d7ad18acc | jjazeix | explore activities, little cleanup | Jan 30 2016 | |||
| 3361c74d8e45 | ayushagrawal/jjazeix | explore_activity, moved the explore level code from explore_monuments to… | Jan 30 2016 | |||
| 944773ac0b79 | ayushagrawal/jjazeix | Explore_farm_animals, updated its base code to explorelevels while keeping old… | Jan 30 2016 | |||
| 11f0e3157aec | ayushagrawal/jjazeix | explore_world_music, merged it's code with ExploreLevels code from… | Jan 30 2016 | |||
| 9ca72991d186 | ayushagrawal/jjazeix | explore_world_animals, merged it's code with ExploreLevels code from… | Jan 30 2016 | |||
| f08851f89328 | ayushagrawal/jjazeix | explore_monuments, Moved README.txt to resource folder and added links and… | Jan 30 2016 | |||
| 0f408d0f48e4 | ayushagrawal/jjazeix | Removed extra line of code | Jan 30 2016 | |||
| 9bc640ad956b | ayushagrawal/jjazeix | Made the description more children friendly and added readme.txt file | Jan 30 2016 | |||
| 2e6c4a5eeed2 | ayushagrawal/jjazeix | Updated QtQuick.Controls version and headers | Jan 30 2016 | |||
| 3103522103b1 | ayushagrawal/jjazeix | Added OK button | Jan 30 2016 | |||
| f87a6ec6813c | ayushagrawal/jjazeix | Added Progress Bar and reload is funtional and changed the us and world map | Jan 30 2016 | |||
| 506f128ef6b5 | ayushagrawal/jjazeix | removed extra files | Jan 30 2016 | |||
| 87f9798198db | ayushagrawal/jjazeix | Basic Activity Completed | Jan 30 2016 | |||
| aef8ab58b0a8 | Stefan Toncu/jjazeix | bar, REVIEW: 126839, BUG: 357901, resize buttons to not span out of the window | Jan 28 2016 | |||
| bac73a78528f | jjazeix | planegame, clicking next at last level makes go to level 1 instead of staying… | Jan 28 2016 | |||
| 20f76110dd6a | bcoudoin | changelog, minor formatting, set the version in bold | Jan 27 2016 | |||
| 4cdb98993c43 | jjazeix | graph_coloring, add createdInVersion: 6000 | Jan 27 2016 | |||
| 428527af7fcd | jjazeix | fix merge | Jan 27 2016 | |||
| fe49b34e8c12 | jjazeix | changelog, restore favorite menu after displaying the changelog | Jan 27 2016 | |||
| f26539ae7917 | jjazeix | changelog, add changelog in changelog in 0.60 | Jan 27 2016 | |||
| 10b944b08c68 | jjazeix | changelog, better display | Jan 27 2016 | |||
| b7d2d7b28c24 | jjazeix | template, add a createdVersion. Use it to display an icon in the menu if… | Jan 27 2016 | |||
| 2a780fe72c5a | jjazeix | changelog, adding a default panel and the version handling | Jan 27 2016 | |||
| ff718a62d9b4 | jjazeix | graph-coloring, minor fixes | Jan 23 2016 | |||
| b13b46fe5e00 | tandon/jjazeix | graph_coloring, moved activity to math section. | Jan 23 2016 | |||
| 1fabc5d0bb2a | tandon/jjazeix | graph_coloring, modified coordinates of graphs so that nodes do not overlap… | Jan 23 2016 | |||
| 43b337074053 | tandon/jjazeix | graph_coloring, consolidated all the graphs into a single file. converted the… | Jan 23 2016 | |||
| e7dd8d49ea05 | tandon/jjazeix | graph_coloring, fix alignment of symbols on rotation. | Jan 23 2016 | |||
| 6edae1e40b21 | bcoudoin/jjazeix | graph_coloring, fix CMakeLists to have resources in QtCreator | Jan 23 2016 | |||
| fc152a341c9c | bcoudoin/jjazeix | graph_coloring, renamed items without the color | Jan 23 2016 | |||
| 3d3799815fcc | bcoudoin/jjazeix | graph_coloring, reworked items to be follow our style | Jan 23 2016 | |||
| 3a118c66e6a6 | bcoudoin/jjazeix | graph_coloring, replace menu background by tic_tac_toe one | Jan 23 2016 | |||
| fbdee4aa6175 | bcoudoin/jjazeix | graph-coloring, new icon | Jan 23 2016 | |||
| 5b5811d0fd22 | tandon/jjazeix | Made the bar visible again. | Jan 23 2016 | |||
| ca6e518eefac | tandon/jjazeix | Corrected color chooser bug. Made size of color chooser relative to screen. | Jan 23 2016 | |||
| cfef9dbfacf6 | tandon/jjazeix | Added rotational effect around incorrect symbols. Removed highlighted boxes… | Jan 23 2016 | |||
| 80babc88b44d | tandon/jjazeix | Capped size of nodes yet retaining it relative to screen dimensions. | Jan 23 2016 | |||
| dee61c7a9bf7 | tandon/jjazeix | Rectified the color chooser to remain confined within the screen. | Jan 23 2016 | |||
| 819fd81c832f | tandon/jjazeix | Made the size of nodes larger. | Jan 23 2016 | |||
| e2e5ae5ac3bf | tandon/jjazeix | Made the size of node relative to screen size. | Jan 23 2016 | |||
| b620f131565c | tandon/jjazeix | Added animations. Reverted default mode to symbols. | Jan 23 2016 | |||
| e850fa1f8b18 | tandon/jjazeix | Made the node and edge positions dependent on screen width besides height. | Jan 23 2016 | |||
| fb6aa218cd93 | tandon/jjazeix | Made color mode as default. Added initialization of configuration file. | Jan 23 2016 |
