Sara/wave-survival
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: Sara:3638d55fe008004cd5b8dee6b0b8137b95b6709a
Branches Tags
Sara:development
..
compare: Sara:e6af6557e0e2b7b17b37ceaba5d60e8ff5ed4aaa
Branches Tags
Sara:development

No commits in common. "3638d55fe008004cd5b8dee6b0b8137b95b6709a" and "e6af6557e0e2b7b17b37ceaba5d60e8ff5ed4aaa" have entirely different histories.
3638d55fe0 ... e6af6557e0

2 changed files with 5 additions and 9 deletions
Show stats Expand all files Collapse all files

8
modules/wave_survival/player_camera.h
View file

@ -31,11 +31,11 @@ private:
bool was_running{ false }; bool was_running{ false };
double run_bob_time{ 0.0 }; double run_bob_time{ 0.0 };
double run_bob_amplitude_weapon{ 0.025 }; double run_bob_amplitude_weapon{ 0.025 };
double run_bob_amplitude_camera{ 0.045 }; double run_bob_amplitude_camera{ 0.125 };
double run_bob_frequency{ 12.0 }; double run_bob_frequency{ 14.0 };
double run_bob_blend_out{ 0.2 }; double run_bob_blend_out{ 0.2 };
double weapon_lead_limit{ Math::PI * 0.009 }; double weapon_lead_limit{ Math::PI * 0.0075 };
double weapon_lead_speed{ 0.12 }; double weapon_lead_speed{ 0.15 };
Vector3 weapon_lead_rotation{ 0, 0, 0 }; Vector3 weapon_lead_rotation{ 0, 0, 0 };
}; };

6
project/maps/industrial_area_map.tscn
View file

@ -1,4 +1,4 @@
[gd_scene load_steps=33 format=4 uid="uid://dllho5nkq2smw"] [gd_scene load_steps=32 format=4 uid="uid://dllho5nkq2smw"]
[ext_resource type="PackedScene" uid="uid://eu0yil2ylm0q" path="res://objects/props/box_car_fully_enclosed.tscn" id="1_ti8jp"] [ext_resource type="PackedScene" uid="uid://eu0yil2ylm0q" path="res://objects/props/box_car_fully_enclosed.tscn" id="1_ti8jp"]
[ext_resource type="PackedScene" uid="uid://hf7yyyiep30l" path="res://objects/props/box_car_enclosed.tscn" id="2_cfpv2"] [ext_resource type="PackedScene" uid="uid://hf7yyyiep30l" path="res://objects/props/box_car_enclosed.tscn" id="2_cfpv2"]
@ -11,7 +11,6 @@
[ext_resource type="PackedScene" uid="uid://cjlu5s3jafxml" path="res://objects/props/shot_water_tower.tscn" id="8_mlp7g"] [ext_resource type="PackedScene" uid="uid://cjlu5s3jafxml" path="res://objects/props/shot_water_tower.tscn" id="8_mlp7g"]
[ext_resource type="PackedScene" uid="uid://22j1too6rheq" path="res://objects/props/sand_bag_half_circle.tscn" id="9_ug5on"] [ext_resource type="PackedScene" uid="uid://22j1too6rheq" path="res://objects/props/sand_bag_half_circle.tscn" id="9_ug5on"]
[ext_resource type="PackedScene" uid="uid://cclghy01gblif" path="res://objects/pickups/demo_pack_pickup.tscn" id="11_foo0w"] [ext_resource type="PackedScene" uid="uid://cclghy01gblif" path="res://objects/pickups/demo_pack_pickup.tscn" id="11_foo0w"]
[ext_resource type="PackedScene" uid="uid://5hg5eirw7v8n" path="res://objects/units/unit_4_wretched.tscn" id="13_muhwu"]
[ext_resource type="PackedScene" uid="uid://crml35t12hx2h" path="res://objects/pickups/weapon_pickup.tscn" id="13_qwrat"] [ext_resource type="PackedScene" uid="uid://crml35t12hx2h" path="res://objects/pickups/weapon_pickup.tscn" id="13_qwrat"]
[sub_resource type="BoxShape3D" id="BoxShape3D_plog7"] [sub_resource type="BoxShape3D" id="BoxShape3D_plog7"]
@ -846,6 +845,3 @@ use_collision = true
collision_layer = 19 collision_layer = 19
collision_mask = 0 collision_mask = 0
size = Vector3(5.7617188, 4.102051, 0.33398438) size = Vector3(5.7617188, 4.102051, 0.33398438)
[node name="NpcUnit" parent="." instance=ExtResource("13_muhwu")]
transform = Transform3D(-0.30087224, 0, 0.9536645, 0, 1, 0, -0.9536645, 0, -0.30087224, -13.835193, 0, -4.918686)