Diffusion GCompris fac8ec86f3c2

merge master in multiple_dataset
fac8ec86f3c2
Actions

Authored by jjazeix on Apr 6 2020, 9:35 AM.

Description

merge master in multiple_dataset

Details

Committed

jjazeix

Apr 6 2020, 9:35 AM

Parents

R2:01990e65b24d: note_names, move config to activityconfig (multiple dataset style)

Branches

Unknown

Tags

Unknown

References

multiple_dataset

jjazeix committed R2:fac8ec86f3c2: merge master in multiple_dataset (authored by jjazeix).Apr 6 2020, 9:35 AM

Changes (70)

		Path
M		org.kde.gcompris.appdata.xml
M		org.kde.gcompris.desktop
M		platforms/sailfishOS/harbour-gcompris-qt.desktop
M		src/activities/README
M		src/activities/activities.txt
M		src/activities/baby_tangram/ActivityInfo.qml
A	(dir)	src/activities/gravity/
V		src/activities/{gravity ← intro_gravity}/ActivityInfo.qml
A		src/activities/gravity/CMakeLists.txt
A		src/activities/gravity/Gravity.qml
V		src/activities/{gravity/Planet.qml ← intro_gravity/Asteroid.qml}
A		src/activities/gravity/gravity.js
V		src/activities/{gravity/gravity.svg ← intro_gravity/intro_gravity.svg}
A	(dir)	src/activities/gravity/resource/
A		src/activities/gravity/resource/README
P		src/activities/gravity/resource/arrow.svg Copied from src/activities/redraw/resource/orange.svg
A		src/activities/gravity/resource/background.svg
P		src/activities/gravity/resource/crash.svg Copied from src/activities/programmingMaze/resource/background-pm.svg
P		src/activities/gravity/resource/gravity.svg Copied from src/activities/braille_alphabets/resource/intro_bg.svg
A		src/activities/gravity/resource/planet0.png
A		src/activities/gravity/resource/planet1.png
A		src/activities/gravity/resource/space_shuttle.svg
V		src/activities/{gravity ← intro_gravity}/resource/tux_spaceship.svg
D		src/activities/intro_gravity
V		src/activities/{intro_gravity → gravity}/ActivityInfo.qml
V		src/activities/{intro_gravity/Asteroid.qml → gravity/Planet.qml}
D		src/activities/intro_gravity/CMakeLists.txt
D		src/activities/intro_gravity/IntroGravity.qml
D		src/activities/intro_gravity/Planet.qml
D		src/activities/intro_gravity/intro_gravity.js
V		src/activities/{intro_gravity/intro_gravity.svg → gravity/gravity.svg}
D		src/activities/intro_gravity/resource
D		src/activities/intro_gravity/resource/README
D		src/activities/intro_gravity/resource/arrow.svg
D		src/activities/intro_gravity/resource/asteroid0.png
D		src/activities/intro_gravity/resource/asteroid1.png
D		src/activities/intro_gravity/resource/asteroid2.png
D		src/activities/intro_gravity/resource/asteroid3.png
D		src/activities/intro_gravity/resource/asteroid4.png
D		src/activities/intro_gravity/resource/background.svg
D		src/activities/intro_gravity/resource/crash.svg
D		src/activities/intro_gravity/resource/neptune.svg
D		src/activities/intro_gravity/resource/saturn.svg
D		src/activities/intro_gravity/resource/space_shuttle.svg
V		src/activities/{intro_gravity → gravity}/resource/tux_spaceship.svg
D		src/activities/intro_gravity/resource/updown.svg
V		src/{activities/land_safe → core}/ControlButton.qml
M		src/activities/land_safe/LandSafe.qml
M		src/activities/land_safe/resource/README
V		src/{activities/land_safe → core}/resource/arrow_down.svg
V		src/{activities/land_safe → core}/resource/arrow_left.svg
V		src/{activities/land_safe → core}/resource/arrow_right.svg
V		src/{activities/land_safe → core}/resource/arrow_up.svg
A		src/activities/lang/resource/content-cs.json
M		src/activities/lang/resource/content-de.json
M		src/activities/lang/resource/datasetToPo.py
M		src/activities/lang/resource/poToDataset.py
M		src/activities/lightsoff/lightsoff.js
M		src/activities/memory/CardItem.qml
M		src/activities/menu/ConfigurationItem.qml
M		src/activities/solar_system/resource/README
M		src/core/CMakeLists.txt
V		src/{core ← activities/land_safe}/ControlButton.qml
M		src/core/GCText.qml
M		src/core/main.qml
M		src/core/resource/README
V		src/{core ← activities/land_safe}/resource/arrow_down.svg
V		src/{core ← activities/land_safe}/resource/arrow_left.svg
V		src/{core ← activities/land_safe}/resource/arrow_right.svg
V		src/{core ← activities/land_safe}/resource/arrow_up.svg