diff options
author | Teravus Ovares | 2008-10-17 23:19:00 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-10-17 23:19:00 +0000 |
commit | 0916b38b8300c41f66c2f22e79c77f3c5f6f4cb7 (patch) | |
tree | 5cf1a9a56529525797ce8577ed1c49208a65ffd7 /OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | |
parent | * Remove mono warnings (diff) | |
download | opensim-SC-0916b38b8300c41f66c2f22e79c77f3c5f6f4cb7.zip opensim-SC-0916b38b8300c41f66c2f22e79c77f3c5f6f4cb7.tar.gz opensim-SC-0916b38b8300c41f66c2f22e79c77f3c5f6f4cb7.tar.bz2 opensim-SC-0916b38b8300c41f66c2f22e79c77f3c5f6f4cb7.tar.xz |
* Fix an over compensation for bounciness on flat Primitive
* Implement the linear impulse portion of llPushObject. We should have a lsl compatible implementation of that portion of the push. Angular.. well. still have yet to implement a torque accumulator.
* llPushObject respects the region and parcel settings for Restrict Push, it also respects GodMode as is defined in the LSL spec.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs index 23481c6..2cb7e43 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | |||
@@ -634,8 +634,9 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
634 | if (pushforce) | 634 | if (pushforce) |
635 | { | 635 | { |
636 | m_pidControllerActive = false; | 636 | m_pidControllerActive = false; |
637 | force *= 100f; | ||
637 | doForce(force); | 638 | doForce(force); |
638 | 639 | //System.Console.WriteLine("Push!"); | |
639 | //_target_velocity.X += force.X; | 640 | //_target_velocity.X += force.X; |
640 | // _target_velocity.Y += force.Y; | 641 | // _target_velocity.Y += force.Y; |
641 | //_target_velocity.Z += force.Z; | 642 | //_target_velocity.Z += force.Z; |