diff options
| author | metamuffin <metamuffin@disroot.org> | 2024-09-04 13:52:58 +0200 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2024-09-04 13:52:58 +0200 |
| commit | d52f0d712e628b62ea48a8f6cbd897d55f6d25be (patch) | |
| tree | 1d43c8590c1aa9d96903003708ff9b68823cb871 | |
| parent | b21fb48c137d748e0d254f3ff8d65e8d7acfa218 (diff) | |
| parent | a095404c5df68f712c897ba27e756b9fc782e38c (diff) | |
| download | hurrycurry-d52f0d712e628b62ea48a8f6cbd897d55f6d25be.tar hurrycurry-d52f0d712e628b62ea48a8f6cbd897d55f6d25be.tar.bz2 hurrycurry-d52f0d712e628b62ea48a8f6cbd897d55f6d25be.tar.zst | |
Merge branch 'new-tr' of codeberg.org:hurrycurry/hurrycurry into new-tr
| -rw-r--r-- | client/map/tiles/cutting_board.tscn | 8 | ||||
| -rw-r--r-- | client/map/tiles/knife.res | bin | 0 -> 5530 bytes | |||
| -rw-r--r-- | client/map/tiles/knife.tscn | 10 |
3 files changed, 16 insertions, 2 deletions
diff --git a/client/map/tiles/cutting_board.tscn b/client/map/tiles/cutting_board.tscn index 18d2f5a0..3defaba0 100644 --- a/client/map/tiles/cutting_board.tscn +++ b/client/map/tiles/cutting_board.tscn @@ -1,10 +1,14 @@ -[gd_scene load_steps=2 format=3 uid="uid://bslx1a7kdufde"] +[gd_scene load_steps=3 format=3 uid="uid://bslx1a7kdufde"] [ext_resource type="ArrayMesh" uid="uid://dd4g04lgvsly5" path="res://map/tiles/cutting_board.res" id="1_d4k2k"] +[ext_resource type="PackedScene" uid="uid://wadi7kb021k6" path="res://map/tiles/knife.tscn" id="3_wvxni"] [node name="CuttingBoard" type="Node3D"] [node name="Mesh" type="MeshInstance3D" parent="."] -transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0.5, 0) +transform = Transform3D(0.4, 0, 0, 0, 0.5, 0, 0, 0, 0.5, -0.1, 0.5, 0) mesh = ExtResource("1_d4k2k") skeleton = NodePath("") + +[node name="Knife" parent="." instance=ExtResource("3_wvxni")] +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0.375, 0.52, 0.19) diff --git a/client/map/tiles/knife.res b/client/map/tiles/knife.res Binary files differnew file mode 100644 index 00000000..77e95cc7 --- /dev/null +++ b/client/map/tiles/knife.res diff --git a/client/map/tiles/knife.tscn b/client/map/tiles/knife.tscn new file mode 100644 index 00000000..a4dc676f --- /dev/null +++ b/client/map/tiles/knife.tscn @@ -0,0 +1,10 @@ +[gd_scene load_steps=2 format=3 uid="uid://wadi7kb021k6"] + +[ext_resource type="ArrayMesh" uid="uid://bfsaljqvte3a8" path="res://map/tiles/knife.res" id="1_uotix"] + +[node name="Knife" type="Node3D"] + +[node name="Mesh" type="MeshInstance3D" parent="."] +transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0) +mesh = ExtResource("1_uotix") +skeleton = NodePath("") |