Skip to content

Commit fad2469

Browse files
aaronfrankeaaronfranke
authored
Merge pull request #1179 from Calinou/update-for-4.4
Update demos for Godot 4.4
2 parents 5557b10 + 4d49bbd commit fad2469

File tree

817 files changed

+1899
-1563
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

817 files changed

+1899
-1563
lines changed

‎2d/bullet_shower/bullets.gd.uid

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
uid://rddaoyfpqvix

‎2d/bullet_shower/player.gd.uid

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
uid://8ij4vk5yqwtt

‎2d/bullet_shower/project.godot

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ config/name="Bullet Shower"
1414
config/description="Demonstrates how to manage large amounts of objects efficiently using low-level Servers."
1515
config/tags=PackedStringArray("2d", "demo", "official", "performance")
1616
run/main_scene="res://shower.tscn"
17-
config/features=PackedStringArray("4.2")
17+
config/features=PackedStringArray("4.4")
1818
config/icon="res://icon.webp"
1919

2020
[debug]

‎2d/dodge_the_creeps/fonts/Xolonium-Regular.ttf.import

+2
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,15 @@ dest_files=["res://.godot/imported/Xolonium-Regular.ttf-bc2981e3069cff4c34dd7c8e
1515
Rendering=null
1616
antialiasing=1
1717
generate_mipmaps=false
18+
disable_embedded_bitmaps=true
1819
multichannel_signed_distance_field=false
1920
msdf_pixel_range=8
2021
msdf_size=48
2122
allow_system_fallback=true
2223
force_autohinter=false
2324
hinting=1
2425
subpixel_positioning=1
26+
keep_rounding_remainders=true
2527
oversampling=0.0
2628
Fallbacks=null
2729
fallbacks=[]

‎2d/dodge_the_creeps/hud.gd.uid

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
uid://ole4kvtbp4r1

‎2d/dodge_the_creeps/hud.tscn

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[gd_scene load_steps=5 format=3 uid="uid://ccqoreueuxdb7"]
22

3-
[ext_resource type="Script" path="res://hud.gd" id="1"]
3+
[ext_resource type="Script" uid="uid://ole4kvtbp4r1" path="res://hud.gd" id="1"]
44
[ext_resource type="FontFile" uid="uid://cit6gwe5px1q8" path="res://fonts/Xolonium-Regular.ttf" id="2_2jm3i"]
55

66
[sub_resource type="InputEventAction" id="InputEventAction_fopy7"]

‎2d/dodge_the_creeps/main.gd.uid

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
uid://bi0dtjbbi0wxj

‎2d/dodge_the_creeps/main.tscn

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[gd_scene load_steps=8 format=3 uid="uid://cyfwty2q3rdse"]
22

3-
[ext_resource type="Script" path="res://main.gd" id="1_0r6n5"]
3+
[ext_resource type="Script" uid="uid://bi0dtjbbi0wxj" path="res://main.gd" id="1_0r6n5"]
44
[ext_resource type="PackedScene" uid="uid://rkdnhqgf2hpj" path="res://mob.tscn" id="2_50pww"]
55
[ext_resource type="PackedScene" uid="uid://4vwrqjegqwpj" path="res://player.tscn" id="3_veqnc"]
66
[ext_resource type="PackedScene" uid="uid://ccqoreueuxdb7" path="res://hud.tscn" id="4_0qnje"]

‎2d/dodge_the_creeps/mob.gd.uid

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
uid://c8vixyuoi1xgn

‎2d/dodge_the_creeps/mob.tscn

+28-10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[gd_scene load_steps=10 format=3 uid="uid://rkdnhqgf2hpj"]
22

3-
[ext_resource type="Script" path="res://mob.gd" id="1"]
3+
[ext_resource type="Script" uid="uid://c8vixyuoi1xgn" path="res://mob.gd" id="1"]
44
[ext_resource type="Texture2D" uid="uid://yqglrrsx7j1f" path="res://art/enemyFlyingAlt_1.png" id="2"]
55
[ext_resource type="Texture2D" uid="uid://bpot8awhdn6ph" path="res://art/enemyFlyingAlt_2.png" id="3"]
66
[ext_resource type="Texture2D" uid="uid://bu4221t7qpa7d" path="res://art/enemyWalking_1.png" id="4"]
@@ -10,17 +10,35 @@
1010

1111
[sub_resource type="SpriteFrames" id="1"]
1212
animations = [{
13-
"frames": [ExtResource( "6" ), ExtResource( "7" )],
14-
"loop": true,
15-
"name": &"swim",
16-
"speed": 4.0
13+
"frames": [{
14+
"duration": 1.0,
15+
"texture": ExtResource("2")
1716
}, {
18-
"frames": [ExtResource( "2" ), ExtResource( "3" )],
17+
"duration": 1.0,
18+
"texture": ExtResource("3")
19+
}],
1920
"loop": true,
2021
"name": &"fly",
2122
"speed": 3.0
2223
}, {
23-
"frames": [ExtResource( "4" ), ExtResource( "5" )],
24+
"frames": [{
25+
"duration": 1.0,
26+
"texture": ExtResource("6")
27+
}, {
28+
"duration": 1.0,
29+
"texture": ExtResource("7")
30+
}],
31+
"loop": true,
32+
"name": &"swim",
33+
"speed": 4.0
34+
}, {
35+
"frames": [{
36+
"duration": 1.0,
37+
"texture": ExtResource("4")
38+
}, {
39+
"duration": 1.0,
40+
"texture": ExtResource("5")
41+
}],
2442
"loop": true,
2543
"name": &"walk",
2644
"speed": 4.0
@@ -33,16 +51,16 @@ height = 100.0
3351
[node name="Mob" type="RigidDynamicBody2D" groups=["mobs"]]
3452
collision_mask = 0
3553
gravity_scale = 0.0
36-
script = ExtResource( "1" )
54+
script = ExtResource("1")
3755

3856
[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
3957
scale = Vector2(0.75, 0.75)
40-
frames = SubResource( "1" )
58+
frames = SubResource("1")
4159
animation = &"walk"
4260

4361
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
4462
rotation = 1.5708
45-
shape = SubResource( "2" )
63+
shape = SubResource("2")
4664

4765
[node name="VisibleOnScreenNotifier2D" type="VisibleOnScreenNotifier2D" parent="."]
4866

‎2d/dodge_the_creeps/player.gd.uid

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
uid://ccd1k2qxslohl

‎2d/dodge_the_creeps/player.tscn

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[gd_scene load_steps=13 format=3 uid="uid://4vwrqjegqwpj"]
22

3-
[ext_resource type="Script" path="res://player.gd" id="1"]
3+
[ext_resource type="Script" uid="uid://ccd1k2qxslohl" path="res://player.gd" id="1"]
44
[ext_resource type="Texture2D" uid="uid://ftkxr8r4qghp" path="res://art/playerGrey_walk1.png" id="2"]
55
[ext_resource type="Texture2D" uid="uid://couyhcegeihme" path="res://art/playerGrey_walk2.png" id="3"]
66
[ext_resource type="Texture2D" uid="uid://b4yyoafu8bi0q" path="res://art/playerGrey_up1.png" id="4"]

‎2d/dodge_the_creeps/project.godot

+11-11
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ tutorial in the documentation. For more details, consider
1919
following the tutorial in the documentation."
2020
config/tags=PackedStringArray("2d", "demo", "official")
2121
run/main_scene="res://main.tscn"
22-
config/features=PackedStringArray("4.2")
22+
config/features=PackedStringArray("4.4")
2323
config/icon="res://icon.webp"
2424

2525
[display]
@@ -34,40 +34,40 @@ window/stretch/mode="canvas_items"
3434

3535
move_left={
3636
"deadzone": 0.2,
37-
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":65,"key_label":0,"unicode":0,"echo":false,"script":null)
38-
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194319,"key_label":0,"unicode":0,"echo":false,"script":null)
37+
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":65,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
38+
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194319,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
3939
, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":14,"pressure":0.0,"pressed":false,"script":null)
4040
, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":0,"axis_value":-1.0,"script":null)
4141
]
4242
}
4343
move_right={
4444
"deadzone": 0.2,
45-
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":68,"key_label":0,"unicode":0,"echo":false,"script":null)
46-
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194321,"key_label":0,"unicode":0,"echo":false,"script":null)
45+
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":68,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
46+
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194321,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
4747
, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":15,"pressure":0.0,"pressed":false,"script":null)
4848
, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":0,"axis_value":1.0,"script":null)
4949
]
5050
}
5151
move_up={
5252
"deadzone": 0.2,
53-
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":87,"key_label":0,"unicode":0,"echo":false,"script":null)
54-
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194320,"key_label":0,"unicode":0,"echo":false,"script":null)
53+
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":87,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
54+
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194320,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
5555
, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":12,"pressure":0.0,"pressed":false,"script":null)
5656
, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":1,"axis_value":-1.0,"script":null)
5757
]
5858
}
5959
move_down={
6060
"deadzone": 0.2,
61-
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":83,"key_label":0,"unicode":0,"echo":false,"script":null)
62-
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194322,"key_label":0,"unicode":0,"echo":false,"script":null)
61+
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":83,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
62+
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194322,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
6363
, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":13,"pressure":0.0,"pressed":false,"script":null)
6464
, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":1,"axis_value":1.0,"script":null)
6565
]
6666
}
6767
start_game={
6868
"deadzone": 0.2,
69-
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194309,"key_label":0,"unicode":0,"echo":false,"script":null)
70-
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":32,"key_label":0,"unicode":0,"echo":false,"script":null)
69+
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194309,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
70+
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":32,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
7171
]
7272
}
7373

‎2d/dynamic_tilemap_layers/level/tile_map.gd.uid

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
uid://dgk6c03uxup6m

‎2d/dynamic_tilemap_layers/player/player.gd.uid

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
uid://lsvtosr5760i

‎2d/dynamic_tilemap_layers/player/player.tscn

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[gd_scene load_steps=4 format=3 uid="uid://1o70ce0fv10w"]
22

3-
[ext_resource type="Script" path="res://player/player.gd" id="1"]
3+
[ext_resource type="Script" uid="uid://lsvtosr5760i" path="res://player/player.gd" id="1"]
44
[ext_resource type="Texture2D" uid="uid://dfb8rr2fakwgp" path="res://player/player.png" id="2"]
55

66
[sub_resource type="RectangleShape2D" id="1"]

‎2d/dynamic_tilemap_layers/project.godot

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ CharacterBody2D. The character moves around, is affected by moving
1616
platforms, can jump through one-way collision platforms, etc."
1717
config/tags=PackedStringArray("2d", "demo", "official", "tilemap")
1818
run/main_scene="res://world.tscn"
19-
config/features=PackedStringArray("4.3")
19+
config/features=PackedStringArray("4.4")
2020
config/icon="res://icon.png"
2121

2222
[debug]

‎2d/dynamic_tilemap_layers/world.tscn

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[gd_scene load_steps=8 format=4 uid="uid://de7qapkqfycxl"]
22

33
[ext_resource type="Texture2D" uid="uid://cs8h2qyuakmko" path="res://level/obstacle.png" id="2"]
4-
[ext_resource type="Script" path="res://level/tile_map.gd" id="2_q8fhk"]
4+
[ext_resource type="Script" uid="uid://dgk6c03uxup6m" path="res://level/tile_map.gd" id="2_q8fhk"]
55
[ext_resource type="PackedScene" uid="uid://1o70ce0fv10w" path="res://player/player.tscn" id="3"]
66

77
[sub_resource type="PhysicsMaterial" id="PhysicsMaterial_on5ov"]

‎2d/finite_state_machine/Demo.tscn

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ tracks/0/keys = {
2626

2727
[sub_resource type="AnimationLibrary" id="AnimationLibrary_qbwwp"]
2828
_data = {
29-
"idle": SubResource("1"),
30-
"stagger": SubResource("2"),
31-
"walk": SubResource("3")
29+
&"idle": SubResource("1"),
30+
&"stagger": SubResource("2"),
31+
&"walk": SubResource("3")
3232
}
3333

3434
[node name="Demo" type="Node"]

‎2d/finite_state_machine/debug/StatesStackDiplayer.tscn

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[gd_scene load_steps=3 format=3 uid="uid://cvi13chv8g4hj"]
22

3-
[ext_resource type="Script" path="res://debug/states_stack_displayer.gd" id="1"]
3+
[ext_resource type="Script" uid="uid://8e5wvxrlv1ct" path="res://debug/states_stack_displayer.gd" id="1"]
44
[ext_resource type="FontFile" uid="uid://b5bspum6ffekd" path="res://fonts/SourceCodePro-Bold.ttf" id="2_58if7"]
55

66
[node name="StatesStackDiplayer" type="Panel"]

‎2d/finite_state_machine/debug/states_stack_displayer.gd.uid

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
uid://8e5wvxrlv1ct

‎2d/finite_state_machine/fonts/SourceCodePro-Bold.ttf.import

+2
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,15 @@ dest_files=["res://.godot/imported/SourceCodePro-Bold.ttf-bf03bd9c90603419d32725
1515
Rendering=null
1616
antialiasing=1
1717
generate_mipmaps=false
18+
disable_embedded_bitmaps=true
1819
multichannel_signed_distance_field=false
1920
msdf_pixel_range=8
2021
msdf_size=48
2122
allow_system_fallback=true
2223
force_autohinter=false
2324
hinting=1
2425
subpixel_positioning=1
26+
keep_rounding_remainders=true
2527
oversampling=0.0
2628
Fallbacks=null
2729
fallbacks=[]

‎2d/finite_state_machine/player/Player.tscn

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
[gd_scene load_steps=19 format=3 uid="uid://bpdyvy2681m3i"]
22

3-
[ext_resource type="Script" path="res://player/player_controller.gd" id="1"]
4-
[ext_resource type="Script" path="res://player/player_state_machine.gd" id="2"]
5-
[ext_resource type="Script" path="res://player/states/motion/on_ground/idle.gd" id="3"]
6-
[ext_resource type="Script" path="res://player/states/motion/on_ground/move.gd" id="4"]
7-
[ext_resource type="Script" path="res://player/states/motion/in_air/jump.gd" id="5"]
8-
[ext_resource type="Script" path="res://player/states/combat/stagger.gd" id="6"]
9-
[ext_resource type="Script" path="res://player/states/combat/attack.gd" id="7"]
10-
[ext_resource type="Script" path="res://player/states/die.gd" id="8"]
3+
[ext_resource type="Script" uid="uid://clya0ymtv6cnn" path="res://player/player_controller.gd" id="1"]
4+
[ext_resource type="Script" uid="uid://bt4prj2loisak" path="res://player/player_state_machine.gd" id="2"]
5+
[ext_resource type="Script" uid="uid://duqfhrergdg0p" path="res://player/states/motion/on_ground/idle.gd" id="3"]
6+
[ext_resource type="Script" uid="uid://bprpybddlsqly" path="res://player/states/motion/on_ground/move.gd" id="4"]
7+
[ext_resource type="Script" uid="uid://c3jdmjrutxlu3" path="res://player/states/motion/in_air/jump.gd" id="5"]
8+
[ext_resource type="Script" uid="uid://bdx6kcg1n8na3" path="res://player/states/combat/stagger.gd" id="6"]
9+
[ext_resource type="Script" uid="uid://bianktk6rvu15" path="res://player/states/combat/attack.gd" id="7"]
10+
[ext_resource type="Script" uid="uid://badi2yipj0y74" path="res://player/states/die.gd" id="8"]
1111
[ext_resource type="Texture2D" uid="uid://eds33w28pilu" path="res://player/shadow.png" id="9"]
1212
[ext_resource type="Texture2D" uid="uid://ds53oxkqrcumd" path="res://player/body.png" id="10"]
13-
[ext_resource type="Script" path="res://player/bullet/bullet_spawner.gd" id="11"]
14-
[ext_resource type="Script" path="res://player/weapon/weapon_pivot.gd" id="12"]
13+
[ext_resource type="Script" uid="uid://duw4ejcjfrp7o" path="res://player/bullet/bullet_spawner.gd" id="11"]
14+
[ext_resource type="Script" uid="uid://d1hwnb818bhik" path="res://player/weapon/weapon_pivot.gd" id="12"]
1515
[ext_resource type="PackedScene" uid="uid://cdacdp11r3jua" path="res://player/weapon/Sword.tscn" id="13"]
16-
[ext_resource type="Script" path="res://player/states/debug/state_name_displayer.gd" id="15"]
16+
[ext_resource type="Script" uid="uid://dgpfeu3yan7hq" path="res://player/states/debug/state_name_displayer.gd" id="15"]
1717

1818
[sub_resource type="Animation" id="1"]
1919

@@ -36,9 +36,9 @@ tracks/0/keys = {
3636

3737
[sub_resource type="AnimationLibrary" id="AnimationLibrary_vi1hn"]
3838
_data = {
39-
"idle": SubResource("1"),
40-
"stagger": SubResource("2"),
41-
"walk": SubResource("3")
39+
&"idle": SubResource("1"),
40+
&"stagger": SubResource("2"),
41+
&"walk": SubResource("3")
4242
}
4343

4444
[node name="Player" type="CharacterBody2D"]

‎2d/finite_state_machine/player/bullet/Bullet.tscn

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[gd_scene load_steps=3 format=3 uid="uid://b6uru8lfx45ma"]
22

3-
[ext_resource type="Script" path="res://player/bullet/bullet.gd" id="1"]
3+
[ext_resource type="Script" uid="uid://crm4tdogdpumr" path="res://player/bullet/bullet.gd" id="1"]
44

55
[sub_resource type="CircleShape2D" id="1"]
66
radius = 12.0

‎2d/finite_state_machine/player/bullet/bullet.gd.uid

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
uid://crm4tdogdpumr

‎2d/finite_state_machine/player/bullet/bullet_spawner.gd.uid

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
uid://duw4ejcjfrp7o

‎2d/finite_state_machine/player/player_controller.gd.uid

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
uid://clya0ymtv6cnn

‎2d/finite_state_machine/player/player_state_machine.gd.uid

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
uid://bt4prj2loisak

‎2d/finite_state_machine/player/states/combat/attack.gd.uid

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
uid://bianktk6rvu15

‎2d/finite_state_machine/player/states/combat/stagger.gd.uid

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
uid://bdx6kcg1n8na3

‎2d/finite_state_machine/player/states/debug/state_name_displayer.gd.uid

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
uid://dgpfeu3yan7hq

‎2d/finite_state_machine/player/states/die.gd.uid

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
uid://badi2yipj0y74

‎2d/finite_state_machine/player/states/motion/in_air/jump.gd.uid

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
uid://c3jdmjrutxlu3

‎2d/finite_state_machine/player/states/motion/motion.gd.uid

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
uid://bbwnftow50xk3

‎2d/finite_state_machine/player/states/motion/on_ground/idle.gd.uid

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
uid://duqfhrergdg0p

‎2d/finite_state_machine/player/states/motion/on_ground/move.gd.uid

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
uid://bprpybddlsqly

‎2d/finite_state_machine/player/states/motion/on_ground/on_ground.gd.uid

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
uid://qyf46nijd62s

‎2d/finite_state_machine/player/weapon/Sword.tscn

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[gd_scene load_steps=9 format=3 uid="uid://cdacdp11r3jua"]
22

3-
[ext_resource type="Script" path="res://player/weapon/sword.gd" id="1"]
3+
[ext_resource type="Script" uid="uid://1j2saaqxja3i" path="res://player/weapon/sword.gd" id="1"]
44
[ext_resource type="Texture2D" uid="uid://7cfjw83v5m75" path="res://player/weapon/sword.png" id="2"]
55

66
[sub_resource type="Animation" id="1"]
@@ -222,11 +222,11 @@ tracks/0/keys = {
222222

223223
[sub_resource type="AnimationLibrary" id="AnimationLibrary_6cp3i"]
224224
_data = {
225-
"SETUP": SubResource("1"),
226-
"attack_circular": SubResource("2"),
227-
"attack_fast": SubResource("3"),
228-
"attack_medium": SubResource("4"),
229-
"idle": SubResource("5")
225+
&"SETUP": SubResource("1"),
226+
&"attack_circular": SubResource("2"),
227+
&"attack_fast": SubResource("3"),
228+
&"attack_medium": SubResource("4"),
229+
&"idle": SubResource("5")
230230
}
231231

232232
[node name="Sword" type="Area2D"]

‎2d/finite_state_machine/player/weapon/sword.gd.uid

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
uid://1j2saaqxja3i

‎2d/finite_state_machine/player/weapon/weapon_pivot.gd.uid

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
uid://d1hwnb818bhik

0 commit comments

Comments
 (0)