bif/retrace
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://gitlab.hexaquo.at/mga/retrace

Browse Source
This commit is contained in:
Leon Palluch 2020-01-29 15:25:22 +01:00
commit 511329d245
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Characters/Player/Player.gd
View File

@ -143,6 +143,9 @@ func _process(_delta):
process_animations() process_animations()
func process_input(): func process_input():
if Input.is_action_just_pressed("ui_cancel"):
get_tree().quit()
# Walking # Walking
var input_movement_vector = Vector2() var input_movement_vector = Vector2()
if Input.is_action_pressed("move_fwrd"): if Input.is_action_pressed("move_fwrd"):

2
UI/MainMenu.tscn
View File

@ -182,6 +182,7 @@ size_flags_vertical = 0
margin_right = 634.0 margin_right = 634.0
margin_bottom = 100.0 margin_bottom = 100.0
rect_min_size = Vector2( 0, 100 ) rect_min_size = Vector2( 0, 100 )
mouse_filter = 2
custom_fonts/font = SubResource( 2 ) custom_fonts/font = SubResource( 2 )
custom_colors/font_color = Color( 1, 1, 1, 1 ) custom_colors/font_color = Color( 1, 1, 1, 1 )
custom_colors/font_color_hover = Color( 0.980392, 0.839216, 0.619608, 1 ) custom_colors/font_color_hover = Color( 0.980392, 0.839216, 0.619608, 1 )
@ -193,6 +194,7 @@ margin_top = 104.0
margin_right = 634.0 margin_right = 634.0
margin_bottom = 204.0 margin_bottom = 204.0
rect_min_size = Vector2( 0, 100 ) rect_min_size = Vector2( 0, 100 )
mouse_filter = 2
custom_fonts/font = SubResource( 2 ) custom_fonts/font = SubResource( 2 )
custom_colors/font_color = Color( 1, 1, 1, 1 ) custom_colors/font_color = Color( 1, 1, 1, 1 )
custom_colors/font_color_hover = Color( 0.980392, 0.839216, 0.619608, 1 ) custom_colors/font_color_hover = Color( 0.980392, 0.839216, 0.619608, 1 )