diff options
Diffstat (limited to 'godot/scenes')
| -rw-r--r-- | godot/scenes/ballistics/Rocket.gd | 1 | ||||
| -rw-r--r-- | godot/scenes/characters/PlayerRigid.tscn | 10 | ||||
| -rw-r--r-- | godot/scenes/vehicles/Airplane.tscn | 2 | ||||
| -rw-r--r-- | godot/scenes/vehicles/Gunbrig.tscn | 2 |
4 files changed, 10 insertions, 5 deletions
diff --git a/godot/scenes/ballistics/Rocket.gd b/godot/scenes/ballistics/Rocket.gd index e475f9b..c10b5b5 100644 --- a/godot/scenes/ballistics/Rocket.gd +++ b/godot/scenes/ballistics/Rocket.gd @@ -40,6 +40,7 @@ remotesync func explode(): for body in $BlastArea.get_overlapping_bodies(): if body.has_method("damage"): body.rpc("damage", 20, "EXPLOSIVE", [shooter_id, shooter], "using 'rocket'") + if body.has_method("net_apply_impulse"): body.rpc_id(body.get_network_master(), "net_apply_impulse", (1300*(body.global_transform.origin+Vector3(0,1,0) - global_transform.origin).normalized())) $AnimationPlayer.play("explode") diff --git a/godot/scenes/characters/PlayerRigid.tscn b/godot/scenes/characters/PlayerRigid.tscn index 87a463d..bc5f588 100644 --- a/godot/scenes/characters/PlayerRigid.tscn +++ b/godot/scenes/characters/PlayerRigid.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=14 format=2] [ext_resource path="res://scripts/characters/player_controller_new.gd" type="Script" id=1] -[ext_resource path="res://theming/FreeMono.otf" type="DynamicFontData" id=2] +[ext_resource path="res://theming/Rapscallion-q341.ttf" type="DynamicFontData" id=2] [ext_resource path="res://scenes/characters/PlayerAreaDetect.gd" type="Script" id=3] [ext_resource path="res://scenes/characters/viewmodel_arms.tscn" type="PackedScene" id=4] [ext_resource path="res://scenes/weapons/hands.res" type="Resource" id=5] @@ -20,9 +20,9 @@ extents = Vector3( 0.325, 0.9, 0.325 ) size = Vector3( 0.6, 1.8, 0.6 ) [sub_resource type="DynamicFont" id=5] -size = 20 -outline_size = 3 -use_filter = true +size = 128 +outline_size = 1 +use_mipmaps = true font_data = ExtResource( 2 ) [sub_resource type="BoxShape" id=1] @@ -97,9 +97,11 @@ path_desired_distance = 1.5 target_desired_distance = 1.5 agent_height_offset = -0.5 path_max_distance = 1.0 +neighbor_dist = 15.0 [node name="Nametag" type="Label3D" parent="."] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.08522, 0 ) +pixel_size = 0.0023 billboard = 1 font = SubResource( 5 ) diff --git a/godot/scenes/vehicles/Airplane.tscn b/godot/scenes/vehicles/Airplane.tscn index 43c3a17..a94e7e3 100644 --- a/godot/scenes/vehicles/Airplane.tscn +++ b/godot/scenes/vehicles/Airplane.tscn @@ -161,4 +161,4 @@ shape = SubResource( 9 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 2.72698, -0.196514, 0 ) [node name="PilotExit" type="Spatial" parent="."] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 2.50863, 2.36377, 0 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 3.89608, 1.46682, 0 ) diff --git a/godot/scenes/vehicles/Gunbrig.tscn b/godot/scenes/vehicles/Gunbrig.tscn index 91900c3..70a30ad 100644 --- a/godot/scenes/vehicles/Gunbrig.tscn +++ b/godot/scenes/vehicles/Gunbrig.tscn @@ -357,3 +357,5 @@ shape = SubResource( 36 ) [node name="GunwhaleR2" type="CollisionShape" parent="."] transform = Transform( 0.999486, 0, 0.0320562, 0, 1, 0, -0.0320562, 0, 0.999486, -0.646409, 0.658986, -3.46571 ) shape = SubResource( 36 ) + +[connection signal="navigation_mesh_changed" from="NavigationMeshInstance" to="NavigationMeshInstance" method="mesh_changed"] |