Merge branch 'dev' into 'feature/styleTool'

# Conflicts: # mainwindow.cpp # mainwindow.h # mainwindow.ui
2025-06-20 21:57:30 +00:00
parent a74c419c5d 2ad71467d8
commit e85e3f9c07
17 changed files with 1445 additions and 431 deletions
@@ -1,44 +0,0 @@
-{
-	"name": "parcous1",
-	"city": "Bourg en bresse",
-	"departement": 1,
-	"difficulty": 2,
-	"duration": 2.3,
-	"length": 17.3,
-	"image": "data/parcours1.png",
-	"steps": [
-		{
-			"numero": 1,
-			"title": "Première étape",
-			"GPS": "N 45 37.199 W 1 2.009",
-			"reponse": -1,
-			"dialogue": [
-				{
-					"personnage": "Quentin",
-					"texte": "ligne de dialogue 1"
-				},
-				{
-                                        "personnage": "Malo",
-                                        "texte": "ligne de dialogue 2"
-				}
-			]
-		},
-		{
-                        "numero": 2,
-                        "title": "Deuxième étape",
-                        "GPS": "S 45 37.199 E 1 2.009",
-                        "reponse": 4156,
-                        "dialogue": [
-                                { 
-                                        "personnage": "Antoine",
-                                        "texte": "ligne de dialogue 1"
-                                },
-                                { 
-                                        "personnage": "Giovanni",
-                                        "texte": "ligne de dialogue 2"
-                                }
-                        ]
-                }
-	]
-
-}