Merge branch 'main' into aleajactaest

maps/basic_setup.tscn

@@ -1,15 +1,16 @@
-[gd_scene load_steps=13 format=3 uid="uid://cvdmfc2hi172g"]
+[gd_scene load_steps=14 format=3 uid="uid://cvdmfc2hi172g"]
 
 [ext_resource type="Material" uid="uid://cdijyqa881tvv" path="res://maps/materials/simple_grid_world.material" id="1_h84bv"]
 [ext_resource type="PackedScene" uid="uid://cveshwnu272vf" path="res://maps/ramp-complex.tscn" id="2_4eueh"]
 [ext_resource type="PackedScene" uid="uid://omess6wwwwcq" path="res://maps/ramp-moving.tscn" id="3_bvbgo"]
-[ext_resource type="PackedScene" uid="uid://crl0ewgy8minv" path="res://maps/panel.tscn" id="3_gwb04"]
 [ext_resource type="PackedScene" path="res://maps/moutain.tscn" id="3_rbp35"]
 [ext_resource type="PackedScene" path="res://maps/cave.tscn" id="4_pc85h"]
 [ext_resource type="PackedScene" path="res://maps/ramp.tscn" id="5_dfm8h"]
 [ext_resource type="PackedScene" uid="uid://bl1widitqdugs" path="res://maps/obstacles.tscn" id="5_mi3we"]
 [ext_resource type="PackedScene" uid="uid://bkcvep4ijijmc" path="res://maps/water-zone.tscn" id="6_0o80c"]
 [ext_resource type="PackedScene" uid="uid://c7sga2ipka52x" path="res://maps/waypoint/waypoint.tscn" id="7_5rpqq"]
+[ext_resource type="PackedScene" uid="uid://dxghflr1tlhai" path="res://maps/panel_dummy.tscn" id="11_gb0sk"]
+[ext_resource type="PackedScene" uid="uid://damn2u4n5ien" path="res://maps/panel.tscn" id="11_vd4qp"]
 
 [sub_resource type="BoxMesh" id="BoxMesh_k23th"]
 material = ExtResource( "1_h84bv" )
@@ -72,9 +73,6 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -78.3165, 1.80831, -3.74854)
 modulate = Color(1, 0.192157, 0.156863, 1)
 text = "Nage implémentée"
 
-[node name="panel" parent="." instance=ExtResource( "3_gwb04" )]
-transform = Transform3D(-0.866025, 0, 0.5, 0, 1, 0, -0.5, 0, -0.866025, -13.6829, 0, -4.71)
-
 [node name="ramp-complex" parent="." instance=ExtResource( "2_4eueh" )]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -15, 0, 15)
 
@@ -95,3 +93,9 @@ transform = Transform3D(-0.218552, 0, -0.975825, 0, 1, 0, 0.975825, 0, -0.218552
 
 [node name="water-zone" parent="." instance=ExtResource( "6_0o80c" )]
 transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, -79.9445, 0, 0)
+
+[node name="panel" parent="." instance=ExtResource( "11_vd4qp" )]
+transform = Transform3D(-0.947718, 0, 0.319108, 0, 1, 0, -0.319108, 0, -0.947718, -14, 0, -1)
+
+[node name="panel_dummy" parent="." instance=ExtResource( "11_gb0sk" )]
+transform = Transform3D(-0.755122, 0, 0.655585, 0, 1, 0, -0.655585, 0, -0.755122, -16, 0, -2)

maps/delta_boat.tscn

@@ -0,0 +1,5 @@
+[gd_scene load_steps=2 format=3 uid="uid://duptl2212yaxs"]
+
+[ext_resource type="PackedScene" uid="uid://du4206mrcfifc" path="res://maps/imports/delta_boat.gltf" id="1_hl4wi"]
+
+[node name="delta_boat" instance=ExtResource( "1_hl4wi" )]

maps/imports/delta_boat.gltf.import

@@ -0,0 +1,28 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://du4206mrcfifc"
+path="res://.godot/imported/delta_boat.gltf-e38bb97ee9d0b37a448b8d6f045842dc.scn"
+
+[deps]
+
+source_file="res://maps/imports/delta_boat.gltf"
+dest_files=["res://.godot/imported/delta_boat.gltf-e38bb97ee9d0b37a448b8d6f045842dc.scn"]
+
+[params]
+
+nodes/root_type="Node3D"
+nodes/root_name="Scene Root"
+nodes/root_scale=1.0
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.1
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+import_script/path=""
+_subresources={}

maps/imports/panel.gltf.import

@@ -3,7 +3,7 @@
 importer="scene"
 importer_version=1
 type="PackedScene"
-uid="uid://ba5x1ncy7ak0d"
+uid="uid://dwk6kjtpu1w07"
 path="res://.godot/imported/panel.gltf-5f6bc789ef31bc4470a3bee9d05ddcc2.scn"
 
 [deps]

maps/imports/panel_dummy.gltf.import

@@ -0,0 +1,28 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://daifo8pcf26aq"
+path="res://.godot/imported/panel_dummy.gltf-72cb3d8cc77f538af342191f3eca7091.scn"
+
+[deps]
+
+source_file="res://maps/imports/panel_dummy.gltf"
+dest_files=["res://.godot/imported/panel_dummy.gltf-72cb3d8cc77f538af342191f3eca7091.scn"]
+
+[params]
+
+nodes/root_type="Node3D"
+nodes/root_name="Scene Root"
+nodes/root_scale=1.0
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.1
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+import_script/path=""
+_subresources={}

maps/panel.tscn

@@ -1,5 +1,5 @@
-[gd_scene load_steps=2 format=3 uid="uid://crl0ewgy8minv"]
+[gd_scene load_steps=2 format=3 uid="uid://damn2u4n5ien"]
 
-[ext_resource type="PackedScene" uid="uid://ba5x1ncy7ak0d" path="res://maps/imports/panel.gltf" id="1_2vsan"]
+[ext_resource type="PackedScene" uid="uid://dwk6kjtpu1w07" path="res://maps/imports/panel.gltf" id="1_2vsan"]
 
 [node name="panel" instance=ExtResource( "1_2vsan" )]

maps/panel_dummy.tscn

@@ -0,0 +1,5 @@
+[gd_scene load_steps=2 format=3 uid="uid://dxghflr1tlhai"]
+
+[ext_resource type="PackedScene" uid="uid://daifo8pcf26aq" path="res://maps/imports/panel_dummy.gltf" id="1_jau0f"]
+
+[node name="panel_dummy" instance=ExtResource( "1_jau0f" )]

maps/water-zone.tscn

@@ -1,7 +1,8 @@
-[gd_scene load_steps=13 format=3 uid="uid://bkcvep4ijijmc"]
+[gd_scene load_steps=14 format=3 uid="uid://bkcvep4ijijmc"]
 
 [ext_resource type="Shader" path="res://maps/shaders/water.gdshader" id="1_j5guc"]
 [ext_resource type="Script" path="res://maps/water-zone.gd" id="1_s4mf8"]
+[ext_resource type="PackedScene" uid="uid://duptl2212yaxs" path="res://maps/delta_boat.tscn" id="2_824w2"]
 [ext_resource type="PackedScene" uid="uid://ip4lkyho0gry" path="res://maps/water_space.tscn" id="2_nnfoe"]
 [ext_resource type="Texture2D" uid="uid://dppjl2jpko3lx" path="res://maps/textures/water_normal_a.png" id="3_vwt8h"]
 [ext_resource type="Texture2D" uid="uid://b8tu2ncerig3r" path="res://maps/textures/water_normal_b.png" id="4_gohr5"]
@@ -67,6 +68,9 @@ subdivide_depth = 2
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.964225, 0)
 script = ExtResource( "1_s4mf8" )
 
+[node name="delta_boat" parent="." instance=ExtResource( "2_824w2" )]
+transform = Transform3D(-0.870957, 0, -0.49136, 0, 1, 0, 0.49136, 0, -0.870957, 7.46743, -1.07318, 12.6543)
+
 [node name="water-level" type="MeshInstance3D" parent="."]
 transform = Transform3D(20, 0, 0, 0, 1, 0, 0, 0, 20, -0.242517, -1.07318, 0.480083)
 mesh = SubResource( "PlaneMesh_uh76x" )