diff --git a/godot_ship/project.godot b/godot_ship/project.godot index 551e31a..d7f78ee 100644 --- a/godot_ship/project.godot +++ b/godot_ship/project.godot @@ -24,7 +24,7 @@ window/size/width=640 window/size/height=360 window/dpi/allow_hidpi=true window/per_pixel_transparency/allowed=true -window/stretch/mode="2d" +window/stretch/mode="viewport" window/stretch/aspect="keep" [input] @@ -72,3 +72,4 @@ common/enable_pause_aware_picking=true quality/intended_usage/framebuffer_allocation=0 2d/snapping/use_gpu_pixel_snap=true environment/default_environment="res://default_env.tres" +quality/dynamic_fonts/use_oversampling=false diff --git a/godot_ship/script/debug/debug_menu.gd b/godot_ship/script/debug/debug_menu.gd index 502ab47..9d005cd 100644 --- a/godot_ship/script/debug/debug_menu.gd +++ b/godot_ship/script/debug/debug_menu.gd @@ -6,7 +6,7 @@ var debug_transform var debug_active = false var menu_position = 0.0 -var menu_velocity = 2 +var menu_velocity = 4 # positions when the menu is hidden/active var menu_hidden = Transform2D(Vector2(1,0), Vector2(0,1), Vector2(0,-180)) diff --git a/godot_ship/script/game/Main.gd b/godot_ship/script/game/Main.gd index 86ee2c2..7167a73 100644 --- a/godot_ship/script/game/Main.gd +++ b/godot_ship/script/game/Main.gd @@ -19,7 +19,7 @@ func _ready(): gameplay = preload("res://scenes/Gameplay.tscn") options = preload("res://scenes/Options.tscn") debug_menu = preload("res://scenes/Debug Menu.tscn") - if (debug_enabled): + if debug_enabled: add_child(debug_menu.instance()) _on_change_scene("Title") @@ -38,4 +38,4 @@ func _on_quit_request(): get_tree().quit() func _on_title_request(): - get_tree().change_scene("res://scenes/Options.tscn") + get_tree().change_scene("res://scenes/Main.tscn") diff --git a/godot_ship/script/game/Message Bus.gd b/godot_ship/script/game/Message Bus.gd index 336cc10..c179af0 100644 --- a/godot_ship/script/game/Message Bus.gd +++ b/godot_ship/script/game/Message Bus.gd @@ -2,6 +2,7 @@ extends Node # Ask for a scene change signal change_scene(scene_name) +# Ask to kill scene # Ask to quit the game signal quit # Ask to return to title screen diff --git a/godot_ship/script/title screen/Title Screen.gd b/godot_ship/script/title screen/Title Screen.gd index cc83a11..5391fb8 100644 --- a/godot_ship/script/title screen/Title Screen.gd +++ b/godot_ship/script/title screen/Title Screen.gd @@ -8,24 +8,14 @@ extends Control func _ready(): $VBoxContainer/Singleplayer.grab_focus() - -# Called every frame. 'delta' is the elapsed time since the previous frame. -#func _process(delta): -# pass - - func _on_Singleplayer_pressed(): - #get_tree().change_scene("res://scenes/Gameplay.tscn") MessageBus.emit_signal("change_scene", "Singleplayer") func _on_Multiplayer_pressed(): - #get_tree().change_scene("res://scenes/Gameplay.tscn") MessageBus.emit_signal("change_scene", "Multiplayer") func _on_Options_pressed(): - #get_tree().change_scene("res://scenes/Options.tscn") MessageBus.emit_signal("change_scene", "Options") func _on_Quit_pressed(): - #get_tree().quit() MessageBus.emit_signal("quit")