asowneryt/gamejamgame
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into test

Browse Source
This commit is contained in:
ASOwnerYT
2026-07-26 02:01:08 +12:00
parent 7635ccd26c 31c7861266
commit fd39db872b
6 changed files with 515 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scenes/game_scene/levels/3dlevel.tscn
+15
View File
@@ -48,21 +48,36 @@ transform = Transform3D(1, 0, 0, 0, 0.25881907, 0.9659258, 0, -0.9659258, 0.2588
shadow_enabled = true
[node name="Player1" parent="." unique_id=68487004 instance=ExtResource("1_e2xum")]
<<<<<<< HEAD
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.0015082, 1, 0)
[node name="Player2" parent="." unique_id=432105976 instance=ExtResource("1_e2xum")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.154851, 1, 0)
=======
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.1742709, 1, 0)
[node name="Player2" parent="." unique_id=432105976 instance=ExtResource("1_e2xum")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.182826, 1, 0)
>>>>>>> main
player_id = 2
[node name="Path3DRope" parent="." unique_id=301387047 instance=ExtResource("2_jetiq")]
curve = SubResource("Curve3D_epadm")
attach_start_path = NodePath("../Player1")
attach_end_path = NodePath("../Player2")
<<<<<<< HEAD
max_length = 4.0
elastic_stiffness = 20.0
haul_drag = 20.0
reel_speed = 2.0
number_of_segments = 16
=======
max_length = 6.0
reel_speed = 2.0
tension_start = 4.8
snap_length = 10.0
number_of_segments = 12
>>>>>>> main
cable_thickness = 0.05
fixed_start_point = false