diff --git a/Game/Assets/Effects/BulletTracerMaterial.tres b/Game/Assets/Effects/BulletTracerMaterial.tres index 3d97b32..d5afbf0 100644 --- a/Game/Assets/Effects/BulletTracerMaterial.tres +++ b/Game/Assets/Effects/BulletTracerMaterial.tres @@ -89,8 +89,9 @@ void fragment() { vec3 n_out4p0 = n_out15p0 * vec3(n_out5p0); // Fresnel:2 + bool n_in2p2 = true; float n_in2p3 = 0.50000; - float n_out2p0 = pow(clamp(dot(NORMAL, VIEW), 0.0, 1.0), n_in2p3); + float n_out2p0 = n_in2p2 ? (pow(clamp(dot(NORMAL, VIEW), 0.0, 1.0), n_in2p3)) : (pow(1.0 - clamp(dot(NORMAL, VIEW), 0.0, 1.0), n_in2p3)); // ScalarOp:12 float n_in12p1 = 0.50000; diff --git a/Game/Assets/Maps/DM1/DM1.tscn b/Game/Assets/Maps/DM1/DM1.tscn index 41e861b..1444bed 100644 --- a/Game/Assets/Maps/DM1/DM1.tscn +++ b/Game/Assets/Maps/DM1/DM1.tscn @@ -1495,7 +1495,8 @@ height = 84.58 environment = SubResource( 2 ) [node name="BakedLightmap" type="BakedLightmap" parent="."] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 8, 13, 0 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 8, 11.2189, 0 ) +extents = Vector3( 34.6879, 13.7862, 29.8873 ) light_data = SubResource( 3 ) [node name="SpawnPoints" type="Spatial" parent="."] diff --git a/Game/Game.tscn b/Game/Game.tscn index 78c381a..3976a74 100644 --- a/Game/Game.tscn +++ b/Game/Game.tscn @@ -315,7 +315,6 @@ theme = ExtResource( 1 ) [node name="PlayerList" type="VBoxContainer" parent="PlayerListContainer/Panel"] theme = ExtResource( 1 ) alignment = 1 - [connection signal="pressed" from="MenuContainer/MainMenu/QuickConnect" to="." method="join_test_server"] [connection signal="pressed" from="MenuContainer/MainMenu/Connect" to="." method="open_menu" binds= [ "ConnectMenu" ]] [connection signal="pressed" from="MenuContainer/MainMenu/Disconnect" to="." method="free_client"] diff --git a/Game/project.godot b/Game/project.godot index 6614309..72a1b45 100644 --- a/Game/project.godot +++ b/Game/project.godot @@ -9,7 +9,7 @@ config_version=4 _global_script_classes=[ { -"base": "Reference", +"base": "KinematicBody", "class": "Player", "language": "GDScript", "path": "res://Classes/Player/Player.gd"