Merge branch 'master' into 'master'

Ajout de photos objets a chercher

See merge request !9

src/.import/amulette.png-b5a6c81725d99e3c9ac06f44016a20ae.md5

+source_md5="bf86a2f37f98be08d1ec185a6f69a557"
+dest_md5="502f63ab5c46f879227db285f74d5e17"
+

src/.import/idole.png-0d7785a465e8d685206838eaf3be1db1.md5

+source_md5="f45a53cdeb1ca53b863ac8f6b10aae95"
+dest_md5="fa074868c76196f58d45ac7fc3176505"
+

src/.import/statue_bronze.png-b2ce5d394a35923b3626837e90fa7da5.md5

+source_md5="bd91a728f3eedd7650ace2d8630edf12"
+dest_md5="f8d277b57d811fa7de5f1d4f663a6ae1"
+

src/.import/statue_platre.png-5f87d81a5fce610c0243d0bb6c9b6aa4.md5

+source_md5="fdd0892f277f03d0edc53a8df4b5703c"
+dest_md5="92f49d9d2d3552cb7dcd95d7f19d1496"
+

src/.import/vase_egypte.png-d973305080d1ab977afb911ecdf5da4d.md5

+source_md5="d8671ed73ac4e0be0e1e1bdfda9b69ed"
+dest_md5="8a40e7cdb9a690cd089092e5142ad393"
+

src/.import/vase_grec.png-bcebf5f791f8f2bc3e7a35c8070f11c2.md5

+source_md5="1dadbd1411e5f00efec8a2e7aa7d24ae"
+dest_md5="17439f3b6be2a74f9137ffe326b7cd9d"
+

src/globaux/partie/Partie.gd

@@ -12,6 +12,7 @@ var liste_materiaux = null
 		
 var objets = [
 	{
+		"path":"res://scenes/scene2/photos_objets/amulette.png",
 		"nom":'Amulette de Hongshan',
 		"epoque":"Néolithique",
 		"date":"-5500",
@@ -21,6 +22,7 @@ var objets = [
 		"plage":"-6000 à -3000"
 	},
 	{
+		"path":"res://scenes/scene2/photos_objets/idole.png",
 		"nom":'Idole de Shigir',
 		"epoque":"Mésolithique",
 		"date":"-9000",
@@ -30,6 +32,7 @@ var objets = [
 		"plage":"-9500 à -7000"
 	},
 	{
+		"path":"res://scenes/scene2/photos_objets/statue_platre.png",
 		"nom":'Statue en plâtre',
 		"epoque":"Mésolitique",
 		"date":"-7200",
@@ -39,6 +42,7 @@ var objets = [
 		"plage":"-10000 à -6900"
 	},
 	{
+		"path":"res://scenes/scene2/photos_objets/statue_bronze.png",
 		"nom":'La danseuse de Mohenjo-daro',
 		"epoque":"Age du Bronze",
 		"date":"-2000",
@@ -48,6 +52,7 @@ var objets = [
 		"plage":"-2300 à -2000"
 	},
 	{
+		"path":"res://scenes/scene2/photos_objets/vase_egypte.png",
 		"nom":'Vase égyptien',
 		"epoque":"Néolithique",
 		"date":"-3150",
@@ -57,6 +62,7 @@ var objets = [
 		"plage":"-6200 à -2900"
 	},
 	{
+		"path":"res://scenes/scene2/photos_objets/vase_grec.png",
 		"nom":'Vase grèque',
 		"epoque":"Néolithique",
 		"date":"-5000",

src/scenes/scene2/photos_objets/amulette.png.import

+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/amulette.png-b5a6c81725d99e3c9ac06f44016a20ae.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://scenes/scene2/photos_objets/amulette.png"
+dest_files=[ "res://.import/amulette.png-b5a6c81725d99e3c9ac06f44016a20ae.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

src/scenes/scene2/photos_objets/idole.png.import

+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/idole.png-0d7785a465e8d685206838eaf3be1db1.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://scenes/scene2/photos_objets/idole.png"
+dest_files=[ "res://.import/idole.png-0d7785a465e8d685206838eaf3be1db1.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

src/scenes/scene2/photos_objets/statue_bronze.png.import

+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/statue_bronze.png-b2ce5d394a35923b3626837e90fa7da5.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://scenes/scene2/photos_objets/statue_bronze.png"
+dest_files=[ "res://.import/statue_bronze.png-b2ce5d394a35923b3626837e90fa7da5.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0