diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-06-19 15:00:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-19 15:00:44 +0200 |
| commit | 30cbe28677f38a176e0ea8d77ed5abb7c85ed287 (patch) | |
| tree | d400e71450e8bdc1a00ea5796d619cf6bd5e8424 | |
| parent | d7af08aa95bbcd5fc83825908dbae0b8a8e65512 (diff) | |
| parent | fc8ad59af39b4436514820ed1e7444f3b94a0377 (diff) | |
Merge pull request #27310 from KoBeWi/angular_dank
Make angular_damp of new Area nodes match the global default
| -rw-r--r-- | scene/3d/area.cpp | 2 | ||||
| -rw-r--r-- | servers/physics/area_sw.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scene/3d/area.cpp b/scene/3d/area.cpp index 3557f0425c..4247266e3d 100644 --- a/scene/3d/area.cpp +++ b/scene/3d/area.cpp @@ -752,7 +752,7 @@ Area::Area() : gravity_is_point = false; gravity_distance_scale = 0; linear_damp = 0.1; - angular_damp = 1; + angular_damp = 0.1; priority = 0; monitoring = false; monitorable = false; diff --git a/servers/physics/area_sw.cpp b/servers/physics/area_sw.cpp index 9d68869bc2..ad3e40916d 100644 --- a/servers/physics/area_sw.cpp +++ b/servers/physics/area_sw.cpp @@ -250,7 +250,7 @@ AreaSW::AreaSW() : gravity_is_point = false; gravity_distance_scale = 0; point_attenuation = 1; - angular_damp = 1.0; + angular_damp = 0.1; linear_damp = 0.1; priority = 0; set_ray_pickable(false); |