diff options
author | Charles Krinke | 2007-10-31 04:18:34 +0000 |
---|---|---|
committer | Charles Krinke | 2007-10-31 04:18:34 +0000 |
commit | 33d6222e8dc40331e98c3549a040d3d206eed338 (patch) | |
tree | d5481827758cdfc7a9f44faf016706ed75bd9ca4 /OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs | |
parent | set svn:eol-style (diff) | |
download | opensim-SC_OLD-33d6222e8dc40331e98c3549a040d3d206eed338.zip opensim-SC_OLD-33d6222e8dc40331e98c3549a040d3d206eed338.tar.gz opensim-SC_OLD-33d6222e8dc40331e98c3549a040d3d206eed338.tar.bz2 opensim-SC_OLD-33d6222e8dc40331e98c3549a040d3d206eed338.tar.xz |
Thank you Teravus, very much, for a 'jump', 'crouch' and 'inertia' patch for all three physics plugins.
Diffstat (limited to 'OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs')
-rw-r--r-- | OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs index b412818..c516044 100644 --- a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs +++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs | |||
@@ -177,6 +177,7 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin | |||
177 | private PhysicsVector _velocity; | 177 | private PhysicsVector _velocity; |
178 | private PhysicsVector _acceleration; | 178 | private PhysicsVector _acceleration; |
179 | private bool flying; | 179 | private bool flying; |
180 | private bool iscolliding; | ||
180 | 181 | ||
181 | public BasicActor() | 182 | public BasicActor() |
182 | { | 183 | { |
@@ -191,6 +192,12 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin | |||
191 | set { flying = value; } | 192 | set { flying = value; } |
192 | } | 193 | } |
193 | 194 | ||
195 | public override bool IsColliding | ||
196 | { | ||
197 | get { return iscolliding; } | ||
198 | set { iscolliding = value; } | ||
199 | } | ||
200 | |||
194 | public override PhysicsVector Position | 201 | public override PhysicsVector Position |
195 | { | 202 | { |
196 | get { return _position; } | 203 | get { return _position; } |
@@ -239,4 +246,4 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin | |||
239 | { | 246 | { |
240 | } | 247 | } |
241 | } | 248 | } |
242 | } \ No newline at end of file | 249 | } |