team-sg/hero-mark-2
team-sg/hero-mark-2
5
0
Fork 1
Code Issues 12 Releases Activity

fixed some menu jank

Browse source
This commit is contained in:
pennyrigate 2024-07-13 22:03:54 -04:00
parent 8702910467
commit 11c4fa456f
2 changed files with 21 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

40
menus/main_menu.tscn
View file

@ -105,9 +105,9 @@ hframes = 3
[node name="Panel" type="Panel" parent="."]
material = SubResource( 6 )
margin_left = 16.0
margin_top = 24.0
margin_top = 32.0
margin_right = 136.0
margin_bottom = 129.0
margin_bottom = 120.0
theme = ExtResource( 1 )
[node name="Body" type="Label" parent="Panel"]
@ -116,8 +116,7 @@ margin_left = 16.0
margin_top = 8.0
margin_right = 112.0
margin_bottom = 80.0
text = "continue
file select
text = "file select
marathon mode
options
high scores
@ -125,13 +124,16 @@ sound test
exit"
[node name="GreyedContinue" type="Label" parent="Panel/Body"]
visible = false
material = SubResource( 6 )
margin_top = 9001.0
margin_right = 56.0
margin_bottom = 10.0
margin_bottom = 9011.0
custom_colors/font_color = Color( 0.690196, 0.690196, 0.690196, 1 )
text = "Continue"
[node name="Continue" type="TextureButton" parent="Panel"]
visible = false
material = SubResource( 4 )
margin_left = 8.0
margin_top = 9.0
@ -144,19 +146,19 @@ texture_focused = ExtResource( 4 )
[node name="FileSelect" type="TextureButton" parent="Panel"]
material = SubResource( 4 )
margin_left = 8.0
margin_top = 22.0
margin_top = 9.0
margin_right = 16.0
margin_bottom = 30.0
focus_neighbour_top = NodePath("../Continue")
margin_bottom = 17.0
focus_neighbour_top = NodePath("../Exit")
focus_neighbour_bottom = NodePath("../MarathonMode")
texture_focused = ExtResource( 4 )
[node name="MarathonMode" type="TextureButton" parent="Panel"]
material = SubResource( 4 )
margin_left = 8.0
margin_top = 35.0
margin_top = 22.0
margin_right = 16.0
margin_bottom = 43.0
margin_bottom = 30.0
focus_neighbour_top = NodePath("../FileSelect")
focus_neighbour_bottom = NodePath("../Options")
texture_focused = ExtResource( 4 )
@ -175,9 +177,9 @@ texture_focused = ExtResource( 4 )
[node name="Options" type="TextureButton" parent="Panel"]
material = SubResource( 4 )
margin_left = 8.0
margin_top = 48.0
margin_top = 35.0
margin_right = 16.0
margin_bottom = 56.0
margin_bottom = 43.0
focus_neighbour_top = NodePath("../MarathonMode")
focus_neighbour_bottom = NodePath("../HighScores")
texture_focused = ExtResource( 4 )
@ -185,9 +187,9 @@ texture_focused = ExtResource( 4 )
[node name="HighScores" type="TextureButton" parent="Panel"]
material = SubResource( 4 )
margin_left = 8.0
margin_top = 61.0
margin_top = 48.0
margin_right = 16.0
margin_bottom = 69.0
margin_bottom = 56.0
focus_neighbour_top = NodePath("../Options")
focus_neighbour_bottom = NodePath("../SoundTest")
texture_focused = ExtResource( 4 )
@ -195,9 +197,9 @@ texture_focused = ExtResource( 4 )
[node name="SoundTest" type="TextureButton" parent="Panel"]
material = SubResource( 4 )
margin_left = 8.0
margin_top = 74.0
margin_top = 61.0
margin_right = 16.0
margin_bottom = 82.0
margin_bottom = 69.0
focus_neighbour_top = NodePath("../HighScores")
focus_neighbour_bottom = NodePath("../Exit")
texture_focused = ExtResource( 4 )
@ -205,11 +207,11 @@ texture_focused = ExtResource( 4 )
[node name="Exit" type="TextureButton" parent="Panel"]
material = SubResource( 4 )
margin_left = 8.0
margin_top = 87.0
margin_top = 74.0
margin_right = 16.0
margin_bottom = 95.0
margin_bottom = 82.0
focus_neighbour_top = NodePath("../SoundTest")
focus_neighbour_bottom = NodePath("../Continue")
focus_neighbour_bottom = NodePath("../FileSelect")
texture_focused = ExtResource( 4 )
[node name="AnimationPlayer" type="AnimationPlayer" parent="."]

1
menus/marathon_start.gd
View file

@ -14,7 +14,6 @@ onready var difficulty_buttons := [
func _ready() -> void:
Fade.fade_in(0.4)
Audio.play_music(load("res://audio/music/rumble_revolution_demo.ogg"))
yield(get_tree(), "idle_frame")
difficulty_buttons[Game.difficulty].grab_focus()