Merge branch 'items' into develop

.gitignore

@@ -10,5 +10,6 @@ export_presets.cfg
 .mono/
 data_*/
 
+*.DS_Store
 *.pck
 *.x86_64

client/entities/characters/hp.gd

+extends Label
+const GAMEPATH = "/root/game/"
+
+var posPv
+var player 
+
+
+func _ready():
+	posPv = Vector3(0,0,0)
+	player = get_node("../../")
+	var my_id = get_tree().get_network_unique_id()
+
+	if str(my_id) != str (player.get_name()) : 
+		set_text('pv : 20% ')
+	
+
+
+func _process(delta):
+	var cam = get_tree().get_root().get_camera()
+	posPv.x = player.get_global_transform().origin.x-1
+	posPv.y = player.get_global_transform().origin.y+2
+	var labelIdpos = cam.unproject_position(posPv)
+	set_position(labelIdpos)

client/entities/characters/player.tscn

-[gd_scene load_steps=2 format=2]
+[gd_scene load_steps=4 format=2]
 
 [ext_resource path="res://entities/characters/player.gd" type="Script" id=1]
+[ext_resource path="res://entities/characters/pseudo.gd" type="Script" id=2]
+[ext_resource path="res://entities/characters/hp.gd" type="Script" id=3]
 
 [node name="player" type="KinematicBody"]
 script = ExtResource( 1 )
 
+[node name="Labels " type="Control" parent="."]
+margin_right = 40.0
+margin_bottom = 40.0
+
+[node name="Pseudo" type="Label" parent="Labels "]
+margin_right = 40.0
+margin_bottom = 14.0
+text = "
+"
+script = ExtResource( 2 )
+
+[node name="Hp" type="Label" parent="Labels "]
+margin_right = 40.0
+margin_bottom = 14.0
+script = ExtResource( 3 )
+
 [node name="model" type="Spatial" parent="."]
 editor/display_folded = true
 

client/entities/characters/pseudo.gd

+extends Label
+
+const GAMEPATH = "/root/game/"
+
+var posId
+var player
+var cam
+
+func _ready():
+	cam = get_tree().get_root().get_camera()
+	posId = Vector3(0,0,0)
+	player = get_node("../../")
+	print("Bonjour:",player)
+	var my_id = get_tree().get_network_unique_id()
+
+	if str(my_id) != str (player.get_name()) : 
+		set_text(player.get_name())
+#	
+
+
+func _process(delta):
+	posId.x = player.get_global_transform().origin.x-1.5
+	posId.y = player.get_global_transform().origin.y+3
+	var labelIdpos = cam.unproject_position(posId)
+	set_position(labelIdpos)