diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..e5e6584 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,13 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Rider ignored files +/modules.xml +/contentModel.xml +/projectSettingsUpdater.xml +/.idea.Babushka.iml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..df87cf9 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/indexLayout.xml b/.idea/indexLayout.xml new file mode 100644 index 0000000..7b08163 --- /dev/null +++ b/.idea/indexLayout.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/GdSdk_4_2_2.xml b/.idea/libraries/GdSdk_4_2_2.xml new file mode 100644 index 0000000..980f51e --- /dev/null +++ b/.idea/libraries/GdSdk_4_2_2.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Babushka.csproj b/Babushka.csproj new file mode 100644 index 0000000..d7de074 --- /dev/null +++ b/Babushka.csproj @@ -0,0 +1,8 @@ + + + net6.0 + net7.0 + net8.0 + true + + \ No newline at end of file diff --git a/Babushka.sln b/Babushka.sln new file mode 100644 index 0000000..5e9d756 --- /dev/null +++ b/Babushka.sln @@ -0,0 +1,19 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Babushka", "Babushka.csproj", "{349E0430-96B6-4673-8609-74416BA9B1F6}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + ExportDebug|Any CPU = ExportDebug|Any CPU + ExportRelease|Any CPU = ExportRelease|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {349E0430-96B6-4673-8609-74416BA9B1F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {349E0430-96B6-4673-8609-74416BA9B1F6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {349E0430-96B6-4673-8609-74416BA9B1F6}.ExportDebug|Any CPU.ActiveCfg = ExportDebug|Any CPU + {349E0430-96B6-4673-8609-74416BA9B1F6}.ExportDebug|Any CPU.Build.0 = ExportDebug|Any CPU + {349E0430-96B6-4673-8609-74416BA9B1F6}.ExportRelease|Any CPU.ActiveCfg = ExportRelease|Any CPU + {349E0430-96B6-4673-8609-74416BA9B1F6}.ExportRelease|Any CPU.Build.0 = ExportRelease|Any CPU + EndGlobalSection +EndGlobal diff --git a/project.godot b/project.godot index 438dc29..5a6253c 100644 --- a/project.godot +++ b/project.godot @@ -12,7 +12,7 @@ config_version=5 config/name="Babushka" run/main_scene="res://scenes/mockups/abandoned_street_3d.tscn" -config/features=PackedStringArray("4.3", "Forward Plus") +config/features=PackedStringArray("4.2", "Forward Plus") config/icon="res://icon.svg" [autoload] @@ -81,30 +81,30 @@ enabled=PackedStringArray("res://addons/anthonyec.camera_preview/plugin.cfg", "r move_left={ "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":65,"key_label":0,"unicode":97,"location":0,"echo":false,"script":null) +"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":65,"key_label":0,"unicode":97,"echo":false,"script":null) ] } move_right={ "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":68,"key_label":0,"unicode":100,"location":0,"echo":false,"script":null) +"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":68,"key_label":0,"unicode":100,"echo":false,"script":null) ] } move_up={ "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":87,"key_label":0,"unicode":119,"location":0,"echo":false,"script":null) +"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":87,"key_label":0,"unicode":119,"echo":false,"script":null) ] } move_down={ "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":83,"key_label":0,"unicode":115,"location":0,"echo":false,"script":null) +"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":83,"key_label":0,"unicode":115,"echo":false,"script":null) ] } dialogic_default_action={ "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) +"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,"echo":false,"script":null) , Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":1,"canceled":false,"pressed":true,"double_click":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":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":88,"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":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":88,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":0,"pressure":0.0,"pressed":false,"script":null) ] } @@ -115,7 +115,7 @@ click={ } interact={ "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":69,"key_label":0,"unicode":101,"location":0,"echo":false,"script":null) +"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":69,"key_label":0,"unicode":101,"echo":false,"script":null) ] } diff --git a/scenes/mockups/abandoned_street_3d.tscn b/scenes/mockups/abandoned_street_3d.tscn index 91e92c2..e9bf950 100644 --- a/scenes/mockups/abandoned_street_3d.tscn +++ b/scenes/mockups/abandoned_street_3d.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=34 format=3 uid="uid://clxs6xfesi82s"] +[gd_scene load_steps=34 format=3 uid="uid://c1j5u0cjdswvp"] [ext_resource type="Texture2D" uid="uid://cg1cxmqbo1pa" path="res://graphics/mockups/darktree1.png" id="1_u6vd6"] [ext_resource type="Texture2D" uid="uid://fcm6etmmj65d" path="res://graphics/mockups/darktree2.png" id="2_tcvf7"] @@ -27,8 +27,8 @@ [ext_resource type="Texture2D" uid="uid://dfynp0xqtpcke" path="res://graphics/testingground/chestnut1.png" id="24_ohuks"] [ext_resource type="Texture2D" uid="uid://63rgrra0tdef" path="res://graphics/testingground/chestnut2.png" id="25_j83yj"] [ext_resource type="Texture2D" uid="uid://cygt1j1m0vpqg" path="res://graphics/mockups/field_placeholder.png" id="26_7nyv4"] -[ext_resource type="PackedScene" uid="uid://de2fn2m114eaw" path="res://scenes/props/Player3D.tscn" id="27_mqdni"] -[ext_resource type="PackedScene" uid="uid://ob04y3syvo0e" path="res://scenes/props/interaction_area.tscn" id="28_h5ibf"] +[ext_resource type="PackedScene" uid="uid://dbd1niu3tp8y5" path="res://scenes/props/Player3D.tscn" id="27_mqdni"] +[ext_resource type="PackedScene" path="res://scenes/props/interaction_area.tscn" id="28_h5ibf"] [sub_resource type="PlaneMesh" id="PlaneMesh_8dxh5"] @@ -1375,6 +1375,5 @@ shaded = true texture = ExtResource("26_7nyv4") [node name="Player3d" parent="." instance=ExtResource("27_mqdni")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.110292, 0.0067718, 0.0825893) [connection signal="interacted" from="semi_cat/InteractionArea" to="semi_cat/Dialogic" method="open" binds= ["semi_cat"]] diff --git a/scenes/props/Player3D.tscn b/scenes/props/Player3D.tscn index 6ca8670..346c045 100644 --- a/scenes/props/Player3D.tscn +++ b/scenes/props/Player3D.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=5 format=3 uid="uid://de2fn2m114eaw"] +[gd_scene load_steps=5 format=3 uid="uid://dbd1niu3tp8y5"] [ext_resource type="Texture2D" uid="uid://cvn2p215jq2am" path="res://graphics/testingground/concerned.png" id="1_5jpx2"] [ext_resource type="Script" path="res://scripts/player_3d.gd" id="1_08wm4"] diff --git a/scripts/player_3d.gd b/scripts/player_3d.gd index 1bec08c..6e2b60f 100644 --- a/scripts/player_3d.gd +++ b/scripts/player_3d.gd @@ -9,7 +9,7 @@ extends CharacterBody3D func _physics_process(delta: float) -> void: # Add the gravity. if not is_on_floor(): - velocity += get_gravity() * delta + velocity += Vector3.DOWN * delta # Handle jump. #if Input.is_action_just_pressed("ui_accept") and is_on_floor(): diff --git a/scripts/test.cs b/scripts/test.cs new file mode 100644 index 0000000..423dd86 --- /dev/null +++ b/scripts/test.cs @@ -0,0 +1,15 @@ +using Godot; +using System; + +public partial class test : Node2D +{ + // Called when the node enters the scene tree for the first time. + public override void _Ready() + { + } + + // Called every frame. 'delta' is the elapsed time since the previous frame. + public override void _Process(double delta) + { + } +}