diff --git a/export_presets.cfg b/export_presets.cfg index d840d42..49812db 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -51,7 +51,7 @@ custom_features="" export_filter="all_resources" include_filter="" exclude_filter="" -export_path="../../html/index.html" +export_path="html/index.html" patches=PackedStringArray() encryption_include_filters="" encryption_exclude_filters="" diff --git a/project.godot b/project.godot index 8a23eae..f77ffe7 100644 --- a/project.godot +++ b/project.godot @@ -12,7 +12,7 @@ config_version=5 config/name="asteroid" run/main_scene="uid://jx8hrj6k1ju8" -config/features=PackedStringArray("4.4", "Forward Plus") +config/features=PackedStringArray("4.5", "Forward Plus") boot_splash/bg_color=Color(0, 0, 0, 1) boot_splash/use_filter=false boot_splash/image="uid://bby053xsfn3cp" @@ -34,9 +34,7 @@ window/vsync/vsync_mode=0 ui_accept={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194309,"physical_keycode":0,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":32,"physical_keycode":0,"key_label":0,"unicode":32,"location":0,"echo":false,"script":null) -, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":0,"pressure":0.0,"pressed":true,"script":null) +"events": [Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":0,"pressure":0.0,"pressed":true,"script":null) ] } ui_left={ @@ -86,7 +84,6 @@ right_player_2={ accept_player_2={ "deadzone": 0.2, "events": [Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":1,"button_index":0,"pressure":0.0,"pressed":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194326,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) ] } quit={ diff --git a/scene/load_screen.tscn b/scene/load_screen.tscn index 9d294e4..4bc51ce 100644 --- a/scene/load_screen.tscn +++ b/scene/load_screen.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=12 format=3 uid="uid://jx8hrj6k1ju8"] +[gd_scene load_steps=13 format=3 uid="uid://jx8hrj6k1ju8"] [ext_resource type="PackedScene" uid="uid://d1ugwu6dqomtg" path="res://scene/wall.tscn" id="1_7iavl"] [ext_resource type="Theme" uid="uid://b46gto6k33wqr" path="res://theme.tres" id="3_7iavl"] @@ -75,6 +75,12 @@ func _ready() -> void: text = GameController.get_scoreboard_singleplayer() " +[sub_resource type="GDScript" id="GDScript_dyrmm"] +script/source = "extends Label +func _ready() -> void: + text = GameController.get_scoreboard_multiplayer() +" + [node name="load_screen" type="Node2D"] [node name="wall" parent="." node_paths=PackedStringArray("spawner") instance=ExtResource("1_7iavl")] @@ -282,7 +288,7 @@ theme = ExtResource("3_7iavl") theme_override_font_sizes/font_size = 16 horizontal_alignment = 1 autowrap_mode = 1 -script = SubResource("GDScript_u3kfb") +script = SubResource("GDScript_dyrmm") [node name="Label" type="Label" parent="CanvasLayer/Control"] layout_mode = 1 diff --git a/script/wall.gd b/script/wall.gd index d405131..432636d 100644 --- a/script/wall.gd +++ b/script/wall.gd @@ -27,6 +27,7 @@ func _is_in_false(body: Node2D) -> void: var new_ship = ship_scene.instantiate() new_ship.position = body.position.rotated(PI) *.95 new_ship.rotation = body.rotation + new_ship.player_2 = body.player_2 get_parent().call_deferred("add_child",new_ship) spawner.player = new_ship body.queue_free()