diff options
Diffstat (limited to 'godot/scenes')
| -rw-r--r-- | godot/scenes/GameBase.tscn | 7 | ||||
| -rw-r--r-- | godot/scenes/characters/PlayerRigid.tscn | 56 | ||||
| -rw-r--r-- | godot/scenes/environment/Ladder.tscn | 15 | ||||
| -rw-r--r-- | godot/scenes/machines/Cannon.tscn | 6 | ||||
| -rw-r--r-- | godot/scenes/vehicles/Airplane.tscn | 23 | ||||
| -rw-r--r-- | godot/scenes/vehicles/Gunboat.tscn | 7 | ||||
| -rw-r--r-- | godot/scenes/weapons/rockets.gd | 4 | ||||
| -rw-r--r-- | godot/scenes/worldprops/Runway.tscn | 23 |
8 files changed, 103 insertions, 38 deletions
diff --git a/godot/scenes/GameBase.tscn b/godot/scenes/GameBase.tscn index eaa6c86..6764b81 100644 --- a/godot/scenes/GameBase.tscn +++ b/godot/scenes/GameBase.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=5 format=2] [ext_resource path="res://scenes/environment/Water.tscn" type="PackedScene" id=1] [ext_resource path="res://ui/HUD.tscn" type="PackedScene" id=2] [ext_resource path="res://scripts/GameBase.gd" type="Script" id=3] +[ext_resource path="res://scripts/cameras/PlayerCamGDS.gd" type="Script" id=4] [node name="GAMEWORLD" type="Spatial"] script = ExtResource( 3 ) @@ -23,3 +24,7 @@ transform = Transform( 6000, 0, 0, 0, 100, 0, 0, 0, 6000, 0, 0, 0 ) [node name="DEFAULTCAM" type="Camera" parent="."] current = true far = 8192.0 + +[node name="PLAYERCAM" type="ClippedCamera" parent="."] +far = 8192.0 +script = ExtResource( 4 ) diff --git a/godot/scenes/characters/PlayerRigid.tscn b/godot/scenes/characters/PlayerRigid.tscn index 8f61532..89c9df0 100644 --- a/godot/scenes/characters/PlayerRigid.tscn +++ b/godot/scenes/characters/PlayerRigid.tscn @@ -1,13 +1,14 @@ -[gd_scene load_steps=9 format=2] +[gd_scene load_steps=11 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://scenes/characters/PlayerAreaDetect.gd" type="Script" id=3] [sub_resource type="PhysicsMaterial" id=3] +resource_local_to_scene = true rough = true -[sub_resource type="BoxShape" id=1] +[sub_resource type="BoxShape" id=6] extents = Vector3( 0.325, 0.9, 0.325 ) [sub_resource type="CubeMesh" id=2] @@ -22,67 +23,78 @@ outline_size = 3 use_filter = true font_data = ExtResource( 2 ) +[sub_resource type="BoxShape" id=1] +extents = Vector3( 0.325, 0.9, 0.325 ) + +[sub_resource type="CylinderMesh" id=7] +top_radius = 0.01 +bottom_radius = 0.01 +height = 0.3 +radial_segments = 6 + [node name="Soldier" type="RigidBody" groups=["playable", "player"]] collision_layer = 32769 collision_mask = 32769 mode = 2 mass = 80.0 physics_material_override = SubResource( 3 ) -contacts_reported = 5 +continuous_cd = true +contacts_reported = 3 contact_monitor = true can_sleep = false -axis_lock_angular_x = true -axis_lock_angular_y = true -axis_lock_angular_z = true linear_damp = 0.0 angular_damp = 0.0 script = ExtResource( 1 ) [node name="Collision" type="CollisionShape" parent="."] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.9, 0 ) -shape = SubResource( 1 ) +shape = SubResource( 6 ) -[node name="Head" type="Spatial" parent="."] +[node name="Neck" type="Spatial" parent="."] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.44, 0 ) -[node name="Camera" type="Camera" parent="Head"] -keep_aspect = 0 -cull_mask = 524287 -fov = 90.0 -near = 0.2 -far = 1449.4 +[node name="Head" type="Spatial" parent="Neck"] -[node name="UseRay" type="RayCast" parent="Head/Camera"] +[node name="UseRay" type="RayCast" parent="Neck/Head"] +unique_name_in_owner = true enabled = true cast_to = Vector3( 0, 0, -2.5 ) collision_mask = 131075 collide_with_areas = true -[node name="MeleeRay" type="RayCast" parent="Head/Camera"] +[node name="MeleeRay" type="RayCast" parent="Neck/Head"] +unique_name_in_owner = true enabled = true cast_to = Vector3( 0, 0, -2.5 ) collision_mask = 262145 collide_with_areas = true -[node name="viewmodel_c" type="ViewportContainer" parent="Head"] +[node name="Camera" type="Camera" parent="Neck/Head"] +keep_aspect = 0 +cull_mask = 524287 +fov = 90.0 +near = 0.2 +far = 1449.4 + +[node name="viewmodel_c" type="ViewportContainer" parent="Neck"] visible = false margin_right = 1024.0 margin_bottom = 600.0 -[node name="viewmodel" type="Viewport" parent="Head/viewmodel_c"] +[node name="viewmodel" type="Viewport" parent="Neck/viewmodel_c"] size = Vector2( 1024, 600 ) transparent_bg = true handle_input_locally = false render_target_update_mode = 0 -[node name="vm_camera" type="Camera" parent="Head/viewmodel_c/viewmodel"] +[node name="vm_camera" type="Camera" parent="Neck/viewmodel_c/viewmodel"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.539779, 0 ) cull_mask = 524288 current = true fov = 90.0 far = 75.9 -[node name="MeshInstance" type="MeshInstance" parent="Head/viewmodel_c/viewmodel"] +[node name="MeshInstance" type="MeshInstance" parent="Neck/viewmodel_c/viewmodel"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.0266792, -0.813922 ) layers = 524288 mesh = SubResource( 2 ) @@ -114,5 +126,9 @@ script = ExtResource( 3 ) [node name="Collision" type="CollisionShape" parent="AreaDetect"] shape = SubResource( 1 ) +[node name="normal_vis" type="MeshInstance" parent="."] +mesh = SubResource( 7 ) +skeleton = NodePath("../Feet") + [connection signal="area_entered" from="AreaDetect" to="AreaDetect" method="_on_AreaDetect_area_entered"] [connection signal="area_exited" from="AreaDetect" to="AreaDetect" method="_on_AreaDetect_area_exited"] diff --git a/godot/scenes/environment/Ladder.tscn b/godot/scenes/environment/Ladder.tscn index ee99c68..96c5e36 100644 --- a/godot/scenes/environment/Ladder.tscn +++ b/godot/scenes/environment/Ladder.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=7 format=2] +[gd_scene load_steps=8 format=2] [ext_resource path="res://scenes/environment/Ladder.gd" type="Script" id=1] @@ -24,6 +24,11 @@ func _ready(): transform.origin.y += 0.2 / get_parent().scale.y " +[sub_resource type="NavigationMesh" id=6] +vertices = PoolVector3Array( -0.5, 0.425, -0.5, -0.5, 0.425, 0.5, 0.5, 0.425, 0.5, 0.5, 0.425, -0.5 ) +polygons = [ PoolIntArray( 3, 2, 0 ), PoolIntArray( 0, 2, 1 ) ] +agent_radius = 0.0 + [node name="Ladder" type="Spatial"] script = ExtResource( 1 ) @@ -46,3 +51,11 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.5, 0.5 ) [node name="Top" type="Spatial" parent="."] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, 0.5 ) script = SubResource( 3 ) + +[node name="NavigationMeshInstance" type="NavigationMeshInstance" parent="."] +transform = Transform( 1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 0, 0 ) +navmesh = SubResource( 6 ) + +[node name="DebugVisMesh" type="MeshInstance" parent="NavigationMeshInstance"] +transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0, 0 ) +mesh = SubResource( 1 ) diff --git a/godot/scenes/machines/Cannon.tscn b/godot/scenes/machines/Cannon.tscn index e84f74a..20627fc 100644 --- a/godot/scenes/machines/Cannon.tscn +++ b/godot/scenes/machines/Cannon.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=11 format=2] -[ext_resource path="res://bin/networked_machine.gdns" type="Script" id=1] +[ext_resource path="res://scripts/machines/Cannon.gd" type="Script" id=1] [ext_resource path="res://sounds/explode.wav" type="AudioStream" id=2] [sub_resource type="PhysicsMaterial" id=8] @@ -62,10 +62,8 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 1.13452, 0, 0 ) stream = ExtResource( 2 ) unit_db = 9.0 -[node name="Camera" type="Camera" parent="YawJoint/PitchJoint"] +[node name="CameraPoint" type="Spatial" parent="YawJoint/PitchJoint"] transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -0.513577, 0.363402, 0 ) -fov = 44.6 -far = 8192.0 [node name="SteerArea" type="Area" parent="."] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.935472, 0.123637, 0 ) diff --git a/godot/scenes/vehicles/Airplane.tscn b/godot/scenes/vehicles/Airplane.tscn index 2b46297..ec79c66 100644 --- a/godot/scenes/vehicles/Airplane.tscn +++ b/godot/scenes/vehicles/Airplane.tscn @@ -1,13 +1,13 @@ [gd_scene load_steps=14 format=2] [ext_resource path="res://scripts/vehicles/Airplane.gd" type="Script" id=1] -[ext_resource path="res://scripts/cameras/plane_armcam.gd" type="Script" id=2] +[ext_resource path="res://particles/RocketTrail.tscn" type="PackedScene" id=2] [sub_resource type="PhysicsMaterial" id=1] rough = true [sub_resource type="Curve" id=10] -_data = [ Vector2( 0, 0.119632 ), 0.0, 0.0, 0, 0, Vector2( 0.172819, 1 ), 0.0, 0.0, 0, 0, Vector2( 0.823825, 1 ), 0.0, 0.0, 0, 0, Vector2( 1, 0 ), 0.0, 0.0, 0, 0 ] +_data = [ Vector2( 0, 0.509091 ), 0.0, 0.0, 0, 0, Vector2( 0.172819, 1 ), 0.0, 0.0, 0, 0, Vector2( 0.823825, 1 ), 0.0, 0.0, 0, 0, Vector2( 1, 0.463636 ), 0.0, 0.0, 0, 0 ] [sub_resource type="CurveTexture" id=11] width = 1024 @@ -125,10 +125,8 @@ mesh = SubResource( 8 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 1.22602, 0.452069, 0 ) spring_length = 15.0 margin = 0.03 -script = ExtResource( 2 ) [node name="ClippedCamera" type="ClippedCamera" parent="armcam"] -current = true fov = 79.2 near = 0.12 far = 8192.0 @@ -143,13 +141,24 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 3.02202, 0.828033, 0 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 3.02201, 0.827813, -5.21093 ) [node name="tail" type="Spatial" parent="."] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -4.3164, 0.456713, 0 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -3.47682, 0.456713, 0 ) -[node name="TugArea" type="Area" parent="."] +[node name="RocketTrail" parent="tail" instance=ExtResource( 2 )] +unique_name_in_owner = true +transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, 0 ) +emitting = false + +[node name="SteerArea" type="Area" parent="."] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 4.58015, -0.728266, 0 ) collision_layer = 131072 collision_mask = 0 -[node name="CollisionShape" type="CollisionShape" parent="TugArea"] +[node name="CollisionShape" type="CollisionShape" parent="SteerArea"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.47757, 0 ) shape = SubResource( 9 ) + +[node name="Cockpit" type="Spatial" parent="."] +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, 6.1653, -0.196514, 0 ) diff --git a/godot/scenes/vehicles/Gunboat.tscn b/godot/scenes/vehicles/Gunboat.tscn index 5719cff..6b447d6 100644 --- a/godot/scenes/vehicles/Gunboat.tscn +++ b/godot/scenes/vehicles/Gunboat.tscn @@ -91,11 +91,12 @@ extents = Vector3( 0.115313, 0.934506, 1.68658 ) extents = Vector3( 2.14672, 0.239365, 1.59078 ) [sub_resource type="NavigationMesh" id=26] -vertices = PoolVector3Array( 11.5, 0.12649, -2.25, 14.75, 0.12649, -1.25, 14.75, 0.12649, -2.25, 13, 1.12649, 0.75, 13, 1.12649, -0.5, 12, 0.12649, -1, 8, 0.62649, -1.5, 8.5, 0.62649, 1.5, 9.625, 0.12649, 1.3125, 11.875, 0.12649, 0.9375, 8.33333, 0.12649, 0.5, -6, 0.62649, 1, -6.25, 1.37649, 2.25, -4, 1.37649, 2.25, -4.25, 0.62649, 1, -1.75, 0.12649, -1.75, -11.75, 0.62649, -1.75, -6.5, 0.12649, 1, -6, 0.62649, 1, -4.9375, 0.12649, 0.3125, -3.75, 0.12649, 1, -3.75, 0.12649, 1.75, 0, 0.62649, 1.75, 8.5, 0.62649, 1.5, 8, 0.62649, -1.5, -1.75, 0.12649, -1.75, 1.41667, 0.12649, 1.70833, 7.08333, 0.12649, 1.54167, 8.33333, 0.12649, 0.5, 1.99502, 0.12649, 0.496974, -1.025, 0.12649, 0.475, -1.75, 0.12649, -1.75, -4.25, 0.62649, 1, -3.75, 0.12649, 1, -3.41667, 0.12649, 0.0833333, -1.75, 0.12649, -1.75, -6, 0.62649, 1, -4.25, 0.62649, 1, -3.41667, 0.12649, 0.0833333, -4.9375, 0.12649, 0.3125, -11.75, 0.62649, -1.75, -15.25, 0.12649, -1.25, -15.25, -0.12351, 1.25, -6.5, 0.12649, 1.75, -6.5, 0.12649, 1, 15.5, 1.87649, -0.75, 12, 1.62649, -1.5, 13.5, 1.87649, -0.75, 13.5, 1.87649, 0.75, 13, 1.87649, 1.25, 15.75, 1.87649, 0.75, 13.5, 1.87649, 0.75, 15.75, 1.87649, 0.75, 15.5, 1.87649, -0.75, 13.5, 1.87649, -0.75, 11.5, 0.12649, 2, 14.75, 0.12649, 2.25, 14.75, 0.12649, 1.5 ) -polygons = [ PoolIntArray( 2, 1, 0 ), PoolIntArray( 7, 10, 8 ), PoolIntArray( 8, 10, 6 ), PoolIntArray( 8, 6, 9 ), PoolIntArray( 9, 6, 5 ), PoolIntArray( 9, 5, 4 ), PoolIntArray( 9, 4, 3 ), PoolIntArray( 14, 13, 11 ), PoolIntArray( 11, 13, 12 ), PoolIntArray( 18, 17, 19 ), PoolIntArray( 19, 17, 15 ), PoolIntArray( 15, 17, 16 ), PoolIntArray( 24, 29, 25 ), PoolIntArray( 25, 30, 20 ), PoolIntArray( 20, 30, 21 ), PoolIntArray( 21, 30, 22 ), PoolIntArray( 22, 29, 26 ), PoolIntArray( 26, 29, 27 ), PoolIntArray( 27, 28, 23 ), PoolIntArray( 28, 27, 24 ), PoolIntArray( 29, 30, 25 ), PoolIntArray( 24, 27, 29 ), PoolIntArray( 30, 29, 22 ), PoolIntArray( 32, 34, 33 ), PoolIntArray( 33, 34, 31 ), PoolIntArray( 36, 39, 37 ), PoolIntArray( 37, 39, 38 ), PoolIntArray( 38, 39, 35 ), PoolIntArray( 41, 40, 42 ), PoolIntArray( 42, 40, 44 ), PoolIntArray( 42, 44, 43 ), PoolIntArray( 47, 46, 45 ), PoolIntArray( 50, 49, 48 ), PoolIntArray( 54, 53, 51 ), PoolIntArray( 51, 53, 52 ), PoolIntArray( 57, 56, 55 ) ] +vertices = PoolVector3Array( 4.5, 1.37649, -2.25, 4.5, 1.37649, -2, 6.25, 1.37649, -2, 6.25, 1.37649, -2.25, 14.5, 0.12649, -1.5, 14.5, 0.12649, -1.25, 14.75, 0.12649, -1.25, 14.75, 0.12649, -2.25, 13.75, 0.12649, -1.75, 13.75, 0.12649, -1.5, 14.5, 0.12649, -1.5, 14.75, 0.12649, -2.25, 11.5, 0.12649, -2.25, 11.5, 0.12649, -2, 12.75, 0.12649, -2, 14.75, 0.12649, -2.25, 12.75, 0.12649, -2, 12.75, 0.12649, -1.75, 13.75, 0.12649, -1.75, 14.75, 0.12649, -2.25, -6, 1.37649, 2, -6.25, 1.37649, 2, -6.25, 1.37649, 2.25, -4, 1.37649, 2.25, -4, 1.37649, 2, -4.25, 1.37649, 2, 13, 1.12649, 0.75, 13, 1.12649, -0.5, 12, 0.12649, -0.75, 11, 0.12649, 1, 12, 0.12649, 0.875, -6, 1.37649, 2, -6.25, 1.37649, 2.25, -4, 1.37649, 2.25, -4.25, 1.37649, 2, 8, 0.12649, -1.25, 8, 0.62649, -1.5, 3.5, 0.12649, -1.5, -6, 0.62649, 1, -6, 1.37649, 2, -4.25, 1.37649, 2, -4.25, 0.62649, 1, -11.75, 0.12649, -1.5, -14.25, 0.12649, 1.25, -14.25, 0.62649, 1.5, -6.5, 0.12649, 1.75, -6.5, 0.12649, 1, -4.25, 0.62649, 1, -3.75, 0.12649, 1, -4.25, 0.12649, -1.75, 11, 0.12649, 1, 12, 0.12649, -0.75, 12, 0.12649, -1, 8, 0.12649, -1.25, 8.5, 0.12649, 1.25, 8.5, 0.12649, 1.25, 11, 0.12649, 1.25, 11, 0.12649, 1, -11.75, 0.12649, -1.5, -14.25, 0.12649, -1.5, -14.25, 0.12649, -1.25, -15.25, 0.12649, -1.25, -15.25, -0.12351, 1.25, -14.25, 0.12649, 1.25, -14.25, 0.12649, -1.25, -6, 0.62649, 1, -4.25, 0.62649, 1, -4.25, 0.12649, -1.75, -5.41667, 0.12649, 0.0833333, -11.75, 0.12649, -1.5, -14.25, 0.12649, -1.25, -14.25, 0.12649, 1.25, 0, 0.12649, 1.5, 3.5, 0.12649, -1.5, 3.5, 0.62649, -1.75, -4.25, 0.12649, -1.75, -3.75, 0.12649, 1, -4.25, 0.12649, -1.75, -11.75, 0.62649, -1.75, -11.75, 0.12649, -1.5, -6.5, 0.12649, 1, -6, 0.62649, 1, -5.41667, 0.12649, 0.0833333, 8.5, 0.62649, 1.5, 8.5, 0.12649, 1.25, 8, 0.12649, -1.25, 3.5, 0.12649, -1.5, 0, 0.12649, 1.5, 7.08333, 0.12649, 1.5, -3.75, 0.12649, 1.75, 0, 0.62649, 1.75, 0, 0.12649, 1.5, -3.75, 0.12649, 1, 10.25, 1.37649, -1.75, 10.25, 1.37649, -1.5, 11.5, 1.62649, -1.5, 11.5, 1.62649, -1.75, 13.5, 1.87649, 0.75, 13, 1.87649, 1, 13, 1.87649, 1.25, 14.75, 1.87649, 1, 14.75, 1.87649, 0.75, 14.5, 1.87649, -0.75, 14.5, 1.62649, -1, 13.75, 1.87649, -1, 13.5, 1.87649, -0.75, 15.5, 1.87649, -0.5, 15.5, 1.87649, -0.75, 14.5, 1.87649, -0.75, 14.75, 1.87649, 0.75, 15.5, 1.87649, -0.5, 14.5, 1.87649, -0.75, 13.5, 1.87649, -0.75, 13.5, 1.87649, 0.75, 13.5, 1.87649, -0.75, 13.75, 1.87649, -1, 13.75, 1.62649, -1.25, 12, 1.62649, -1.5, 12, 1.62649, -1.25, 15.75, 1.87649, 0.75, 15.75, 1.87649, -0.5, 15.5, 1.87649, -0.5, 14.75, 1.87649, 0.75, 12.75, 0.12649, 2, 11.5, 0.12649, 2, 11.5, 0.12649, 2.25, 14.75, 0.12649, 2.25, 14.75, 0.12649, 2.25, 14.75, 0.12649, 1.5, 12.75, 0.12649, 1.75, 12.75, 0.12649, 2, -13, 1.37649, 2, -13, 1.37649, 2.25, -11.75, 1.37649, 2.25, -11.75, 1.37649, 2, 2.25, 1.37649, 2, 2.25, 1.37649, 2.25, 6.25, 1.37649, 2.25, 6.25, 1.37649, 2 ) +polygons = [ PoolIntArray( 3, 2, 0 ), PoolIntArray( 0, 2, 1 ), PoolIntArray( 5, 4, 6 ), PoolIntArray( 6, 4, 7 ), PoolIntArray( 9, 8, 10 ), PoolIntArray( 10, 8, 11 ), PoolIntArray( 13, 12, 14 ), PoolIntArray( 14, 12, 15 ), PoolIntArray( 17, 16, 18 ), PoolIntArray( 18, 16, 19 ), PoolIntArray( 22, 21, 20 ), PoolIntArray( 25, 24, 23 ), PoolIntArray( 26, 30, 27 ), PoolIntArray( 27, 30, 28 ), PoolIntArray( 28, 30, 29 ), PoolIntArray( 34, 33, 31 ), PoolIntArray( 31, 33, 32 ), PoolIntArray( 37, 36, 35 ), PoolIntArray( 41, 40, 38 ), PoolIntArray( 38, 40, 39 ), PoolIntArray( 43, 42, 44 ), PoolIntArray( 44, 42, 46 ), PoolIntArray( 44, 46, 45 ), PoolIntArray( 49, 48, 47 ), PoolIntArray( 51, 50, 52 ), PoolIntArray( 52, 50, 54 ), PoolIntArray( 52, 54, 53 ), PoolIntArray( 57, 56, 55 ), PoolIntArray( 60, 59, 58 ), PoolIntArray( 64, 63, 61 ), PoolIntArray( 61, 63, 62 ), PoolIntArray( 65, 68, 66 ), PoolIntArray( 66, 68, 67 ), PoolIntArray( 69, 71, 70 ), PoolIntArray( 73, 72, 74 ), PoolIntArray( 74, 72, 76 ), PoolIntArray( 74, 76, 75 ), PoolIntArray( 81, 80, 82 ), PoolIntArray( 82, 80, 77 ), PoolIntArray( 77, 80, 79 ), PoolIntArray( 77, 79, 78 ), PoolIntArray( 83, 88, 84 ), PoolIntArray( 84, 88, 85 ), PoolIntArray( 85, 88, 86 ), PoolIntArray( 86, 88, 87 ), PoolIntArray( 90, 89, 91 ), PoolIntArray( 91, 89, 92 ), PoolIntArray( 96, 95, 93 ), PoolIntArray( 93, 95, 94 ), PoolIntArray( 98, 97, 99 ), PoolIntArray( 99, 97, 100 ), PoolIntArray( 100, 97, 101 ), PoolIntArray( 103, 102, 104 ), PoolIntArray( 104, 102, 105 ), PoolIntArray( 108, 107, 106 ), PoolIntArray( 110, 109, 111 ), PoolIntArray( 111, 109, 112 ), PoolIntArray( 112, 109, 113 ), PoolIntArray( 115, 114, 116 ), PoolIntArray( 116, 114, 118 ), PoolIntArray( 116, 118, 117 ), PoolIntArray( 120, 119, 121 ), PoolIntArray( 121, 119, 122 ), PoolIntArray( 124, 123, 125 ), PoolIntArray( 125, 123, 126 ), PoolIntArray( 130, 129, 127 ), PoolIntArray( 127, 129, 128 ), PoolIntArray( 134, 133, 131 ), PoolIntArray( 131, 133, 132 ), PoolIntArray( 138, 137, 135 ), PoolIntArray( 135, 137, 136 ) ] agent_height = 1.8 agent_radius = 0.18 agent_max_slope = 46.0 +edge_max_error = 0.68 [sub_resource type="CubeMesh" id=27] size = Vector3( 30, 0.1, 5 ) @@ -274,7 +275,7 @@ transform = Transform( 1, 0, 0, 0, 0.771436, 0.636307, 0, -0.636307, 0.771436, - mesh = SubResource( 29 ) [node name="CollisionShape9" type="CollisionShape" parent="."] -transform = Transform( 1, 0, 0, 0, 0.771436, 0.636307, 0, -0.636307, 0.771436, -5.03993, 0.255733, 1.26566 ) +transform = Transform( 1, 0, 0, 0, 0.855174, 0.51834, 0, -0.51834, 0.855174, -5.03993, 0.255733, 1.26566 ) shape = SubResource( 30 ) [node name="Ladder" parent="." instance=ExtResource( 5 )] diff --git a/godot/scenes/weapons/rockets.gd b/godot/scenes/weapons/rockets.gd index 56282e1..c519fd6 100644 --- a/godot/scenes/weapons/rockets.gd +++ b/godot/scenes/weapons/rockets.gd @@ -22,14 +22,14 @@ func attack1(): if cooldown_time <= 0.0 and ammo >= 1: ammo -= 1 cooldown_time = reload_time - rpc("add_rocket_to_scene", player.cam.global_transform.basis, get_tree().get_network_unique_id()) + rpc("add_rocket_to_scene", player.head.global_transform.basis, get_tree().get_network_unique_id()) remotesync func add_rocket_to_scene(dir, id): var rocket = preload("res://scenes/ballistics/Rocket.tscn").instance() world.get_node("BALLISTICS").add_child(rocket, true) rocket.shooter = player.name + " (" + world.players_info[player.get_network_master()][0] + ")" rocket.shooter_id = id - rocket.global_transform.origin = player.cam.global_transform.origin + rocket.global_transform.origin = player.head.global_transform.origin rocket.global_transform.basis = Basis(-1*dir.z, dir.y, dir.x) rocket.add_collision_exception_with(player) diff --git a/godot/scenes/worldprops/Runway.tscn b/godot/scenes/worldprops/Runway.tscn new file mode 100644 index 0000000..e827cd2 --- /dev/null +++ b/godot/scenes/worldprops/Runway.tscn @@ -0,0 +1,23 @@ +[gd_scene load_steps=5 format=2] + +[ext_resource path="res://textures/conc_slabs01_c.png" type="Texture" id=1] + +[sub_resource type="SpatialMaterial" id=1] +albedo_texture = ExtResource( 1 ) +uv1_scale = Vector3( 0.1, 0.1, 0.1 ) +uv1_triplanar = true + +[sub_resource type="CubeMesh" id=2] +material = SubResource( 1 ) +size = Vector3( 100, 5, 10 ) + +[sub_resource type="ConvexPolygonShape" id=3] +points = PoolVector3Array( -50, -2.5, -5, -50, 2.5, -5, 50, -2.5, -5, -50, -2.5, 5, -50, 2.5, 5, 50, 2.5, -5, 50, -2.5, 5, 50, 2.5, 5 ) + +[node name="Runway" type="StaticBody"] + +[node name="MeshInstance" type="MeshInstance" parent="."] +mesh = SubResource( 2 ) + +[node name="CollisionShape" type="CollisionShape" parent="."] +shape = SubResource( 3 ) |