From f78844064071589f622d984a6bd212f4fc07651e Mon Sep 17 00:00:00 2001 From: PfandBoss <68470553+PfandBoss@users.noreply.github.com> Date: Sun, 11 Dec 2022 11:34:53 +0100 Subject: [PATCH] SS --- Nodes/game.tscn | 4 ++-- project.godot | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Nodes/game.tscn b/Nodes/game.tscn index fcd4974..eef582b 100644 --- a/Nodes/game.tscn +++ b/Nodes/game.tscn @@ -12,7 +12,7 @@ [ext_resource type="Texture2D" uid="uid://c2ptxav0ud0kg" path="res://Assets/Textures/Sand/Sand_Diffuse.png" id="10_g8pl7"] [ext_resource type="Shader" path="res://Nodes/game.gdshader" id="10_ugxfo"] -[sub_resource type="ShaderMaterial" id="ShaderMaterial_nox6d"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_3nh57"] render_priority = 0 shader = ExtResource("10_ugxfo") shader_parameter/albedo = ExtResource("10_g8pl7") @@ -21,7 +21,7 @@ shader_parameter/flip = null shader_parameter/scale = Vector2(5, 5) [sub_resource type="BoxMesh" id="BoxMesh_seoe7"] -material = SubResource("ShaderMaterial_nox6d") +material = SubResource("ShaderMaterial_3nh57") [node name="Game" type="Node"] script = ExtResource("1_dubwq") diff --git a/project.godot b/project.godot index 11cc347..47f2ede 100644 --- a/project.godot +++ b/project.godot @@ -130,26 +130,31 @@ p1_interact={ p2_left={ "deadzone": 0.5, "events": [Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":1,"axis":0,"axis_value":-1.0,"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":0,"physical_keycode":4194319,"unicode":0,"echo":false,"script":null) ] } p2_right={ "deadzone": 0.5, "events": [Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":1,"axis":0,"axis_value":1.0,"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":0,"physical_keycode":4194321,"unicode":0,"echo":false,"script":null) ] } p2_up={ "deadzone": 0.5, "events": [Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":1,"axis":1,"axis_value":-1.0,"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":0,"physical_keycode":4194320,"unicode":0,"echo":false,"script":null) ] } p2_down={ "deadzone": 0.5, "events": [Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":1,"axis":1,"axis_value":1.0,"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":0,"physical_keycode":4194322,"unicode":0,"echo":false,"script":null) ] } p2_interact={ "deadzone": 0.5, "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":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":46,"unicode":0,"echo":false,"script":null) ] } p1_extra={