From 955f3eff2a7d0f302978506ae14c9491da1df4b0 Mon Sep 17 00:00:00 2001 From: unfa Date: Fri, 14 May 2021 20:51:49 +0200 Subject: [PATCH] Residual changes. --- Game/Assets/Effects/ExplosionFlames.ptex | 20 ++++++++++---------- Game/Assets/Weapons/Handgun/Handgun.tscn | 1 + Game/Classes/Player/Player.tscn | 2 +- Game/Classes/Weapon/Weapon.tscn | 3 --- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/Game/Assets/Effects/ExplosionFlames.ptex b/Game/Assets/Effects/ExplosionFlames.ptex index f07bc20..20e1eea 100644 --- a/Game/Assets/Effects/ExplosionFlames.ptex +++ b/Game/Assets/Effects/ExplosionFlames.ptex @@ -288,12 +288,6 @@ "to": "blend_11", "to_port": 0 }, - { - "from": "warp_4", - "from_port": 0, - "to": "blend_13", - "to_port": 0 - }, { "from": "blend_11", "from_port": 0, @@ -329,11 +323,17 @@ "from_port": 0, "to": "blend_13", "to_port": 1 + }, + { + "from": "warp_4", + "from_port": 0, + "to": "blend_13", + "to_port": 0 } ], "label": "Graph", "longdesc": "", - "name": "@@268", + "name": "268", "node_position": { "x": 0, "y": 0 @@ -1354,8 +1354,8 @@ { "name": "auto_tones_2", "node_position": { - "x": 3607.530029, - "y": 391.522858 + "x": 3671.530029, + "y": 370.522858 }, "parameters": { "param0": 9 @@ -1615,7 +1615,7 @@ { "name": "blend_13", "node_position": { - "x": 7439.953125, + "x": 7440.953125, "y": 1136.836182 }, "parameters": { diff --git a/Game/Assets/Weapons/Handgun/Handgun.tscn b/Game/Assets/Weapons/Handgun/Handgun.tscn index 89409bf..0ab9bce 100644 --- a/Game/Assets/Weapons/Handgun/Handgun.tscn +++ b/Game/Assets/Weapons/Handgun/Handgun.tscn @@ -100,6 +100,7 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.68988, 0.110679, 0 ) anims/Flash = SubResource( 1 ) [node name="MuzzleLight" type="OmniLight" parent="Effects"] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.00515842, 1.90735e-06, 0.0512087 ) light_color = Color( 1, 0.423529, 0.0431373, 1 ) light_energy = 0.0 omni_range = 10.0 diff --git a/Game/Classes/Player/Player.tscn b/Game/Classes/Player/Player.tscn index 95ec4fb..255cc82 100644 --- a/Game/Classes/Player/Player.tscn +++ b/Game/Classes/Player/Player.tscn @@ -223,7 +223,7 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.53592, -0.0651628 ) [node name="ZoomTween" type="Tween" parent="Camera"] [node name="Hand" type="Spatial" parent="Camera"] -transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0.335, -0.398982, -0.559 ) +transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0.335, -0.390001, -0.559 ) [node name="WeaponBobAnimationTree" type="AnimationTree" parent="Camera/Hand"] tree_root = SubResource( 12 ) diff --git a/Game/Classes/Weapon/Weapon.tscn b/Game/Classes/Weapon/Weapon.tscn index 64d75d2..d6e82a5 100644 --- a/Game/Classes/Weapon/Weapon.tscn +++ b/Game/Classes/Weapon/Weapon.tscn @@ -156,9 +156,6 @@ Voice_Count = 2 unit_db = -3.0 [editable path="Model"] - [editable path="Sounds/Shoot/A"] - [editable path="Sounds/Shoot/B"] - [editable path="Sounds/Shoot/C"]