Skip to content

Commit dce79b7

Browse files
aaronfrankeaaronfranke
authored
Merge pull request #96 from aaronfranke/player-step
Fix player step sound
2 parents ea88be3 + 79e878d commit dce79b7

Some content is hidden

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

65 files changed

+41754
-6923
lines changed

‎door/model/doorsimple_closing.tres

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
[resource]
66
resource_name = "doorsimple_closing"
7-
length = 2.6
7+
length = 2.08333
88
tracks/0/type = "transform"
99
tracks/0/path = NodePath("armature-doorsimple")
1010
tracks/0/interp = 1

‎door/model/doorsimple_opening.tres

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,63 +4,63 @@
44

55
[resource]
66
resource_name = "doorsimple_opening"
7-
length = 2.6
7+
length = 2.5
88
tracks/0/type = "transform"
99
tracks/0/path = NodePath("armature-doorsimple")
1010
tracks/0/interp = 1
1111
tracks/0/loop_wrap = true
1212
tracks/0/imported = true
1313
tracks/0/enabled = true
14-
tracks/0/keys = PoolRealArray( 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2.2, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1 )
14+
tracks/0/keys = PoolRealArray( 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2.5, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1 )
1515
tracks/1/type = "transform"
1616
tracks/1/path = NodePath("armature-doorsimple/Skeleton:root")
1717
tracks/1/interp = 1
1818
tracks/1/loop_wrap = true
1919
tracks/1/imported = true
2020
tracks/1/enabled = true
21-
tracks/1/keys = PoolRealArray( 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2.2, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1 )
21+
tracks/1/keys = PoolRealArray( 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2.5, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1 )
2222
tracks/2/type = "transform"
2323
tracks/2/path = NodePath("armature-doorsimple/Skeleton:L-floorpanel")
2424
tracks/2/interp = 1
2525
tracks/2/loop_wrap = true
2626
tracks/2/imported = true
2727
tracks/2/enabled = true
28-
tracks/2/keys = PoolRealArray( 0, 1, 0.106266, 4.84338e-08, -0.420193, 6.81455e-22, 0, 0, 1, 1, 1, 1, 1.7, 1, 0.106266, 4.84338e-08, -0.420193, -7.10543e-15, 3.95424e-15, 2.80966e-29, 1, 1, 1, 1, 1.8, 1, 0.102492, 4.84338e-08, -0.405271, -7.10543e-15, 3.95424e-15, 7.10543e-15, 1, 1, 1, 1, 1.9, 1, 0.0875976, 4.84338e-08, -0.346375, -7.10543e-15, 3.95424e-15, 2.80966e-29, 1, 1, 1, 1, 2.1, 1, 0.014057, 4.84338e-08, -0.0555837, -7.10543e-15, 3.95424e-15, 2.80966e-29, 1, 1, 1, 1, 2.2, 1, 0, 0, 0, 6.81455e-22, 0, 0, 1, 1, 1, 1 )
28+
tracks/2/keys = PoolRealArray( 0, 1, 0.106266, 4.84338e-08, -0.420193, 6.81455e-22, 0, 0, 1, 1, 1, 1, 2.06667, 1, 0.106266, 4.84338e-08, -0.420193, -7.10543e-15, 3.95424e-15, 2.80966e-29, 1, 1, 1, 1, 2.13333, 1, 0.102492, 4.84338e-08, -0.405271, -7.10543e-15, 3.95424e-15, 7.10543e-15, 1, 1, 1, 1, 2.2, 1, 0.0875976, 4.84338e-08, -0.346375, -7.10543e-15, 3.95424e-15, 2.80966e-29, 1, 1, 1, 1, 2.4, 1, 0.014057, 4.84338e-08, -0.0555837, -7.10543e-15, 3.95424e-15, 2.80966e-29, 1, 1, 1, 1, 2.46667, 1, 0.00188458, 3.87467e-08, -0.00745225, -7.10543e-15, 3.95424e-15, 2.80966e-29, 1, 1, 1, 1, 2.5, 1, 0, 0, 0, 6.81455e-22, 0, 0, 1, 1, 1, 1 )
2929
tracks/3/type = "transform"
3030
tracks/3/path = NodePath("armature-doorsimple/Skeleton:R-floorpanel")
3131
tracks/3/interp = 1
3232
tracks/3/loop_wrap = true
3333
tracks/3/imported = true
3434
tracks/3/enabled = true
35-
tracks/3/keys = PoolRealArray( 0, 1, -0.106266, 4.84338e-08, -0.420193, 6.81455e-22, 0, 0, 1, 1, 1, 1, 1.7, 1, -0.106266, 4.84338e-08, -0.420193, -7.10543e-15, -3.95424e-15, -2.80966e-29, 1, 1, 1, 1, 1.8, 1, -0.102492, 4.84338e-08, -0.405271, -7.10543e-15, -3.95424e-15, -7.10543e-15, 1, 1, 1, 1, 1.9, 1, -0.0875976, 4.84338e-08, -0.346375, -7.10543e-15, -3.95424e-15, -2.80966e-29, 1, 1, 1, 1, 2.1, 1, -0.014057, 4.84338e-08, -0.0555837, -7.10543e-15, -3.95424e-15, -2.80966e-29, 1, 1, 1, 1, 2.2, 1, 0, 0, 0, 6.81455e-22, 0, 0, 1, 1, 1, 1 )
35+
tracks/3/keys = PoolRealArray( 0, 1, -0.106266, 4.84338e-08, -0.420193, 6.81455e-22, 0, 0, 1, 1, 1, 1, 2.06667, 1, -0.106266, 4.84338e-08, -0.420193, -7.10543e-15, -3.95424e-15, -2.80966e-29, 1, 1, 1, 1, 2.13333, 1, -0.102492, 4.84338e-08, -0.405271, -7.10543e-15, -3.95424e-15, -7.10543e-15, 1, 1, 1, 1, 2.2, 1, -0.0875976, 4.84338e-08, -0.346375, -7.10543e-15, -3.95424e-15, -2.80966e-29, 1, 1, 1, 1, 2.4, 1, -0.014057, 4.84338e-08, -0.0555837, -7.10543e-15, -3.95424e-15, -2.80966e-29, 1, 1, 1, 1, 2.46667, 1, -0.00188458, 3.87467e-08, -0.00745225, -7.10543e-15, -3.95424e-15, -2.80966e-29, 1, 1, 1, 1, 2.5, 1, 0, 0, 0, 6.81455e-22, 0, 0, 1, 1, 1, 1 )
3636
tracks/4/type = "transform"
3737
tracks/4/path = NodePath("armature-doorsimple/Skeleton:lower_panel")
3838
tracks/4/interp = 1
3939
tracks/4/loop_wrap = true
4040
tracks/4/imported = true
4141
tracks/4/enabled = true
42-
tracks/4/keys = PoolRealArray( 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0.8, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0.866667, 1, 0, 0, 0.00145594, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0.0186542, 0, 0, 0, 1, 1, 1, 1, 1.06667, 1, 0, 0, 0.0194564, 0, 0, 0, 1, 1, 1, 1, 1.13333, 1, 0, 0, 0.0127731, 0, 0, 0, 1, 1, 1, 1, 1.2, 1, 0, 0, 0.00404316, 0, 0, 0, 1, 1, 1, 1, 1.26667, 1, 0, 0, 0.00220311, 0, 0, 0, 1, 1, 1, 1, 1.33333, 1, 0, 0, 0.00937856, 0, 0, 0, 1, 1, 1, 1, 1.4, 1, 0, 0, 0.0269356, 0, 0, 0, 1, 1, 1, 1, 1.46667, 1, 0, 0, 0.0523954, 0, 0, 0, 1, 1, 1, 1, 2.1, 1, 0, 0, 0.581518, 0, 0, 0, 1, 1, 1, 1, 2.2, 1, 0, 0, 0.59, 0, 0, 0, 1, 1, 1, 1 )
42+
tracks/4/keys = PoolRealArray( 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0.8, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0.866667, 1, 0, 0, 0.00145594, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0.0186542, 0, 0, 0, 1, 1, 1, 1, 1.06667, 1, 0, 0, 0.0194564, 0, 0, 0, 1, 1, 1, 1, 1.13333, 1, 0, 0, 0.0127731, 0, 0, 0, 1, 1, 1, 1, 1.2, 1, 0, 0, 0.00404316, 0, 0, 0, 1, 1, 1, 1, 1.26667, 1, 0, 0, 0.00220311, 0, 0, 0, 1, 1, 1, 1, 1.33333, 1, 0, 0, 0.00937856, 0, 0, 0, 1, 1, 1, 1, 1.4, 1, 0, 0, 0.0269356, 0, 0, 0, 1, 1, 1, 1, 1.46667, 1, 0, 0, 0.0523954, 0, 0, 0, 1, 1, 1, 1, 2.4, 1, 0, 0, 0.581518, 0, 0, 0, 1, 1, 1, 1, 2.46667, 1, 0, 0, 0.58886, 0, 0, 0, 1, 1, 1, 1, 2.5, 1, 0, 0, 0.59, 0, 0, 0, 1, 1, 1, 1 )
4343
tracks/5/type = "transform"
4444
tracks/5/path = NodePath("armature-doorsimple/Skeleton:upper_panel")
4545
tracks/5/interp = 1
4646
tracks/5/loop_wrap = true
4747
tracks/5/imported = true
4848
tracks/5/enabled = true
49-
tracks/5/keys = PoolRealArray( 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0.8, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0.866667, 1, 0, 0, -0.00246763, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, -0.0316174, 0, 0, 0, 1, 1, 1, 1, 1.06667, 1, 0, 0, -0.0329771, 0, 0, 0, 1, 1, 1, 1, 1.13333, 1, 0, 0, -0.0216494, 0, 0, 0, 1, 1, 1, 1, 1.2, 1, 0, 0, -0.00685287, 0, 0, 0, 1, 1, 1, 1, 1.26667, 1, 0, 0, -0.00373411, 0, 0, 0, 1, 1, 1, 1, 1.33333, 1, 0, 0, -0.0158958, 0, 0, 0, 1, 1, 1, 1, 1.4, 1, 0, 0, -0.0456536, 0, 0, 0, 1, 1, 1, 1, 1.46667, 1, 0, 0, -0.0888057, 0, 0, 0, 1, 1, 1, 1, 2.1, 1, 0, 0, -0.985624, 0, 0, 0, 1, 1, 1, 1, 2.2, 1, 0, 0, -1, 0, 0, 0, 1, 1, 1, 1 )
49+
tracks/5/keys = PoolRealArray( 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0.8, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0.866667, 1, 0, 0, -0.00246763, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, -0.0316174, 0, 0, 0, 1, 1, 1, 1, 1.06667, 1, 0, 0, -0.0329771, 0, 0, 0, 1, 1, 1, 1, 1.13333, 1, 0, 0, -0.0216494, 0, 0, 0, 1, 1, 1, 1, 1.2, 1, 0, 0, -0.00685287, 0, 0, 0, 1, 1, 1, 1, 1.26667, 1, 0, 0, -0.00373411, 0, 0, 0, 1, 1, 1, 1, 1.33333, 1, 0, 0, -0.0158958, 0, 0, 0, 1, 1, 1, 1, 1.4, 1, 0, 0, -0.0456536, 0, 0, 0, 1, 1, 1, 1, 1.46667, 1, 0, 0, -0.0888057, 0, 0, 0, 1, 1, 1, 1, 2.4, 1, 0, 0, -0.985624, 0, 0, 0, 1, 1, 1, 1, 2.46667, 1, 0, 0, -0.998068, 0, 0, 0, 1, 1, 1, 1, 2.5, 1, 0, 0, -1, 0, 0, 0, 1, 1, 1, 1 )
5050
tracks/6/type = "transform"
5151
tracks/6/path = NodePath("armature-doorsimple/Skeleton:L-doorhalve")
5252
tracks/6/interp = 1
5353
tracks/6/loop_wrap = true
5454
tracks/6/imported = true
5555
tracks/6/enabled = true
56-
tracks/6/keys = PoolRealArray( 0, 1, 0, 0, 0, 0, 2.57165e-16, 0, 1, 1, 1, 1, 0.133333, 1, 0, 0, 0, -7.32638e-09, 7.57476e-09, 3.67569e-08, 1, 1, 1, 1, 0.2, 1, 0, 0, -0.00203097, 7.57478e-09, 7.57477e-09, 2.18557e-08, 1, 1, 1, 1, 0.266667, 1, 0, 0, -0.0148885, 7.57478e-09, 7.57477e-09, 2.18557e-08, 1, 1, 1, 1, 0.4, 1, 0, 0, -0.0582695, 7.57478e-09, 7.57477e-09, 2.18557e-08, 1, 1, 1, 1, 0.466667, 1, 0, 1.96587e-09, -0.0711271, -7.32638e-09, 7.57476e-09, 3.67569e-08, 1, 1, 1, 1, 0.533333, 1, 0, 9.82945e-09, -0.0721426, 7.57478e-09, 7.57477e-09, 2.18557e-08, 1, 1, 1, 1, 0.6, 1, 0, 9.82942e-09, -0.0657138, 7.57478e-09, 7.57477e-09, 2.18557e-08, 1, 1, 1, 1, 0.733333, 1, 0, 9.82942e-09, -0.0440233, 7.57478e-09, 7.57477e-09, 2.18557e-08, 1, 1, 1, 1, 0.8, 1, 0, 7.86352e-09, -0.0375944, 7.57478e-09, 7.57477e-09, 2.18557e-08, 1, 1, 1, 1, 0.866667, 1, 0, 4.86892e-10, -0.0401627, 7.57478e-09, 7.57477e-09, 2.18557e-08, 1, 1, 1, 1, 0.933333, 1, 0, 3.67217e-09, -0.0636073, 7.57478e-09, 7.57477e-09, 2.18557e-08, 1, 1, 1, 1, 1, 1, 0, 9.82942e-09, -0.108926, 0, 2.57165e-16, 0, 1, 1, 1, 1, 1.06667, 1, 0, 1.94622e-08, -0.179826, 7.57478e-09, 7.57477e-09, 2.18557e-08, 1, 1, 1, 1, 1.13333, 1, 0, 3.20387e-08, -0.272392, 7.57478e-09, 7.57477e-09, 2.18557e-08, 1, 1, 1, 1, 1.26667, 1, 0, 6.635e-08, -0.524932, 7.57478e-09, 7.57477e-09, 2.18557e-08, 1, 1, 1, 1, 2.2, 1, 0, 4.43384e-07, -3.3, 0, 2.57165e-16, 0, 1, 1, 1, 1 )
56+
tracks/6/keys = PoolRealArray( 0, 1, 0, 0, 0, 0, 2.57165e-16, 0, 1, 1, 1, 1, 0.133333, 1, 0, 0, 0, -7.32638e-09, 7.57476e-09, 3.67569e-08, 1, 1, 1, 1, 0.2, 1, 0, 0, -0.00203097, 7.57478e-09, 7.57477e-09, 2.18557e-08, 1, 1, 1, 1, 0.266667, 1, 0, 0, -0.0148885, 7.57478e-09, 7.57477e-09, 2.18557e-08, 1, 1, 1, 1, 0.4, 1, 0, 0, -0.0582695, 7.57478e-09, 7.57477e-09, 2.18557e-08, 1, 1, 1, 1, 0.466667, 1, 0, 1.96587e-09, -0.0711271, -7.32638e-09, 7.57476e-09, 3.67569e-08, 1, 1, 1, 1, 0.533333, 1, 0, 9.82945e-09, -0.0721426, 7.57478e-09, 7.57477e-09, 2.18557e-08, 1, 1, 1, 1, 0.6, 1, 0, 9.82942e-09, -0.0657138, 7.57478e-09, 7.57477e-09, 2.18557e-08, 1, 1, 1, 1, 0.733333, 1, 0, 9.82942e-09, -0.0440233, 7.57478e-09, 7.57477e-09, 2.18557e-08, 1, 1, 1, 1, 0.8, 1, 0, 7.86352e-09, -0.0375944, 7.57478e-09, 7.57477e-09, 2.18557e-08, 1, 1, 1, 1, 0.866667, 1, 0, 4.86892e-10, -0.0401627, 7.57478e-09, 7.57477e-09, 2.18557e-08, 1, 1, 1, 1, 0.933333, 1, 0, 3.67217e-09, -0.0636073, 7.57478e-09, 7.57477e-09, 2.18557e-08, 1, 1, 1, 1, 1, 1, 0, 9.82942e-09, -0.108926, 0, 2.57165e-16, 0, 1, 1, 1, 1, 1.06667, 1, 0, 1.94622e-08, -0.179826, 7.57478e-09, 7.57477e-09, 2.18557e-08, 1, 1, 1, 1, 1.13333, 1, 0, 3.20387e-08, -0.272392, 7.57478e-09, 7.57477e-09, 2.18557e-08, 1, 1, 1, 1, 1.26667, 1, 0, 6.635e-08, -0.524932, 7.57478e-09, 7.57477e-09, 2.18557e-08, 1, 1, 1, 1, 2.5, 1, 0, 4.43384e-07, -3.3, 0, 2.57165e-16, 0, 1, 1, 1, 1 )
5757
tracks/7/type = "transform"
5858
tracks/7/path = NodePath("armature-doorsimple/Skeleton:R-doorhalve")
5959
tracks/7/interp = 1
6060
tracks/7/loop_wrap = true
6161
tracks/7/imported = true
6262
tracks/7/enabled = true
63-
tracks/7/keys = PoolRealArray( 0, 1, 0, 0, 0, 0, -2.57165e-16, 0, 1, 1, 1, 1, 0.133333, 1, 0, 0, 0, -7.32638e-09, -7.57476e-09, -3.67569e-08, 1, 1, 1, 1, 0.2, 1, 0, 0, -0.00203097, 7.57478e-09, -7.57477e-09, -2.18557e-08, 1, 1, 1, 1, 0.266667, 1, 0, 0, -0.0148885, 7.57478e-09, -7.57477e-09, -2.18557e-08, 1, 1, 1, 1, 0.4, 1, 0, 0, -0.0582695, 7.57478e-09, -7.57477e-09, -2.18557e-08, 1, 1, 1, 1, 0.466667, 1, 0, 1.96587e-09, -0.0711271, -7.32638e-09, -7.57476e-09, -3.67569e-08, 1, 1, 1, 1, 0.533333, 1, 0, 9.82945e-09, -0.0721426, 7.57478e-09, -7.57477e-09, -2.18557e-08, 1, 1, 1, 1, 0.6, 1, 0, 9.82942e-09, -0.0657138, 7.57478e-09, -7.57477e-09, -2.18557e-08, 1, 1, 1, 1, 0.733333, 1, 0, 9.82942e-09, -0.0440233, 7.57478e-09, -7.57477e-09, -2.18557e-08, 1, 1, 1, 1, 0.8, 1, 0, 7.86352e-09, -0.0375944, 7.57478e-09, -7.57477e-09, -2.18557e-08, 1, 1, 1, 1, 0.866667, 1, 0, 4.86892e-10, -0.0401627, 7.57478e-09, -7.57477e-09, -2.18557e-08, 1, 1, 1, 1, 0.933333, 1, 0, 3.67217e-09, -0.0636073, 7.57478e-09, -7.57477e-09, -2.18557e-08, 1, 1, 1, 1, 1, 1, 0, 9.82942e-09, -0.108926, 0, -2.57165e-16, 0, 1, 1, 1, 1, 1.06667, 1, 0, 1.94622e-08, -0.179826, 7.57478e-09, -7.57477e-09, -2.18557e-08, 1, 1, 1, 1, 1.13333, 1, 0, 3.20387e-08, -0.272392, 7.57478e-09, -7.57477e-09, -2.18557e-08, 1, 1, 1, 1, 1.26667, 1, 0, 6.635e-08, -0.524932, 7.57478e-09, -7.57477e-09, -2.18557e-08, 1, 1, 1, 1, 2.2, 1, 0, 4.43384e-07, -3.3, 0, -2.57165e-16, 0, 1, 1, 1, 1 )
63+
tracks/7/keys = PoolRealArray( 0, 1, 0, 0, 0, 0, -2.57165e-16, 0, 1, 1, 1, 1, 0.133333, 1, 0, 0, 0, -7.32638e-09, -7.57476e-09, -3.67569e-08, 1, 1, 1, 1, 0.2, 1, 0, 0, -0.00203097, 7.57478e-09, -7.57477e-09, -2.18557e-08, 1, 1, 1, 1, 0.266667, 1, 0, 0, -0.0148885, 7.57478e-09, -7.57477e-09, -2.18557e-08, 1, 1, 1, 1, 0.4, 1, 0, 0, -0.0582695, 7.57478e-09, -7.57477e-09, -2.18557e-08, 1, 1, 1, 1, 0.466667, 1, 0, 1.96587e-09, -0.0711271, -7.32638e-09, -7.57476e-09, -3.67569e-08, 1, 1, 1, 1, 0.533333, 1, 0, 9.82945e-09, -0.0721426, 7.57478e-09, -7.57477e-09, -2.18557e-08, 1, 1, 1, 1, 0.6, 1, 0, 9.82942e-09, -0.0657138, 7.57478e-09, -7.57477e-09, -2.18557e-08, 1, 1, 1, 1, 0.733333, 1, 0, 9.82942e-09, -0.0440233, 7.57478e-09, -7.57477e-09, -2.18557e-08, 1, 1, 1, 1, 0.8, 1, 0, 7.86352e-09, -0.0375944, 7.57478e-09, -7.57477e-09, -2.18557e-08, 1, 1, 1, 1, 0.866667, 1, 0, 4.86892e-10, -0.0401627, 7.57478e-09, -7.57477e-09, -2.18557e-08, 1, 1, 1, 1, 0.933333, 1, 0, 3.67217e-09, -0.0636073, 7.57478e-09, -7.57477e-09, -2.18557e-08, 1, 1, 1, 1, 1, 1, 0, 9.82942e-09, -0.108926, 0, -2.57165e-16, 0, 1, 1, 1, 1, 1.06667, 1, 0, 1.94622e-08, -0.179826, 7.57478e-09, -7.57477e-09, -2.18557e-08, 1, 1, 1, 1, 1.13333, 1, 0, 3.20387e-08, -0.272392, 7.57478e-09, -7.57477e-09, -2.18557e-08, 1, 1, 1, 1, 1.26667, 1, 0, 6.635e-08, -0.524932, 7.57478e-09, -7.57477e-09, -2.18557e-08, 1, 1, 1, 1, 2.5, 1, 0, 4.43384e-07, -3.3, 0, -2.57165e-16, 0, 1, 1, 1, 1 )
6464
tracks/8/type = "audio"
6565
tracks/8/path = NodePath("../sound")
6666
tracks/8/interp = 1

‎enemies/red_robot/parts/ray.shader

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ void fragment() {
2323
if (dist > clip) {
2424
discard;
2525
}
26-
vec4 ray_color = texture(ray_texture,UV);
27-
vec4 smoke_color = texture(smoke_texture,UV);
26+
vec4 ray_color = texture(ray_texture, UV);
27+
vec4 smoke_color = texture(smoke_texture, UV);
2828

29-
vec4 col = mix(ray_color,smoke_color,smoke);
29+
vec4 col = mix(ray_color, smoke_color, smoke);
3030

31-
ALBEDO=col.rgb * energy;
32-
ALPHA=col.a * transparency;
31+
ALBEDO = col.rgb * energy;
32+
ALPHA = col.a * transparency;
3333
//ALBEDO=ray_color.rgb;
3434
//ALPHA=ray_color.a;
3535
}

‎level/geometry/scenes/collision/radial_player_only.tscn

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
[gd_scene load_steps=4 format=2]
22

3-
[sub_resource type="BoxShape" id=25]
3+
[sub_resource type="BoxShape" id=1]
44
extents = Vector3( 7, 2, 0.5 )
55

6-
[sub_resource type="BoxShape" id=26]
6+
[sub_resource type="BoxShape" id=2]
77
extents = Vector3( 0.3, 4, 2.5 )
88

9-
[sub_resource type="BoxShape" id=24]
9+
[sub_resource type="BoxShape" id=3]
1010
extents = Vector3( 3.1, 1.6, 2.2 )
1111

1212
[node name="RadialPlayerOnly" type="StaticBody"]
@@ -16,67 +16,67 @@ collision_mask = 4
1616

1717
[node name="EntranceSideRailing1" type="CollisionShape" parent="."]
1818
transform = Transform( 0.819153, 0, 0.573577, 0, 1, 0, -0.573577, 0, 0.819153, 30, -5, -13.5 )
19-
shape = SubResource( 25 )
19+
shape = SubResource( 1 )
2020

2121
[node name="EntranceSideRailing2" type="CollisionShape" parent="."]
2222
transform = Transform( 0.819153, 0, -0.573577, 0, 1, 0, 0.573577, 0, 0.819153, 30, -5, 13.5 )
23-
shape = SubResource( 25 )
23+
shape = SubResource( 1 )
2424

2525
[node name="MainFloorRailing1" type="CollisionShape" parent="."]
2626
transform = Transform( 0.987689, 0, -0.156435, 0, 1, 0, 0.156435, 0, 0.987689, 26.4701, -11, 4.19245 )
27-
shape = SubResource( 26 )
27+
shape = SubResource( 2 )
2828

2929
[node name="MainFloorRailing2" type="CollisionShape" parent="."]
3030
transform = Transform( 0.951057, 0, -0.309017, 0, 1, 0, 0.309017, 0, 0.951057, 25.4883, -11, 8.28166 )
31-
shape = SubResource( 26 )
31+
shape = SubResource( 2 )
3232

3333
[node name="MainFloorRailing3" type="CollisionShape" parent="."]
3434
transform = Transform( 0.891007, 0, -0.453991, 0, 1, 0, 0.453991, 0, 0.891007, 23.879, -11, 12.167 )
35-
shape = SubResource( 26 )
35+
shape = SubResource( 2 )
3636

3737
[node name="MainFloorRailing4" type="CollisionShape" parent="."]
3838
transform = Transform( 0.809017, 0, -0.587786, 0, 1, 0, 0.587786, 0, 0.809017, 21.6817, -11, 15.7527 )
39-
shape = SubResource( 26 )
39+
shape = SubResource( 2 )
4040

4141
[node name="MainFloorRailing5" type="CollisionShape" parent="."]
4242
transform = Transform( 0.707107, 0, -0.707107, 0, 1, 0, 0.707107, 0, 0.707107, 18.9505, -11, 18.9505 )
43-
shape = SubResource( 26 )
43+
shape = SubResource( 2 )
4444

4545
[node name="MainFloorRailing6" type="CollisionShape" parent="."]
4646
transform = Transform( 0.587785, 0, -0.809018, 0, 1, 0, 0.809018, 0, 0.587785, 15.7526, -11, 21.6817 )
47-
shape = SubResource( 26 )
47+
shape = SubResource( 2 )
4848

4949
[node name="MainFloorRailing7" type="CollisionShape" parent="."]
5050
transform = Transform( 0.987689, 0, 0.156434, 0, 1, 0, -0.156434, 0, 0.987689, 26.4701, -11, -4.19244 )
51-
shape = SubResource( 26 )
51+
shape = SubResource( 2 )
5252

5353
[node name="MainFloorRailing8" type="CollisionShape" parent="."]
5454
transform = Transform( 0.951057, 0, 0.309017, 0, 1, 0, -0.309017, 0, 0.951057, 25.4883, -11, -8.28166 )
55-
shape = SubResource( 26 )
55+
shape = SubResource( 2 )
5656

5757
[node name="MainFloorRailing9" type="CollisionShape" parent="."]
5858
transform = Transform( 0.891007, 0, 0.453991, 0, 1, 0, -0.453991, 0, 0.891007, 23.879, -11, -12.1669 )
59-
shape = SubResource( 26 )
59+
shape = SubResource( 2 )
6060

6161
[node name="MainFloorRailing10" type="CollisionShape" parent="."]
6262
transform = Transform( 0.809018, 0, 0.587785, 0, 1, 0, -0.587785, 0, 0.809018, 21.6817, -11, -15.7526 )
63-
shape = SubResource( 26 )
63+
shape = SubResource( 2 )
6464

6565
[node name="MainFloorRailing11" type="CollisionShape" parent="."]
6666
transform = Transform( 0.707107, 0, 0.707107, 0, 1, 0, -0.707107, 0, 0.707107, 18.9505, -11, -18.9505 )
67-
shape = SubResource( 26 )
67+
shape = SubResource( 2 )
6868

6969
[node name="MainFloorRailing12" type="CollisionShape" parent="."]
7070
transform = Transform( 0.587785, 0, 0.809017, 0, 1, 0, -0.809017, 0, 0.587785, 15.7527, -11, -21.6817 )
71-
shape = SubResource( 26 )
71+
shape = SubResource( 2 )
7272

7373
[node name="MainFloorRailing13" type="CollisionShape" parent="."]
7474
transform = Transform( 0.453991, 0, 0.891007, 0, 1, 0, -0.891007, 0, 0.453991, 12.167, -11, -23.879 )
75-
shape = SubResource( 26 )
75+
shape = SubResource( 2 )
7676

7777
[node name="ArmBasePlayerOnly" type="CollisionShape" parent="."]
7878
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 9.9, -12.4, 0 )
79-
shape = SubResource( 24 )
79+
shape = SubResource( 3 )
8080
__meta__ = {
8181
"_editor_description_": ""
8282
}

0 commit comments

Comments
 (0)