Skip to content

Commit

Permalink
Revert "Update project to Godot 4.4" to keep backwards compatibility
Browse files Browse the repository at this point in the history
This reverts commit 163edb6.
  • Loading branch information
mphe committed Feb 7, 2025
1 parent 7cff353 commit 0e4a540
Show file tree
Hide file tree
Showing 40 changed files with 75 additions and 103 deletions.
4 changes: 0 additions & 4 deletions demo/.editorconfig

This file was deleted.

1 change: 0 additions & 1 deletion demo/addons/diagnosticlist/Diagnostic.gd.uid

This file was deleted.

1 change: 0 additions & 1 deletion demo/addons/diagnosticlist/DiagnosticProvider.gd.uid

This file was deleted.

1 change: 0 additions & 1 deletion demo/addons/diagnosticlist/LSPClient.gd.uid

This file was deleted.

1 change: 0 additions & 1 deletion demo/addons/diagnosticlist/Panel.gd.uid

This file was deleted.

1 change: 0 additions & 1 deletion demo/addons/diagnosticlist/Settings.gd.uid

This file was deleted.

1 change: 0 additions & 1 deletion demo/addons/diagnosticlist/plugin.gd.uid

This file was deleted.

1 change: 0 additions & 1 deletion demo/addons/ropesim/BaseRopeTool2D.gd.uid

This file was deleted.

1 change: 0 additions & 1 deletion demo/addons/ropesim/Rope.gd.uid

This file was deleted.

1 change: 0 additions & 1 deletion demo/addons/ropesim/RopeAnchor.gd.uid

This file was deleted.

1 change: 0 additions & 1 deletion demo/addons/ropesim/RopeCollisionShapeGenerator.gd.uid

This file was deleted.

1 change: 0 additions & 1 deletion demo/addons/ropesim/RopeHandle.gd.uid

This file was deleted.

1 change: 0 additions & 1 deletion demo/addons/ropesim/RopeInteraction.gd.uid

This file was deleted.

1 change: 0 additions & 1 deletion demo/addons/ropesim/RopeRendererLine2D.gd.uid

This file was deleted.

1 change: 0 additions & 1 deletion demo/addons/ropesim/RopeToolHelper.gd.uid

This file was deleted.

1 change: 0 additions & 1 deletion demo/addons/ropesim/libropesim.gdextension.uid

This file was deleted.

1 change: 0 additions & 1 deletion demo/addons/ropesim/plugin.cfg.uid

This file was deleted.

1 change: 0 additions & 1 deletion demo/addons/ropesim/plugin.gd.uid

This file was deleted.

2 changes: 1 addition & 1 deletion demo/project.godot
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ config_version=5
[application]

config/name="ropesim example"
config/features=PackedStringArray("4.4")
config/features=PackedStringArray("4.3")
config/icon="res://rope_examples/icon.svg"

[debug]
Expand Down
14 changes: 7 additions & 7 deletions demo/rope_examples/anchors.tscn
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[gd_scene load_steps=8 format=3 uid="uid://l03q4o7r2nuk"]

[ext_resource type="Script" uid="uid://di64tfb4141om" path="res://rope_examples/scripts/animation_player.gd" id="1_sodim"]
[ext_resource type="Script" uid="uid://csxgkjub6ha7q" path="res://addons/ropesim/RopeAnchor.gd" id="2_hm10y"]
[ext_resource type="Script" path="res://rope_examples/scripts/animation_player.gd" id="1_sodim"]
[ext_resource type="Script" path="res://addons/ropesim/RopeAnchor.gd" id="2_hm10y"]
[ext_resource type="Texture2D" uid="uid://criwv6nuivcxy" path="res://rope_examples/icon.svg" id="3_y0u5w"]
[ext_resource type="Script" uid="uid://clgvn2tp1pcmc" path="res://addons/ropesim/Rope.gd" id="4_jxxrc"]
[ext_resource type="Script" path="res://addons/ropesim/Rope.gd" id="4_jxxrc"]

[sub_resource type="Animation" id="Animation_1pnxe"]
length = 0.001
Expand Down Expand Up @@ -39,15 +39,15 @@ tracks/0/keys = {

[sub_resource type="AnimationLibrary" id="AnimationLibrary_agh7j"]
_data = {
&"RESET": SubResource("Animation_1pnxe"),
&"moving": SubResource("Animation_q02ig")
"RESET": SubResource("Animation_1pnxe"),
"moving": SubResource("Animation_q02ig")
}

[node name="main" type="Node2D"]

[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
libraries = {
&"": SubResource("AnimationLibrary_agh7j")
"": SubResource("AnimationLibrary_agh7j")
}
script = ExtResource("1_sodim")

Expand All @@ -66,8 +66,8 @@ texture = ExtResource("3_y0u5w")
position = Vector2(252.384, 257.986)
rotation = 2.85458
script = ExtResource("2_hm10y")
apply_angle = true
rope_path = NodePath("../Rope")
apply_angle = true

[node name="Icon" type="Sprite2D" parent="RopeAnchor2"]
position = Vector2(32, 0)
Expand Down
4 changes: 2 additions & 2 deletions demo/rope_examples/benchmark.tscn
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[gd_scene load_steps=3 format=3 uid="uid://dwdcelii43tt4"]

[ext_resource type="Script" uid="uid://clgvn2tp1pcmc" path="res://addons/ropesim/Rope.gd" id="1_6c85y"]
[ext_resource type="Script" uid="uid://chfmedpjghm3f" path="res://rope_examples/scripts/PerformanceLabel.gd" id="2_ms00a"]
[ext_resource type="Script" path="res://addons/ropesim/Rope.gd" id="1_6c85y"]
[ext_resource type="Script" path="res://rope_examples/scripts/PerformanceLabel.gd" id="2_ms00a"]

[node name="benchmark" type="Node2D"]

Expand Down
8 changes: 4 additions & 4 deletions demo/rope_examples/breakable_rope.tscn
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[gd_scene load_steps=7 format=3 uid="uid://dkkstr4acmsvu"]

[ext_resource type="Script" uid="uid://i2s8a0vsi3c1" path="res://rope_examples/scripts/split_controller.gd" id="1_34iqv"]
[ext_resource type="Script" uid="uid://clgvn2tp1pcmc" path="res://addons/ropesim/Rope.gd" id="2_dlb8k"]
[ext_resource type="Script" uid="uid://dnyc71ljegebe" path="res://addons/ropesim/RopeHandle.gd" id="3_nlat5"]
[ext_resource type="Script" uid="uid://csxgkjub6ha7q" path="res://addons/ropesim/RopeAnchor.gd" id="4_2ql0w"]
[ext_resource type="Script" path="res://rope_examples/scripts/split_controller.gd" id="1_34iqv"]
[ext_resource type="Script" path="res://addons/ropesim/Rope.gd" id="2_dlb8k"]
[ext_resource type="Script" path="res://addons/ropesim/RopeHandle.gd" id="3_nlat5"]
[ext_resource type="Script" path="res://addons/ropesim/RopeAnchor.gd" id="4_2ql0w"]

[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_6bata"]
bg_color = Color(1, 1, 1, 1)
Expand Down
14 changes: 7 additions & 7 deletions demo/rope_examples/collision_detection.tscn
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[gd_scene load_steps=10 format=3 uid="uid://d3hb4pwl1ucly"]

[ext_resource type="Script" uid="uid://di64tfb4141om" path="res://rope_examples/scripts/animation_player.gd" id="1_auvbo"]
[ext_resource type="Script" uid="uid://cbgknb6qyln5v" path="res://addons/ropesim/RopeCollisionShapeGenerator.gd" id="3_10pwp"]
[ext_resource type="Script" path="res://rope_examples/scripts/animation_player.gd" id="1_auvbo"]
[ext_resource type="Script" path="res://addons/ropesim/RopeCollisionShapeGenerator.gd" id="3_10pwp"]
[ext_resource type="Texture2D" uid="uid://criwv6nuivcxy" path="res://rope_examples/icon.svg" id="3_jqc61"]
[ext_resource type="Script" uid="uid://cns8gtt80tsgg" path="res://rope_examples/scripts/collision_detector.gd" id="4_b0a70"]
[ext_resource type="Script" uid="uid://clgvn2tp1pcmc" path="res://addons/ropesim/Rope.gd" id="4_wgvfy"]
[ext_resource type="Script" path="res://rope_examples/scripts/collision_detector.gd" id="4_b0a70"]
[ext_resource type="Script" path="res://addons/ropesim/Rope.gd" id="4_wgvfy"]

[sub_resource type="Animation" id="Animation_1pnxe"]
length = 0.001
Expand Down Expand Up @@ -40,8 +40,8 @@ tracks/0/keys = {

[sub_resource type="AnimationLibrary" id="AnimationLibrary_agh7j"]
_data = {
&"RESET": SubResource("Animation_1pnxe"),
&"moving": SubResource("Animation_q02ig")
"RESET": SubResource("Animation_1pnxe"),
"moving": SubResource("Animation_q02ig")
}

[sub_resource type="RectangleShape2D" id="RectangleShape2D_xyd70"]
Expand All @@ -51,7 +51,7 @@ size = Vector2(128, 128)

[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
libraries = {
&"": SubResource("AnimationLibrary_agh7j")
"": SubResource("AnimationLibrary_agh7j")
}
script = ExtResource("1_auvbo")

Expand Down
10 changes: 5 additions & 5 deletions demo/rope_examples/hair.tscn
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[gd_scene load_steps=8 format=3 uid="uid://meudxbssctd7"]

[ext_resource type="Script" uid="uid://di64tfb4141om" path="res://rope_examples/scripts/animation_player.gd" id="1_hhfs1"]
[ext_resource type="Script" path="res://rope_examples/scripts/animation_player.gd" id="1_hhfs1"]
[ext_resource type="Texture2D" uid="uid://criwv6nuivcxy" path="res://rope_examples/icon.svg" id="2_3mr5p"]
[ext_resource type="PackedScene" uid="uid://das2x73tumbrb" path="res://rope_examples/scripts/hair.tscn" id="3_xmkdr"]
[ext_resource type="Script" uid="uid://dnyc71ljegebe" path="res://addons/ropesim/RopeHandle.gd" id="4_r73xa"]
[ext_resource type="Script" path="res://addons/ropesim/RopeHandle.gd" id="4_r73xa"]

[sub_resource type="Animation" id="Animation_rnorx"]
length = 0.001
Expand Down Expand Up @@ -278,16 +278,16 @@ tracks/10/keys = {

[sub_resource type="AnimationLibrary" id="AnimationLibrary_vgrqo"]
_data = {
&"RESET": SubResource("Animation_rnorx"),
&"moving": SubResource("Animation_sbles")
"RESET": SubResource("Animation_rnorx"),
"moving": SubResource("Animation_sbles")
}

[node name="Node2D" type="Node2D"]
position = Vector2(246, 121)

[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
libraries = {
&"": SubResource("AnimationLibrary_vgrqo")
"": SubResource("AnimationLibrary_vgrqo")
}
autoplay = "moving"
script = ExtResource("1_hhfs1")
Expand Down
28 changes: 14 additions & 14 deletions demo/rope_examples/handles.tscn
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[gd_scene load_steps=7 format=3 uid="uid://bajrq5fmp5squ"]

[ext_resource type="Script" uid="uid://dnyc71ljegebe" path="res://addons/ropesim/RopeHandle.gd" id="1_n2oah"]
[ext_resource type="Script" uid="uid://di64tfb4141om" path="res://rope_examples/scripts/animation_player.gd" id="3_g6662"]
[ext_resource type="Script" uid="uid://clgvn2tp1pcmc" path="res://addons/ropesim/Rope.gd" id="3_h0p3k"]
[ext_resource type="Script" path="res://addons/ropesim/RopeHandle.gd" id="1_n2oah"]
[ext_resource type="Script" path="res://rope_examples/scripts/animation_player.gd" id="3_g6662"]
[ext_resource type="Script" path="res://addons/ropesim/Rope.gd" id="3_h0p3k"]

[sub_resource type="Animation" id="Animation_1pnxe"]
length = 0.001
Expand Down Expand Up @@ -38,8 +38,8 @@ tracks/0/keys = {

[sub_resource type="AnimationLibrary" id="AnimationLibrary_agh7j"]
_data = {
&"RESET": SubResource("Animation_1pnxe"),
&"moving": SubResource("Animation_q02ig")
"RESET": SubResource("Animation_1pnxe"),
"moving": SubResource("Animation_q02ig")
}

[node name="main" type="Node2D"]
Expand Down Expand Up @@ -89,9 +89,9 @@ metadata/_edit_group_ = true
[node name="RopeHandle2" type="Marker2D" parent="."]
position = Vector2(417, 160)
script = ExtResource("1_n2oah")
strength = 1.0
rope_path = NodePath("../Rope3")
rope_position = 0.582
strength = 1.0

[node name="Label3" type="Label" parent="."]
offset_left = 31.0
Expand All @@ -103,16 +103,16 @@ text = "A free hanging rope (fixate_begin = false) controlled by two handles"
[node name="RopeHandleBegin" type="Marker2D" parent="."]
position = Vector2(114, 428)
script = ExtResource("1_n2oah")
strength = 1.0
rope_path = NodePath("../Rope2")
rope_position = 0.207
strength = 1.0

[node name="RopeHandleEnd" type="Marker2D" parent="."]
position = Vector2(203, 415)
script = ExtResource("1_n2oah")
strength = 1.0
rope_path = NodePath("../Rope2")
rope_position = 0.775
strength = 1.0

[node name="Rope2" type="Node2D" parent="."]
position = Vector2(168, 403)
Expand All @@ -131,18 +131,18 @@ text = "Smoothed handle transition enabled"

[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
libraries = {
&"": SubResource("AnimationLibrary_agh7j")
"": SubResource("AnimationLibrary_agh7j")
}
script = ExtResource("3_g6662")

[node name="RopeHandle3" type="Marker2D" parent="."]
position = Vector2(873, 301)
script = ExtResource("1_n2oah")
rope_path = NodePath("../Rope4")
rope_position = 0.531
smoothing = true
position_smoothing_speed = 3.705
strength = 1.0
rope_path = NodePath("../Rope4")
rope_position = 0.531

[node name="Rope4" type="Node2D" parent="."]
position = Vector2(799, 297)
Expand All @@ -167,15 +167,15 @@ fixate_begin = false
[node name="RopeHandleBegin" type="Marker2D" parent="Rope5"]
position = Vector2(-10, -4)
script = ExtResource("1_n2oah")
strength = 1.0
rope_path = NodePath("..")
rope_position = 0.0
strength = 1.0

[node name="RopeHandleEnd" type="Marker2D" parent="Rope5"]
position = Vector2(204, 22)
script = ExtResource("1_n2oah")
strength = 1.0
rope_path = NodePath("..")
strength = 1.0

[node name="Rope6" type="Node2D" parent="."]
position = Vector2(636, 564)
Expand All @@ -185,5 +185,5 @@ max_endpoint_distance = 150.0
[node name="RopeHandleEnd" type="Marker2D" parent="Rope6"]
position = Vector2(160, 86)
script = ExtResource("1_n2oah")
strength = 1.0
rope_path = NodePath("..")
strength = 1.0
18 changes: 9 additions & 9 deletions demo/rope_examples/line_renderer.tscn
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[gd_scene load_steps=10 format=3 uid="uid://g4jonp46a2qd"]

[ext_resource type="Script" uid="uid://dnyc71ljegebe" path="res://addons/ropesim/RopeHandle.gd" id="1_1x8kc"]
[ext_resource type="Script" uid="uid://di64tfb4141om" path="res://rope_examples/scripts/animation_player.gd" id="1_ip83o"]
[ext_resource type="Script" path="res://addons/ropesim/RopeHandle.gd" id="1_1x8kc"]
[ext_resource type="Script" path="res://rope_examples/scripts/animation_player.gd" id="1_ip83o"]
[ext_resource type="Texture2D" uid="uid://criwv6nuivcxy" path="res://rope_examples/icon.svg" id="3_dh00w"]
[ext_resource type="Script" uid="uid://clgvn2tp1pcmc" path="res://addons/ropesim/Rope.gd" id="4_5xugj"]
[ext_resource type="Script" uid="uid://jy5ea5ae2yq2" path="res://addons/ropesim/RopeRendererLine2D.gd" id="5_rievp"]
[ext_resource type="Script" path="res://addons/ropesim/Rope.gd" id="4_5xugj"]
[ext_resource type="Script" path="res://addons/ropesim/RopeRendererLine2D.gd" id="5_rievp"]

[sub_resource type="Animation" id="Animation_m8wea"]
length = 0.001
Expand Down Expand Up @@ -64,8 +64,8 @@ tracks/1/keys = {

[sub_resource type="AnimationLibrary" id="AnimationLibrary_ny3rx"]
_data = {
&"RESET": SubResource("Animation_m8wea"),
&"moving": SubResource("Animation_sw2bi")
"RESET": SubResource("Animation_m8wea"),
"moving": SubResource("Animation_sw2bi")
}

[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_xi23p"]
Expand All @@ -78,7 +78,7 @@ expand_margin_right = 2.0

[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
libraries = {
&"": SubResource("AnimationLibrary_ny3rx")
"": SubResource("AnimationLibrary_ny3rx")
}
script = ExtResource("1_ip83o")

Expand Down Expand Up @@ -312,15 +312,15 @@ script = ExtResource("5_rievp")

[node name="RopeHandle" type="Marker2D" parent="Rope3"]
script = ExtResource("1_1x8kc")
strength = 1.0
rope_path = NodePath("..")
rope_position = 0.0
strength = 1.0

[node name="RopeHandle2" type="Marker2D" parent="Rope3"]
position = Vector2(96.5881, -2)
script = ExtResource("1_1x8kc")
strength = 1.0
rope_path = NodePath("..")
strength = 1.0

[node name="Rope4" type="Node2D" parent="."]
position = Vector2(1845, 189)
Expand Down
2 changes: 1 addition & 1 deletion demo/rope_examples/rigidbody_rope_attachment.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[ext_resource type="PackedScene" uid="uid://beuu34gtk2nhm" path="res://rope_examples/scripts/rope_with_rigidbody.tscn" id="1_aij5x"]
[ext_resource type="Texture2D" uid="uid://criwv6nuivcxy" path="res://rope_examples/icon.svg" id="3_xivx8"]
[ext_resource type="Script" uid="uid://k4x08a1nqh5t" path="res://rope_examples/scripts/character_body_2d.gd" id="5_du4tb"]
[ext_resource type="Script" path="res://rope_examples/scripts/character_body_2d.gd" id="5_du4tb"]

[sub_resource type="RectangleShape2D" id="RectangleShape2D_6gqpg"]
size = Vector2(64, 64)
Expand Down
14 changes: 7 additions & 7 deletions demo/rope_examples/rope_properties.tscn
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[gd_scene load_steps=10 format=3 uid="uid://clyutgr2fativ"]

[ext_resource type="Script" uid="uid://di64tfb4141om" path="res://rope_examples/scripts/animation_player.gd" id="1_mv383"]
[ext_resource type="Script" uid="uid://dnyc71ljegebe" path="res://addons/ropesim/RopeHandle.gd" id="3_mb3ny"]
[ext_resource type="Script" uid="uid://clgvn2tp1pcmc" path="res://addons/ropesim/Rope.gd" id="4_rnvio"]
[ext_resource type="Script" path="res://rope_examples/scripts/animation_player.gd" id="1_mv383"]
[ext_resource type="Script" path="res://addons/ropesim/RopeHandle.gd" id="3_mb3ny"]
[ext_resource type="Script" path="res://addons/ropesim/Rope.gd" id="4_rnvio"]

[sub_resource type="Animation" id="Animation_t4gml"]
length = 0.001
Expand All @@ -25,8 +25,8 @@ tracks/0/keys = {

[sub_resource type="AnimationLibrary" id="AnimationLibrary_13y75"]
_data = {
&"RESET": SubResource("Animation_t4gml"),
&"moving": SubResource("Animation_c3bfa")
"RESET": SubResource("Animation_t4gml"),
"moving": SubResource("Animation_c3bfa")
}

[sub_resource type="Curve" id="Curve_2i72k"]
Expand All @@ -47,7 +47,7 @@ expand_margin_right = 2.0

[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
libraries = {
&"": SubResource("AnimationLibrary_13y75")
"": SubResource("AnimationLibrary_13y75")
}
script = ExtResource("1_mv383")

Expand Down Expand Up @@ -139,7 +139,7 @@ strength = 1.0
rope_path = NodePath("..")

[node name="Node2D2" type="Node2D" parent="."]
position = Vector2(146.846, 145.707)
position = Vector2(146.001, 146.237)

[node name="Rope3" type="Node2D" parent="Node2D2"]
position = Vector2(-88.3748, -22.2188)
Expand Down
6 changes: 3 additions & 3 deletions demo/rope_examples/rope_pulling.tscn
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[gd_scene load_steps=7 format=3 uid="uid://ba2ll2csfyo28"]

[ext_resource type="Script" uid="uid://clgvn2tp1pcmc" path="res://addons/ropesim/Rope.gd" id="1_ayj28"]
[ext_resource type="Script" uid="uid://k4x08a1nqh5t" path="res://rope_examples/scripts/character_body_2d.gd" id="2_nvbmc"]
[ext_resource type="Script" path="res://addons/ropesim/Rope.gd" id="1_ayj28"]
[ext_resource type="Script" path="res://rope_examples/scripts/character_body_2d.gd" id="2_nvbmc"]
[ext_resource type="Texture2D" uid="uid://criwv6nuivcxy" path="res://rope_examples/icon.svg" id="3_8uo3w"]
[ext_resource type="Script" uid="uid://2qjk6jwb6qs" path="res://addons/ropesim/RopeInteraction.gd" id="6_qu4ri"]
[ext_resource type="Script" path="res://addons/ropesim/RopeInteraction.gd" id="6_qu4ri"]

[sub_resource type="RectangleShape2D" id="RectangleShape2D_fdqy7"]
size = Vector2(64, 64)
Expand Down
Loading

0 comments on commit 0e4a540

Please sign in to comment.