Skip to content
Snippets Groups Projects
Commit 2c43e98f authored by SCHIEBER MORGANE's avatar SCHIEBER MORGANE :fries:
Browse files

minor modifications

parent 51ac58e1
Branches
Tags
No related merge requests found
...@@ -133,7 +133,7 @@ margin_bottom = 65.0 ...@@ -133,7 +133,7 @@ margin_bottom = 65.0
size_flags_horizontal = 3 size_flags_horizontal = 3
size_flags_vertical = 3 size_flags_vertical = 3
theme = ExtResource( 8 ) theme = ExtResource( 8 )
text = "Multiplayer Selection" text = "Character Selection"
align = 1 align = 1
valign = 1 valign = 1
uppercase = true uppercase = true
......
This diff is collapsed.
...@@ -20,19 +20,19 @@ ...@@ -20,19 +20,19 @@
[ext_resource path="res://themes/labelSkillFont.tres" type="Theme" id=18] [ext_resource path="res://themes/labelSkillFont.tres" type="Theme" id=18]
[ext_resource path="res://assets/mainMenu/letsplay.png" type="Texture" id=19] [ext_resource path="res://assets/mainMenu/letsplay.png" type="Texture" id=19]
[sub_resource type="DynamicFont" id=1] [sub_resource type="DynamicFont" id=29]
size = 22 size = 22
extra_spacing_char = 1 extra_spacing_char = 1
font_data = ExtResource( 10 ) font_data = ExtResource( 10 )
[sub_resource type="StyleBoxFlat" id=2] [sub_resource type="StyleBoxFlat" id=26]
bg_color = Color( 0.756863, 0.294118, 0.917647, 1 ) bg_color = Color( 0.756863, 0.294118, 0.917647, 1 )
corner_radius_top_left = 5 corner_radius_top_left = 5
corner_radius_top_right = 5 corner_radius_top_right = 5
corner_radius_bottom_right = 5 corner_radius_bottom_right = 5
corner_radius_bottom_left = 5 corner_radius_bottom_left = 5
[sub_resource type="StyleBoxTexture" id=3] [sub_resource type="StyleBoxTexture" id=27]
content_margin_left = 0.0 content_margin_left = 0.0
content_margin_right = 0.0 content_margin_right = 0.0
content_margin_top = 0.0 content_margin_top = 0.0
...@@ -41,7 +41,7 @@ texture = ExtResource( 11 ) ...@@ -41,7 +41,7 @@ texture = ExtResource( 11 )
region_rect = Rect2( 0, 0, 11, 250 ) region_rect = Rect2( 0, 0, 11, 250 )
axis_stretch_vertical = 2 axis_stretch_vertical = 2
[sub_resource type="StyleBoxTexture" id=4] [sub_resource type="StyleBoxTexture" id=28]
content_margin_left = 2.0 content_margin_left = 2.0
content_margin_right = 2.0 content_margin_right = 2.0
content_margin_top = 0.0 content_margin_top = 0.0
...@@ -49,7 +49,7 @@ content_margin_bottom = 0.0 ...@@ -49,7 +49,7 @@ content_margin_bottom = 0.0
texture = ExtResource( 12 ) texture = ExtResource( 12 )
region_rect = Rect2( 0, 0, 11, 329 ) region_rect = Rect2( 0, 0, 11, 329 )
[sub_resource type="Theme" id=5] [sub_resource type="Theme" id=30]
Button/colors/font_color = Color( 0, 0, 0, 1 ) Button/colors/font_color = Color( 0, 0, 0, 1 )
Button/colors/font_color_disabled = Color( 0, 0, 0, 1 ) Button/colors/font_color_disabled = Color( 0, 0, 0, 1 )
Button/colors/font_color_hover = Color( 0, 0, 0, 1 ) Button/colors/font_color_hover = Color( 0, 0, 0, 1 )
...@@ -433,10 +433,10 @@ VScrollBar/icons/decrement = null ...@@ -433,10 +433,10 @@ VScrollBar/icons/decrement = null
VScrollBar/icons/decrement_highlight = null VScrollBar/icons/decrement_highlight = null
VScrollBar/icons/increment = null VScrollBar/icons/increment = null
VScrollBar/icons/increment_highlight = null VScrollBar/icons/increment_highlight = null
VScrollBar/styles/grabber = SubResource( 2 ) VScrollBar/styles/grabber = SubResource( 26 )
VScrollBar/styles/grabber_highlight = SubResource( 3 ) VScrollBar/styles/grabber_highlight = SubResource( 27 )
VScrollBar/styles/grabber_pressed = SubResource( 3 ) VScrollBar/styles/grabber_pressed = SubResource( 27 )
VScrollBar/styles/scroll = SubResource( 4 ) VScrollBar/styles/scroll = SubResource( 28 )
VScrollBar/styles/scroll_focus = null VScrollBar/styles/scroll_focus = null
VSeparator/constants/separation = 4 VSeparator/constants/separation = 4
VSeparator/styles/separator = null VSeparator/styles/separator = null
...@@ -463,16 +463,16 @@ WindowDialog/icons/close = null ...@@ -463,16 +463,16 @@ WindowDialog/icons/close = null
WindowDialog/icons/close_highlight = null WindowDialog/icons/close_highlight = null
WindowDialog/styles/panel = null WindowDialog/styles/panel = null
[sub_resource type="DynamicFont" id=6] [sub_resource type="DynamicFont" id=31]
size = 17 size = 17
extra_spacing_char = 1 extra_spacing_char = 1
font_data = ExtResource( 15 ) font_data = ExtResource( 15 )
[sub_resource type="Theme" id=7] [sub_resource type="Theme" id=32]
default_font = SubResource( 6 ) default_font = SubResource( 31 )
LineEdit/icons/ = null LineEdit/icons/ = null
[sub_resource type="DynamicFont" id=8] [sub_resource type="DynamicFont" id=33]
size = 30 size = 30
font_data = ExtResource( 17 ) font_data = ExtResource( 17 )
...@@ -619,7 +619,7 @@ size_flags_vertical = 3 ...@@ -619,7 +619,7 @@ size_flags_vertical = 3
[node name="playWithFriendsTitle" type="Label" parent="MarginContainer/VBoxContainer/MarginContainer/Main"] [node name="playWithFriendsTitle" type="Label" parent="MarginContainer/VBoxContainer/MarginContainer/Main"]
margin_right = 984.0 margin_right = 984.0
margin_bottom = 28.0 margin_bottom = 28.0
custom_fonts/font = SubResource( 1 ) custom_fonts/font = SubResource( 29 )
text = "Jouer avec des amis" text = "Jouer avec des amis"
uppercase = true uppercase = true
...@@ -628,7 +628,7 @@ margin_top = 32.0 ...@@ -628,7 +628,7 @@ margin_top = 32.0
margin_right = 984.0 margin_right = 984.0
margin_bottom = 192.0 margin_bottom = 192.0
size_flags_vertical = 3 size_flags_vertical = 3
theme = SubResource( 5 ) theme = SubResource( 30 )
[node name="friendsPlayerList" type="VBoxContainer" parent="MarginContainer/VBoxContainer/MarginContainer/Main/ScrollContainer"] [node name="friendsPlayerList" type="VBoxContainer" parent="MarginContainer/VBoxContainer/MarginContainer/Main/ScrollContainer"]
margin_right = 984.0 margin_right = 984.0
...@@ -700,7 +700,7 @@ margin_bottom = 46.0 ...@@ -700,7 +700,7 @@ margin_bottom = 46.0
rect_min_size = Vector2( 200, 0 ) rect_min_size = Vector2( 200, 0 )
size_flags_horizontal = 10 size_flags_horizontal = 10
size_flags_vertical = 3 size_flags_vertical = 3
theme = SubResource( 7 ) theme = SubResource( 32 )
placeholder_text = "pseudo" placeholder_text = "pseudo"
[node name="addFriends" type="Button" parent="MarginContainer/VBoxContainer/MarginContainer/Main/bottomZone/addFriendsZone"] [node name="addFriends" type="Button" parent="MarginContainer/VBoxContainer/MarginContainer/Main/bottomZone/addFriendsZone"]
...@@ -719,7 +719,7 @@ margin_right = 534.0 ...@@ -719,7 +719,7 @@ margin_right = 534.0
margin_bottom = 103.0 margin_bottom = 103.0
size_flags_horizontal = 6 size_flags_horizontal = 6
size_flags_vertical = 9 size_flags_vertical = 9
custom_fonts/font = SubResource( 8 ) custom_fonts/font = SubResource( 33 )
text = "Jouer" text = "Jouer"
[node name="Label" type="Label" parent="MarginContainer/VBoxContainer/MarginContainer/Main/bottomZone"] [node name="Label" type="Label" parent="MarginContainer/VBoxContainer/MarginContainer/Main/bottomZone"]
......
...@@ -117,7 +117,7 @@ func startMenuPressed(button_name): ...@@ -117,7 +117,7 @@ func startMenuPressed(button_name):
self.add_child(t) self.add_child(t)
t.start() t.start()
yield(t, "timeout") yield(t, "timeout")
get_node("/root/Globals").load_new_scene("res://scenes/Profil.tscn") get_node("/root/Globals").load_new_scene("res://scenes/Profile.tscn")
elif button_name == "settings": elif button_name == "settings":
var fadeFond = $TextureRect4/fade var fadeFond = $TextureRect4/fade
fadeFond.play("fadeOut") fadeFond.play("fadeOut")
......
...@@ -34,9 +34,10 @@ func _ready(): ...@@ -34,9 +34,10 @@ func _ready():
func selectedGame(button_name,playerNumber): func selectedGame(button_name,playerNumber):
var globals = get_node("/root/Globals") if button_name == "play":
globals.NUMBER_OF_PLAYERS = playerNumber var globals = get_node("/root/Globals")
globals.load_new_scene("res://scenes/CharacterSelection.tscn") globals.NUMBER_OF_PLAYERS = playerNumber
globals.load_new_scene("res://scenes/CharacterSelection.tscn")
func buttonHeader(button_name): func buttonHeader(button_name):
var globals = get_node("/root/Globals") var globals = get_node("/root/Globals")
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment