interstellar_development/freeftf
3
1
Fork 1
Code Issues 29 Pull requests Projects 1 Releases Packages Wiki Activity Actions

M7 B2

Browse source 
Bug fixes and other fixes. Migration to Godot 4.3 (RC3)
This commit is contained in:
patrick_pluto 2024-08-11 19:43:03 +02:00
parent 6b6b539e81
commit f3350a462a
50 changed files with 578 additions and 478 deletions
Download patch file Download diff file Expand all files Collapse all files

26
objects/player.tscn
View file

@ -1,4 +1,4 @@
[gd_scene load_steps=6 format=3 uid="uid://b440i2oidk5sp"]
[gd_scene load_steps=5 format=3 uid="uid://b440i2oidk5sp"]
[ext_resource type="Script" path="res://scripts/movement.gd" id="1_uru11"]
@ -13,10 +13,8 @@ height = 1.75
[sub_resource type="BoxShape3D" id="BoxShape3D_e4age"]
size = Vector3(0.5, 0.25, 0.75)
[sub_resource type="BoxShape3D" id="BoxShape3D_6pbak"]
size = Vector3(0.5, 1, 0.75)
[node name="player" type="CharacterBody3D"]
floor_stop_on_slope = false
script = ExtResource("1_uru11")
[node name="in_bag" type="ColorRect" parent="."]
@ -32,6 +30,7 @@ color = Color(0, 0, 0, 1)
shape = SubResource("CapsuleShape3D_2l8cp")
[node name="bean" type="MeshInstance3D" parent="collision"]
gi_mode = 2
mesh = SubResource("CapsuleMesh_fhldf")
skeleton = NodePath("../..")
@ -88,31 +87,24 @@ size_flags_vertical = 0
theme_override_font_sizes/font_size = 64
text = "HP: 100 "
[node name="hammer" type="StaticBody3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.5, 0, 0)
[node name="hammer" type="CSGBox3D" parent="."]
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0.5, 0.5, 0)
visible = false
[node name="hammer2" type="CSGBox3D" parent="hammer"]
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 0.5, 0)
size = Vector3(0.25, 0.25, 1)
[node name="CSGBox3D" type="CSGBox3D" parent="hammer/hammer2"]
[node name="CSGBox3D" type="CSGBox3D" parent="hammer"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.75)
size = Vector3(0.5, 1, 0.75)
[node name="detect_hit" type="Area3D" parent="hammer/hammer2/CSGBox3D"]
[node name="detect_hit" type="Area3D" parent="hammer/CSGBox3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1, 0)
[node name="CollisionShape3D" type="CollisionShape3D" parent="hammer/hammer2/CSGBox3D/detect_hit"]
[node name="CollisionShape3D" type="CollisionShape3D" parent="hammer/CSGBox3D/detect_hit"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.375, 0)
shape = SubResource("BoxShape3D_e4age")
disabled = true
[node name="CollisionShape3D" type="CollisionShape3D" parent="hammer"]
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 1.25, 3.27835e-08)
shape = SubResource("BoxShape3D_6pbak")
[connection signal="timeout" from="time_in_bag" to="." method="_on_time_in_bag_timeout"]
[connection signal="timeout" from="show_fps" to="." method="_on_show_fps_timeout"]
[connection signal="timeout" from="jump_timeout" to="." method="_on_jump_timeout_timeout"]
[connection signal="body_entered" from="hammer/hammer2/CSGBox3D/detect_hit" to="." method="_on_detect_hit_body_entered"]
[connection signal="body_entered" from="hammer/CSGBox3D/detect_hit" to="." method="_on_detect_hit_body_entered"]

BIN
objects/stairs_1.gox
View file

Binary file not shown.