Merge branch 'master' into 'master'

Merge Uniformisation de L'UI

See merge request !10

src/.import/fond_rapport.png-29725c4d386bef2d30982ca8b611ac43.md5

+source_md5="22bfb5269f918b839d74bf6d88e9e2b0"
+dest_md5="8d1b592ccb8a3d7ec49964b5be0bf430"
+

src/menus/fin/Fin.gd

@@ -17,3 +17,8 @@ func _ready():
 # Called every frame. 'delta' is the elapsed time since the previous frame.
 #func _process(delta):
 #	pass
+
+
+func _on_Button_pressed():
+	 get_tree().change_scene("res://menus/principal/Principal.tscn")
+	 Partie._ready()

src/menus/fin/Fin.tscn

-[gd_scene load_steps=6 format=2]
+[gd_scene load_steps=9 format=2]
 
 [ext_resource path="res://scenes/scene2/Fonts/Roboto-Regular.ttf" type="DynamicFontData" id=1]
 [ext_resource path="res://menus/fin/Textures/1659875.jpg" type="Texture" id=2]
@@ -18,6 +18,15 @@ use_mipmaps = true
 use_filter = true
 font_data = ExtResource( 1 )
 
+[sub_resource type="StyleBoxFlat" id=5]
+bg_color = Color( 0.635294, 0.329412, 0, 1 )
+
+[sub_resource type="StyleBoxFlat" id=3]
+bg_color = Color( 0.635294, 0.329412, 0, 1 )
+
+[sub_resource type="StyleBoxFlat" id=4]
+bg_color = Color( 0.635294, 0.329412, 0, 1 )
+
 [node name="Fin" type="Control"]
 anchor_right = 1.0
 anchor_bottom = 1.0
@@ -148,3 +157,18 @@ align = 1
 __meta__ = {
 "_edit_use_anchors_": false
 }
+
+[node name="Button" type="Button" parent="."]
+margin_left = 704.0
+margin_top = 510.0
+margin_right = 951.0
+margin_bottom = 559.0
+custom_styles/hover = SubResource( 5 )
+custom_styles/focus = SubResource( 3 )
+custom_styles/normal = SubResource( 4 )
+custom_colors/font_color = Color( 1, 0.6, 0.282353, 1 )
+text = "Menu principale"
+__meta__ = {
+"_edit_use_anchors_": false
+}
+[connection signal="pressed" from="Button" to="." method="_on_Button_pressed"]

src/menus/principal/Principal.tscn

@@ -44,9 +44,9 @@ __meta__ = {
 
 [node name="mnu_Jouer" parent="menu_background" instance=ExtResource( 1 )]
 margin_left = -293.793
-margin_top = 374.713
+margin_top = 369.654
 margin_right = 327.207
-margin_bottom = 523.713
+margin_bottom = 518.654
 rect_pivot_offset = Vector2( 400.49, 64.32 )
 custom_styles/disabled = SubResource( 1 )
 custom_fonts/font = ExtResource( 4 )
@@ -81,3 +81,7 @@ custom_styles/normal = ExtResource( 5 )
 custom_fonts/font = SubResource( 3 )
 align = 1
 script = ExtResource( 7 )
+__meta__ = {
+"_edit_use_anchors_": false
+}
+[connection signal="text_changed" from="edit_name" to="edit_name" method="_on_edit_name_text_changed"]

src/menus/scripts/edit_name.gd

@@ -31,3 +31,8 @@ func _on_text_entered(textrnd):
 	button.disabled = (get_text() == "")
 	if get_text() != "":
 				Joueur.nom = get_text()
+
+
+func _on_edit_name_text_changed(new_text):
+	var button = get_parent().get_node("menu_background/mnu_Jouer")
+	button.disabled = (get_text() == "")

src/project.godot

@@ -24,6 +24,10 @@ config/icon="res://icon.png"
 Joueur="*res://globaux/joueur/Joueur.gd"
 Partie="*res://globaux/partie/Partie.gd"
 
+[display]
+
+window/size/resizable=false
+
 [network]
 
 limits/debugger_stdout/max_chars_per_second=5766

src/scenes/jeu/Jeu.tscn

@@ -70,9 +70,9 @@ __meta__ = {
 }
 
 [node name="Pelle" parent="Outils/VBoxContainer" instance=ExtResource( 3 )]
-margin_left = 49.0
+margin_left = 50.0
 margin_top = 62.0
-margin_right = 149.0
+margin_right = 150.0
 margin_bottom = 162.0
 nom = "Pelle"
 offset = [ 2, 2 ]
@@ -89,9 +89,9 @@ __meta__ = {
 }
 
 [node name="Pioche" parent="Outils/VBoxContainer" instance=ExtResource( 3 )]
-margin_left = 49.0
+margin_left = 50.0
 margin_top = 185.0
-margin_right = 149.0
+margin_right = 150.0
 margin_bottom = 285.0
 nom = "Pioche"
 offset = [ 3, 3 ]
@@ -108,9 +108,9 @@ __meta__ = {
 }
 
 [node name="Truelle" parent="Outils/VBoxContainer" instance=ExtResource( 3 )]
-margin_left = 49.0
+margin_left = 50.0
 margin_top = 308.0
-margin_right = 149.0
+margin_right = 150.0
 margin_bottom = 408.0
 nom = "Truelle"
 offset = [ 1, 1 ]
@@ -124,9 +124,9 @@ margin_bottom = 427.0
 rect_min_size = Vector2( 0, 15 )
 
 [node name="Pinceau" parent="Outils/VBoxContainer" instance=ExtResource( 3 )]
-margin_left = 49.0
+margin_left = 50.0
 margin_top = 431.0
-margin_right = 149.0
+margin_right = 150.0
 margin_bottom = 531.0
 nom = "Pinceau"
 tab = [ [ 1 ] ]

src/scenes/scene2/Panel.gd

@@ -15,6 +15,7 @@ onready var pb = get_node("ProgressBar")
 
 # Called when the node enters the scene tree for the first time.
 func _ready():
+	get_stylebox("panel", "" ).set_texture(load("res://scenes/scene2/textures/fond_rapport.png"))
 	obj_correcte = Partie.objet["nom"]
 	epoque_correcte = Partie.objet["epoque"]
 	date_correcte = int(Partie.objet["date"])

src/scenes/scene2/scene2.tscn

-[gd_scene load_steps=42 format=2]
+[gd_scene load_steps=41 format=2]
 
 [ext_resource path="res://scenes/scene2/Fonts/Roboto-Regular.ttf" type="DynamicFontData" id=1]
 [ext_resource path="res://scenes/scene2/Panel.gd" type="Script" id=2]
@@ -34,57 +34,54 @@ outline_color = Color( 0.223529, 0.12549, 0, 1 )
 use_filter = true
 font_data = ExtResource( 8 )
 
-[sub_resource type="StyleBoxFlat" id=2]
-bg_color = Color( 1, 1, 1, 1 )
-
-[sub_resource type="DynamicFont" id=3]
+[sub_resource type="DynamicFont" id=2]
 size = 24
 outline_color = Color( 0, 0, 0, 1 )
 use_filter = true
 font_data = ExtResource( 1 )
 
-[sub_resource type="StyleBoxFlat" id=4]
+[sub_resource type="StyleBoxFlat" id=3]
 bg_color = Color( 0.74902, 0.74902, 0.74902, 1 )
 
-[sub_resource type="StyleBoxFlat" id=5]
+[sub_resource type="StyleBoxFlat" id=4]
 
-[sub_resource type="StyleBoxFlat" id=6]
+[sub_resource type="StyleBoxFlat" id=5]
 bg_color = Color( 0.764706, 0.694118, 0.133333, 1 )
 
-[sub_resource type="StyleBoxFlat" id=7]
+[sub_resource type="StyleBoxFlat" id=6]
 bg_color = Color( 0.164706, 0.545098, 0.00784314, 1 )
 
-[sub_resource type="StyleBoxFlat" id=8]
+[sub_resource type="StyleBoxFlat" id=7]
 bg_color = Color( 0.968627, 0.580392, 0.0313726, 1 )
 
-[sub_resource type="DynamicFont" id=9]
+[sub_resource type="DynamicFont" id=8]
 size = 60
 use_filter = true
 font_data = ExtResource( 8 )
 
-[sub_resource type="DynamicFont" id=10]
+[sub_resource type="DynamicFont" id=9]
 size = 30
 font_data = ExtResource( 8 )
 
-[sub_resource type="DynamicFont" id=11]
+[sub_resource type="DynamicFont" id=10]
 size = 25
 outline_size = 1
 font_data = ExtResource( 8 )
 
-[sub_resource type="DynamicFont" id=12]
+[sub_resource type="DynamicFont" id=11]
 size = 100
 use_filter = true
 font_data = ExtResource( 8 )
 
-[sub_resource type="DynamicFont" id=13]
+[sub_resource type="DynamicFont" id=12]
 size = 25
 use_filter = true
 font_data = ExtResource( 8 )
 
-[sub_resource type="DynamicFont" id=14]
+[sub_resource type="DynamicFont" id=13]
 font_data = ExtResource( 8 )
 
-[sub_resource type="DynamicFont" id=15]
+[sub_resource type="DynamicFont" id=14]
 size = 14
 use_filter = true
 font_data = ExtResource( 8 )
@@ -176,7 +173,6 @@ __meta__ = {
 [node name="Panel" type="Panel" parent="annalyse"]
 margin_right = 724.0
 margin_bottom = 600.0
-custom_styles/panel = SubResource( 2 )
 script = ExtResource( 2 )
 __meta__ = {
 "_edit_lock_": true
@@ -187,7 +183,7 @@ margin_left = 254.0
 margin_top = 25.0
 margin_right = 501.0
 margin_bottom = 64.0
-custom_fonts/font = SubResource( 3 )
+custom_fonts/font = SubResource( 2 )
 custom_colors/font_color = Color( 0, 0, 0, 1 )
 text = "Rapport archeologique"
 
@@ -268,8 +264,8 @@ margin_left = 92.0
 margin_top = 157.0
 margin_right = 292.0
 margin_bottom = 181.0
-custom_styles/focus = SubResource( 4 )
-custom_styles/normal = SubResource( 5 )
+custom_styles/focus = SubResource( 3 )
+custom_styles/normal = SubResource( 4 )
 custom_fonts/font = ExtResource( 3 )
 custom_colors/font_color = Color( 0, 0, 0, 1 )
 __meta__ = {
@@ -281,8 +277,8 @@ margin_left = 147.0
 margin_top = 205.0
 margin_right = 316.0
 margin_bottom = 229.0
-custom_styles/focus = SubResource( 4 )
-custom_styles/normal = SubResource( 5 )
+custom_styles/focus = SubResource( 3 )
+custom_styles/normal = SubResource( 4 )
 custom_fonts/font = ExtResource( 3 )
 custom_colors/font_color = Color( 0, 0, 0, 1 )
 __meta__ = {
@@ -294,8 +290,8 @@ margin_left = 132.0
 margin_top = 246.0
 margin_right = 244.0
 margin_bottom = 270.0
-custom_styles/focus = SubResource( 4 )
-custom_styles/normal = SubResource( 5 )
+custom_styles/focus = SubResource( 3 )
+custom_styles/normal = SubResource( 4 )
 custom_fonts/font = ExtResource( 3 )
 custom_colors/font_color = Color( 0, 0, 0, 1 )
 script = ExtResource( 11 )
@@ -308,8 +304,8 @@ margin_left = 101.0
 margin_top = 286.0
 margin_right = 228.0
 margin_bottom = 310.0
-custom_styles/focus = SubResource( 4 )
-custom_styles/normal = SubResource( 5 )
+custom_styles/focus = SubResource( 3 )
+custom_styles/normal = SubResource( 4 )
 custom_fonts/font = ExtResource( 3 )
 custom_colors/font_color = Color( 0, 0, 0, 1 )
 __meta__ = {
@@ -321,8 +317,8 @@ margin_left = 173.0
 margin_top = 326.0
 margin_right = 300.0
 margin_bottom = 350.0
-custom_styles/focus = SubResource( 4 )
-custom_styles/normal = SubResource( 5 )
+custom_styles/focus = SubResource( 3 )
+custom_styles/normal = SubResource( 4 )
 custom_fonts/font = ExtResource( 3 )
 custom_colors/font_color = Color( 0, 0, 0, 1 )
 __meta__ = {
@@ -344,7 +340,7 @@ margin_left = 500.0
 margin_top = 523.0
 margin_right = 656.0
 margin_bottom = 561.0
-custom_styles/normal = SubResource( 6 )
+custom_styles/normal = SubResource( 5 )
 custom_colors/font_color_disabled = Color( 0, 0, 0, 1 )
 custom_colors/font_color = Color( 0, 0, 0, 1 )
 custom_colors/font_color_hover = Color( 0, 0, 0, 1 )
@@ -385,8 +381,8 @@ margin_left = 77.0
 margin_top = 528.0
 margin_right = 349.0
 margin_bottom = 561.0
-custom_styles/fg = SubResource( 7 )
-custom_styles/bg = SubResource( 8 )
+custom_styles/fg = SubResource( 6 )
+custom_styles/bg = SubResource( 7 )
 max_value = 180.0
 step = 1.0
 value = 180.0
@@ -445,7 +441,7 @@ stretch_mode = 1
 margin_right = 500.0
 margin_bottom = 75.0
 size_flags_horizontal = 5
-custom_fonts/font = SubResource( 9 )
+custom_fonts/font = SubResource( 8 )
 custom_colors/font_color = Color( 0, 0.223529, 0.0117647, 1 )
 align = 1
 valign = 1
@@ -480,7 +476,7 @@ anchor_bottom = -0.0187286
 margin_top = 0.749146
 margin_right = 100.0
 margin_bottom = 40.7491
-custom_fonts/font = SubResource( 10 )
+custom_fonts/font = SubResource( 9 )
 custom_colors/font_color = Color( 0.215686, 0.215686, 0.215686, 1 )
 text = "EXIT"
 align = 1
@@ -500,7 +496,7 @@ __meta__ = {
 [node name="Label" type="Label" parent="carbon_popup/Control/VBoxContainer"]
 margin_right = 300.0
 margin_bottom = 31.0
-custom_fonts/font = SubResource( 11 )
+custom_fonts/font = SubResource( 10 )
 custom_colors/font_color = Color( 0.203922, 0.203922, 0.203922, 1 )
 text = "Analyseur C-14"
 align = 1
@@ -520,7 +516,7 @@ texture = ExtResource( 13 )
 margin_right = 200.0
 margin_bottom = 150.0
 size_flags_horizontal = 5
-custom_fonts/font = SubResource( 12 )
+custom_fonts/font = SubResource( 11 )
 custom_colors/font_color = Color( 0, 0.223529, 0.0117647, 1 )
 align = 1
 valign = 1
@@ -541,7 +537,7 @@ texture_pressed = ExtResource( 15 )
 [node name="Label" type="Label" parent="carbon_popup/Control/VBoxContainer/TextureButton"]
 margin_right = 150.0
 margin_bottom = 50.0
-custom_fonts/font = SubResource( 13 )
+custom_fonts/font = SubResource( 12 )
 custom_colors/font_color = Color( 0.215686, 0.215686, 0.215686, 1 )
 text = "Analyser"
 align = 1
@@ -632,7 +628,7 @@ margin_left = 500.0
 margin_top = 50.0
 margin_right = 800.0
 margin_bottom = 425.0
-custom_fonts/mono_font = SubResource( 14 )
+custom_fonts/mono_font = SubResource( 13 )
 custom_colors/default_color = Color( 0, 0, 0, 1 )
 script = ExtResource( 21 )
 __meta__ = {
@@ -644,15 +640,15 @@ margin_left = 75.0
 margin_top = 400.0
 margin_right = 116.001
 margin_bottom = 422.0
-custom_fonts/font = SubResource( 15 )
+custom_fonts/font = SubResource( 14 )
 custom_colors/font_color = Color( 0, 0, 0, 1 )
 script = ExtResource( 22 )
 [connection signal="pressed" from="outils/VBoxContainer/carbon" to="carbon_popup" method="_on_carbon_pressed"]
 [connection signal="pressed" from="outils/VBoxContainer/encyclopedie" to="encyclopedie_popup" method="_on_encyclopedie_pressed"]
 [connection signal="timeout" from="annalyse/Panel/Timer" to="annalyse/Panel" method="_on_Timer_timeout"]
 [connection signal="pressed" from="carbon_popup/Control/Control/exit" to="carbon_popup" method="_on_exit_pressed"]
-[connection signal="pressed" from="carbon_popup/Control/VBoxContainer/TextureButton" to="carbon_popup/Control/VBoxContainer/TextureRect/affichage_taux" method="_on_TextureButton_pressed"]
 [connection signal="pressed" from="carbon_popup/Control/VBoxContainer/TextureButton" to="carbon_popup/Control/Control/date_screen/date" method="_on_TextureButton_pressed"]
+[connection signal="pressed" from="carbon_popup/Control/VBoxContainer/TextureButton" to="carbon_popup/Control/VBoxContainer/TextureRect/affichage_taux" method="_on_TextureButton_pressed"]
 [connection signal="pressed" from="encyclopedie_popup/Control/apres" to="encyclopedie_popup/Control/Label" method="_on_apres_pressed"]
 [connection signal="pressed" from="encyclopedie_popup/Control/apres" to="encyclopedie_popup/Control/TextureRect" method="_on_apres_pressed"]
 [connection signal="pressed" from="encyclopedie_popup/Control/apres" to="encyclopedie_popup/Control/RichTextLabel" method="_on_apres_pressed"]

src/scenes/scene2/textures/fond_rapport.png.import

+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/fond_rapport.png-29725c4d386bef2d30982ca8b611ac43.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://scenes/scene2/textures/fond_rapport.png"
+dest_files=[ "res://.import/fond_rapport.png-29725c4d386bef2d30982ca8b611ac43.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