Merge branch 'master' of https://git.unistra.fr/projet-integrateur-cmi2/cmi2

client/assets/icon.png.import

+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/icon.png-b6a7fb2db36edd3d95dc42f1dc8c1c5d.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/icon.png"
+dest_files=[ "res://.import/icon.png-b6a7fb2db36edd3d95dc42f1dc8c1c5d.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

client/default_env.tres

 [gd_resource type="Environment" load_steps=2 format=2]
+
 [sub_resource type="ProceduralSky" id=1]
+
 [resource]
 background_mode = 2
 background_sky = SubResource( 1 )

client/project.godot

@@ -16,6 +16,7 @@ _global_script_class_icons={
 [application]
 
 config/name="client"
+run/main_scene="res://scenes/levels/Game.tscn"
 config/icon="res://icon.png"
 
 [rendering]

client/scenes/entities/player/Player.tscn

 [gd_scene load_steps=4 format=2]
 
-[ext_resource path="res://Player.gd" type="Script" id=1]
+[ext_resource path="res://scenes/entities/player/Player.gd" type="Script" id=1]
 
 [sub_resource type="CapsuleShape" id=1]
 radius = 0.209134

client/scenes/levels/Game.tscn

 [gd_scene load_steps=4 format=2]
 
-[ext_resource path="res://Player.tscn" type="PackedScene" id=1]
+[ext_resource path="res://scenes/entities/player/Player.tscn" type="PackedScene" id=1]
 [ext_resource path="res://Camera.gd" type="Script" id=2]
-[ext_resource path="res://Bloc.tscn" type="PackedScene" id=3]
+[ext_resource path="res://scenes/entities/bloc/Bloc.tscn" type="PackedScene" id=3]
+
+
 
 [node name="Spatial" type="Spatial"]
 

server/project.godot

@@ -16,7 +16,7 @@ _global_script_class_icons={
 [application]
 
 config/name="server"
-run/main_scene="res://Node.tscn"
+run/main_scene="res://scenes/Node.tscn"
 config/icon="res://icon.png"
 
 [rendering]

server/scenes/Node.tscn

 [gd_scene load_steps=2 format=2]
 
-[ext_resource path="res://Node.gd" type="Script" id=1]
+[ext_resource path="res://scripts/Node.gd" type="Script" id=1]
 
 [node name="Node" type="Node"]
 script = ExtResource( 1 )