Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Kitto Flora | 2010-01-03 | 7 | -524/+518 | |
|\ \ | ||||||
| * \ | Merge branch 'master' into careminster | Melanie | 2010-01-03 | 7 | -524/+518 | |
| |\ \ | | |/ | ||||||
| | * | Formatting cleanup. Add copyright headers. | Jeff Ames | 2010-01-04 | 7 | -524/+518 | |
| | | | ||||||
* | | | Vehicle Linear parameter adjustments | Kitto Flora | 2009-12-31 | 3 | -38/+75 | |
|/ / | ||||||
* | | Recover out-of-region objects during db load. | Kitto Flora | 2009-12-24 | 1 | -1/+3 | |
| | | ||||||
* | | Fix conflicts | Kitto Flora | 2009-12-22 | 6 | -8/+20 | |
|\ \ | ||||||
| * \ | Merge branch 'master' into careminster | Melanie | 2009-12-22 | 6 | -14/+28 | |
| |\ \ | | |/ | ||||||
| | * | Glue code for a couple of new LSL function implementations | Melanie | 2009-12-22 | 10 | -3/+182 | |
| | | | ||||||
* | | | Include ChOdePlugin | Kitto Flora | 2009-12-22 | 13 | -118/+10524 | |
|/ / | ||||||
* | | Fix GetWorldRotation(), and a host of related Sit fixes. | Kitto Flora | 2009-12-17 | 1 | -1/+5 | |
| | | ||||||
* | | Merge branch 'master' into careminster | Melanie | 2009-12-12 | 1 | -1/+8 | |
|\ \ | |/ | ||||||
| * | * Commit some sit code that's commented out for now. | Teravus Ovares (Dan Olivares) | 2009-12-08 | 1 | -1/+8 | |
| | | ||||||
* | | Merge branch 'master' into careminster | Melanie | 2009-12-06 | 2 | -4/+10 | |
|\ \ | |/ | ||||||
| * | * Adds Normal to the fields returned by the Physics Raycaster | Teravus Ovares (Dan Olivares) | 2009-12-05 | 2 | -4/+10 | |
| | | | | | | | | | | | | | | | | * Fixes recognizing when a sit target is and isn't set. * * 1. Vector3.Zero. * * 2. Orientation: x:0, y:0, z:0, w:1 - ZERO_ROTATION * * (or) Orientation: x:0, y:0, z:0, w:0 - Invalid Quaternion * * (or) Orientation: x:0, y:0, z:1, w:0 - Invalid mapping, some older objects still exist with it | |||||
* | | Merge branch 'master' into careminster | Melanie | 2009-12-05 | 3 | -1/+9 | |
|\ \ | |/ | ||||||
| * | * Fixes mantis 4416. Animator is dereferenced on logout | Teravus Ovares (Dan Olivares) | 2009-12-05 | 1 | -1/+4 | |
| | | ||||||
| * | * Fixes the 10x10x10 hard physics limitation. (wierdly, you have to set ↵ | Teravus Ovares (Dan Olivares) | 2009-12-03 | 2 | -0/+5 | |
| | | | | | | | | | | | | | | this for each region in your Regions.ini[PhysicalPrimMax = 10(default)]) * Adds a configurable maximum object mass before the mass is clamped. Default is 10000.01. Configurable by changing maximum_mass_object in the [ODEPhysicsSettings] section. * Clamping the mass is important for limiting the amount of CPU an object can consume in physics calculations. Too high, and the object overcomes restitution forces by gravity alone. This generates more collisions potentially leading to 'deep think'. | |||||
* | | Merge branch 'master' into careminster | Melanie | 2009-11-27 | 1 | -1/+4 | |
|\ \ | |/ | ||||||
| * | * Fixes a case of d.BodyEnable with IntPtr.Zero passed as the parameter in ↵ | Teravus Ovares (Dan Olivares) | 2009-11-26 | 1 | -1/+4 | |
| | | | | | | | | linkset where EnableBody was called and the body is immediately disabled. The previous functionality assumed that a body was received in EnableBody but.. in some cases, it wasn't. | |||||
* | | Merge branch 'master' into careminster | Melanie | 2009-11-24 | 1 | -1/+1 | |
|\ \ | |/ | ||||||
| * | * Resolves mantis 4390 http://opensimulator.org/mantis/view.php?id=4390 | Teravus Ovares (Dan Olivares) | 2009-11-23 | 1 | -1/+1 | |
| | | ||||||
* | | Merge branch 'master' into careminster | Melanie | 2009-11-23 | 2 | -4/+38 | |
|\ \ | |/ | ||||||
| * | * Adds a test for if the collision is at the bottom of the capsule on ↵ | Teravus Ovares (Dan Olivares) | 2009-11-22 | 1 | -1/+12 | |
| | | | | | | | | avatar. This prevents the 'double jump' capability that's been occurring for ages when avatar collide with prim on the side. | |||||
| * | * Added missing lock to m_forcelist when AddForce is called. When a user ↵ | Teravus Ovares (Dan Olivares) | 2009-11-22 | 1 | -3/+26 | |
| | | | | | | | | | | | | dragged a prim, in some cases, it would corrupt the datatype in memory and throw spurious IndexOutOfRangeExceptions. * Physics a situation that causes physics to spew redline messages to the console forever. | |||||
* | | Merge branch 'master' into careminster | Melanie | 2009-11-21 | 1 | -1/+12 | |
|\ \ | |/ | ||||||
| * | * Fixes the second of two terse update issues. Physical objects should react ↵ | Teravus Ovares (Dan Olivares) | 2009-11-21 | 1 | -0/+3 | |
| | | | | | | | | normally again. | |||||
| * | * Fixes one of two terse update issues. There's still one left, but this ↵ | Teravus Ovares (Dan Olivares) | 2009-11-21 | 1 | -1/+9 | |
| | | | | | | | | one fixes the situation where the object on the server is moving but no updates are being sent. | |||||
* | | Clean up messages in ODE | KittoFlora | 2009-11-19 | 2 | -4/+4 | |
| | | ||||||
* | | Fix merge conflicts | KittoFlora | 2009-11-16 | 2 | -10/+3 | |
| | | ||||||
* | | Merge branch 'careminster' into tests | KittoFlora | 2009-11-16 | 10 | -939/+195 | |
|\ \ | |/ | ||||||
| * | clean up some cruft | dahlia | 2009-11-11 | 1 | -12/+2 | |
| | | ||||||
| * | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2009-11-11 | 1 | -1/+1 | |
| | | ||||||
| * | add an overload to _SculptMesh for meshing from a list of coordinates | dahlia | 2009-11-09 | 1 | -3/+46 | |
| | | | | | | | | add conditional compilation for System.Drawing dependency | |||||
| * | Following various discussions on irc and in the OpenSim dev OSGrid meeting ↵ | Justin Clark-Casey (justincc) | 2009-11-09 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | last week, change av_capsule_tilted to false by default This appears to now give better ODE physics response (less sinking into the ground, etc.) Please change it back if this is actually a bad idea for some reason | |||||
| * | minor: remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2009-11-09 | 2 | -2/+4 | |
| | | ||||||
| * | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2009-11-03 | 7 | -918/+139 | |
| |\ | ||||||
| | * | Delete depricated extrusion methods and redirect to universal extrude method. | dahlia | 2009-11-02 | 1 | -833/+10 | |
| | | | | | | | | | | | | Sync with PrimMesher.cs r47 on forge. | |||||
| | * | * Log progress messages when loading OAR files with a lot of assets | John Hurliman | 2009-10-29 | 4 | -72/+92 | |
| | | | | | | | | | | | | | | | * Change the PhysicsCollision callback for objects to send full contact point information. This will be used to calculate the collision plane for avatars * Send the physics engine velocity in terse updates, not the current force being applied to the avatar. This should fix several issues including crouching through the floor and walking through walls | |||||
| | * | Always send a time dilation of 1.0 while we debug rubberbanding issues | John Hurliman | 2009-10-28 | 1 | -1/+2 | |
| | | | ||||||
| | * | Limit physics time dilation to 1.0 | John Hurliman | 2009-10-28 | 1 | -1/+1 | |
| | | | ||||||
| | * | * Reduce the velocity tolerance on sending terse updates to avoid slowly ↵ | John Hurliman | 2009-10-28 | 1 | -3/+10 | |
| | | | | | | | | | | | | | | | | | | drifting prims/avatars * Added contacts_per_collision to the ODE config section. This allows you to reduce the maximum number of contact points ODE will generate per collision and reduce the size of the array that stores contact structures | |||||
| | * | Fixed a bad check on velocity in the ODE near() callback (it was only ↵ | John Hurliman | 2009-10-28 | 1 | -3/+3 | |
| | | | | | | | | | | | | checking for velocity in certain directions, and was calling the get_Velocity() function three times) | |||||
| | * | Switching sculpty from CSJ2K back to OpenJPEG for now until more kinks are ↵ | John Hurliman | 2009-10-28 | 1 | -2/+6 | |
| | | | | | | | | | | | | ironed out | |||||
| | * | Print the exception message when CSJ2K decoding fails for sculpty textures | John Hurliman | 2009-10-28 | 1 | -3/+3 | |
| | | | ||||||
| | * | Move the calculation of time dilation from the scene to the physics engine. ↵ | John Hurliman | 2009-10-27 | 2 | -2/+14 | |
| | | | | | | | | | | | | The scene is still the one reporting dilation so this does not break the API or remove flexibility, but it gets the calculation happening in the right place for the normal OpenSim usage. The actual calculation of physics time dilation probably needs tweaking | |||||
| * | | minor: remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2009-11-03 | 3 | -17/+17 | |
| |/ | ||||||
* | | Merge branch 'vehicles' into tests | KittoFlora | 2009-10-27 | 25 | -811/+857 | |
|\ \ | |/ | | | | | | | | | | | Conflicts: OpenSim/Region/Physics/Manager/PhysicsActor.cs OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||||
| * | * Switched from OpenJPEG to CSJ2K in Meshmerizer | John Hurliman | 2009-10-26 | 1 | -3/+1 | |
| | | | | | | | | * Tested the previous patch and found no regressions | |||||
| * | Experimental change of PhysicsVector to Vector3. Untested | John Hurliman | 2009-10-26 | 25 | -800/+794 | |
| | | ||||||
| * | Added calls to GC.AddMemoryPressure() when unmanaged memory is allocated for ↵ | John Hurliman | 2009-10-26 | 1 | -0/+6 | |
| | | | | | | | | ODE (helps the GC make better scheduling choices), and a call to GC.Collect() right before logins are enabled for a region. Although this doesn't change actual memory usage, it improves the reported usage from OpenSim and the operating system |