From 9a76089edbae93c874b24c53a9b79f1fe10ebe2f Mon Sep 17 00:00:00 2001 From: tpart Date: Sat, 29 Jun 2024 22:08:39 +0200 Subject: Add Sound singleton; Restructure sound system; Add button sounds to ingame menu --- client/project.godot | 1 + 1 file changed, 1 insertion(+) (limited to 'client/project.godot') diff --git a/client/project.godot b/client/project.godot index d595d655..4113b60d 100644 --- a/client/project.godot +++ b/client/project.godot @@ -21,6 +21,7 @@ config/icon="res://icon.png" Global="*res://global.gd" Server="*res://server.gd" +Sound="*res://audio/sound.tscn" [input] -- cgit v1.2.3-70-g09d2 From 277f71f2b68d8a4ae4e19ad63127fe75cab01379 Mon Sep 17 00:00:00 2001 From: tpart Date: Sat, 29 Jun 2024 22:13:13 +0200 Subject: Tweak zoom deadzone --- client/project.godot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'client/project.godot') diff --git a/client/project.godot b/client/project.godot index 4113b60d..1a55e9cb 100644 --- a/client/project.godot +++ b/client/project.godot @@ -106,14 +106,14 @@ boost={ ] } zoom_in={ -"deadzone": 0.5, +"deadzone": 0.25, "events": [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":4194323,"key_label":0,"unicode":0,"echo":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":4194437,"key_label":0,"unicode":43,"echo":false,"script":null) , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":5,"axis_value":1.0,"script":null) ] } zoom_out={ -"deadzone": 0.5, +"deadzone": 0.25, "events": [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":4194324,"key_label":0,"unicode":0,"echo":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":4194435,"key_label":0,"unicode":45,"echo":false,"script":null) , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":4,"axis_value":1.0,"script":null) -- cgit v1.2.3-70-g09d2 From 245950df45952e48e157f9702f2958434a63c7a4 Mon Sep 17 00:00:00 2001 From: tpart Date: Sat, 29 Jun 2024 22:18:14 +0200 Subject: Add reset camera button --- client/player/follow_camera.gd | 6 ++++++ client/project.godot | 6 ++++++ 2 files changed, 12 insertions(+) (limited to 'client/project.godot') diff --git a/client/player/follow_camera.gd b/client/player/follow_camera.gd index f0d5700d..e3ba5e92 100644 --- a/client/player/follow_camera.gd +++ b/client/player/follow_camera.gd @@ -50,6 +50,12 @@ func _process(delta): if target != null: follow(delta) +func _input(event): + if Input.is_action_just_pressed("reset"): + angle_target = 0 + angle_up_target = 1 + camera_distance_target = 10 + func follow(delta): angle_target += Input.get_axis("rotate_left", "rotate_right") * ROTATE_SPEED * delta angle = lerp_angle(angle, angle_target, delta * ROTATE_WEIGHT) diff --git a/client/project.godot b/client/project.godot index 1a55e9cb..01a0081a 100644 --- a/client/project.godot +++ b/client/project.godot @@ -125,6 +125,12 @@ chat={ , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":4,"pressure":0.0,"pressed":true,"script":null) ] } +reset={ +"deadzone": 0.5, +"events": [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":82,"key_label":0,"unicode":114,"echo":false,"script":null) +, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":3,"pressure":0.0,"pressed":true,"script":null) +] +} [internationalization] -- cgit v1.2.3-70-g09d2 From 50098f7d3dbf6fd02c41b4a68722949f991a9e0e Mon Sep 17 00:00:00 2001 From: tpart Date: Sat, 29 Jun 2024 22:23:04 +0200 Subject: Add fullscreen button --- client/global.gd | 7 +++++++ client/project.godot | 5 +++++ 2 files changed, 12 insertions(+) (limited to 'client/project.godot') diff --git a/client/global.gd b/client/global.gd index 4d1139d2..38ddace9 100644 --- a/client/global.gd +++ b/client/global.gd @@ -117,6 +117,13 @@ func _init(): settings = load_dict("user://settings", default_settings) print("DONE LOADING") +func _input(event): + if Input.is_action_just_pressed("fullscreen"): + if DisplayServer.window_get_mode() != DisplayServer.WINDOW_MODE_FULLSCREEN: + DisplayServer.window_set_mode(DisplayServer.WINDOW_MODE_FULLSCREEN) + else: + DisplayServer.window_set_mode(DisplayServer.WINDOW_MODE_WINDOWED) + func save_profile(): save_dict("user://profile", profile) diff --git a/client/project.godot b/client/project.godot index 01a0081a..df51e9d9 100644 --- a/client/project.godot +++ b/client/project.godot @@ -131,6 +131,11 @@ reset={ , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":3,"pressure":0.0,"pressed":true,"script":null) ] } +fullscreen={ +"deadzone": 0.5, +"events": [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":4194343,"key_label":0,"unicode":0,"echo":false,"script":null) +] +} [internationalization] -- cgit v1.2.3-70-g09d2