Jonathan/Babushka
2
0
Fork 0
Code Pull Requests Releases Activity

Merge remote-tracking branch 'origin/develop' into quest_system

Browse Source
This commit is contained in:
cblech
2025-05-19 11:22:20 +02:00
parent ba133ba607 1b7c35879c
commit c8e67ecf77
1320 changed files with 204205 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scenes/testing/Babushka_scene_item_pickup_testing.tscn
+2 -2
View File
@@ -1,11 +1,11 @@
[gd_scene load_steps=12 format=3 uid="uid://dbxy2y85r1d8x"]
[ext_resource type="PackedScene" uid="uid://dbd1niu3tp8y5" path="res://prefabs/Player3D.tscn" id="1_pdc5e"]
[ext_resource type="PackedScene" uid="uid://biwd3jj65qrlh" path="res://prefabs/farming/base_field.tscn" id="2_741gk"]
[ext_resource type="PackedScene" uid="uid://biwd3jj65qrlh" path="res://prefabs/farm/base_field.tscn" id="2_741gk"]
[ext_resource type="PackedScene" uid="uid://5hltxpdxmqcq" path="res://prefabs/interactions/generic_item_on_ground.tscn" id="5_sjt6k"]
[ext_resource type="PackedScene" uid="uid://cgjc4wurbgimy" path="res://prefabs/UI/Inventory/Inventory.tscn" id="6_876p1"]
[ext_resource type="Resource" uid="uid://cndd64batns31" path="res://resources/items/bucket.tres" id="6_nvnpb"]
[ext_resource type="Script" uid="uid://d17si23dtlg72" path="res://scripts/CSharp/Common/Farming/FieldService.cs" id="7_3rkjv"]
[ext_resource type="Script" uid="uid://c6hh7m8wikv04" path="res://scripts/CSharp/Common/Farming/FieldService.cs" id="7_3rkjv"]
[ext_resource type="Resource" uid="uid://c5yg3lx756v4v" path="res://resources/items/hoe.tres" id="7_hv2km"]
[ext_resource type="Resource" uid="uid://d1uuxp1lp4aro" path="res://resources/items/tomato_seed.tres" id="8_hv2km"]
scenes/testing/abandoned_street_2D.tscn
+10 -12
View File
@@ -1,8 +1,6 @@
[gd_scene load_steps=13 format=3 uid="uid://dx7gn5yiq1aki"]
[gd_scene load_steps=12 format=3 uid="uid://dx7gn5yiq1aki"]
[ext_resource type="PackedScene" uid="uid://dd3giw31imfk4" path="res://prefabs/player.tscn" id="1_aa8yc"]
[ext_resource type="Texture2D" uid="uid://cg1cxmqbo1pa" path="res://art/mockups/trees/darktree1.png" id="2_k41x3"]
[ext_resource type="Script" uid="uid://b4h7k5w0jsjri" path="res://scripts/CSharp/Common/CameraController.cs" id="2_tykdc"]
[ext_resource type="Texture2D" uid="uid://fcm6etmmj65d" path="res://art/mockups/trees/darktree2.png" id="3_tykdc"]
[ext_resource type="Texture2D" uid="uid://c8h24ouqcqlxv" path="res://art/mockups/trees/darktree3.png" id="4_4u5mu"]
[ext_resource type="Texture2D" uid="uid://dcimm8umxko8" path="res://art/mockups/trees/darktree4.png" id="5_y2pux"]
@@ -12,18 +10,10 @@
[ext_resource type="Texture2D" uid="uid://bradm5u7vjjxq" path="res://art/mockups/trees/darktree8.png" id="9_viosu"]
[ext_resource type="Texture2D" uid="uid://bryqg0hb4f0ry" path="res://art/mockups/trees/darktree9.png" id="10_clutx"]
[ext_resource type="Texture2D" uid="uid://c1iyeflkwaqxf" path="res://art/testingground/mushroom1.png" id="11_ovtse"]
[ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/Player2D.tscn" id="12_k41x3"]
[node name="AbandonedStreet" type="Node2D"]
[node name="player" parent="." instance=ExtResource("1_aa8yc")]
z_index = 1
z_as_relative = true
position = Vector2(586, 343)
[node name="Camera2D" type="Camera2D" parent="."]
position = Vector2(578, 327)
script = ExtResource("2_tykdc")
[node name="background" type="Node2D" parent="."]
[node name="Darktree1" type="Sprite2D" parent="background"]
@@ -202,3 +192,11 @@ modulate = Color(0.368627, 0.368627, 0.368627, 0.898039)
position = Vector2(577, 365)
scale = Vector2(3.64435, 0.128623)
texture = ExtResource("11_ovtse")
[node name="Player2d" parent="." instance=ExtResource("12_k41x3")]
position = Vector2(638, 274)
scale = Vector2(0.285, 0.285)
[node name="Camera2D" type="Camera2D" parent="Player2d"]
position = Vector2(522.807, 270.175)
scale = Vector2(3.50877, 3.50877)
scenes/testing/abandoned_street_3d.tscn
+1 -2
View File
@@ -1262,7 +1262,6 @@ texture = ExtResource("13_gcssn")
[node name="semi_cat" type="Sprite3D" parent="."]
transform = Transform3D(0.04, 0, 0, 0, 0.04, 0, 0, 0, 0.04, -0.568754, 0.116035, -0.275782)
visible = false
billboard = 1
shaded = true
texture = ExtResource("14_qxv15")
@@ -1394,7 +1393,7 @@ shaded = true
texture = ExtResource("29_kse13")
[node name="Player3d" parent="." instance=ExtResource("27_mqdni")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.032, 0, -0.061)
transform = Transform3D(0.17, 0, 0, 0, 0.17, 0, 0, 0, 0.17, 0.032, 0.07, -0.061)
[node name="best_house" parent="." instance=ExtResource("31_lqlrn")]
transform = Transform3D(-5.24537e-09, 0, 0.12, 0, 0.12, 0, -0.12, 0, -5.24537e-09, 0.418, 0, -0.187)