Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-27 | 2 | -14/+14 |
|\ | |||||
| * | minor: remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2010-06-25 | 2 | -14/+14 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-19 | 1 | -0/+1 |
|\ \ | |/ | |||||
| * | Hunting for the problem in #4777 | Diva Canto | 2010-06-19 | 1 | -0/+1 |
| | | |||||
| * | Reverting my last two commits, putting back Melanie's exception handler. ↵ | Diva Canto | 2010-06-19 | 1 | -1/+10 |
| | | | | | | | | Doesn't solve #4777. | ||||
| * | Reinstated the behavior of AddPrimShape *exactly* as it was as of December. ↵ | Diva Canto | 2010-06-19 | 1 | -10/+1 |
| | | | | | | | | Trying to fix mantis #4777 | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-18 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Remove an error in meshing error reporting. Now doesn't double-bomb | Melanie | 2010-06-18 | 1 | -1/+1 |
| | | | | | | | | anymore on a bad sculpt | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-12 | 1 | -1/+12 |
|\ \ | |/ | |||||
| * | Log and eat sculpt meshing exceptions caused by bad jp2 data. | Melanie | 2010-06-12 | 1 | -1/+12 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-15 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | * Added a better check to the SimianGrid connectors to test if they are ↵ | John Hurliman | 2010-03-12 | 1 | -2/+2 |
| | | | | | | | | | | | | enabled or not. This method should work equally well with standalone or robust mode * Applying #4602 from Misterblu to add collision detection to BulletDotNET | ||||
* | | Resolved merge | Kitto Flora | 2010-03-12 | 3 | -78/+391 |
|\ \ | |||||
| * \ | Merge branch '0.6.9-post-fixes' into careminster | Melanie | 2010-03-06 | 3 | -65/+398 |
| |\ \ |/ / / | | _ | |||||
| * | Formatting cleanup. | Jeff Ames | 2010-02-15 | 1 | -25/+25 |
| | | |||||
| * | Revolution is on the roll again! :) | Revolution | 2010-02-14 | 3 | -39/+372 |
| | | | | | | | | | | | | | | | | Fixes: Undo, T-pose of others on login, modifiedBulletX works again, feet now stand on the ground instead of in the ground, adds checks to CombatModule. Adds: Redo, Land Undo, checks to agentUpdate (so one can not fall off of a region), more vehicle parts. Finishes almost all of LSL (1 function left, 2 events). Direct flames and kudos to Revolution, please Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | | Merge branch 'master' into careminster | Melanie | 2010-02-08 | 1 | -0/+2 |
|\ \ | |/ | |||||
| * | Applying patch #4534 by Misterblue to fix ODE physics stickiness | John Hurliman | 2010-02-04 | 1 | -0/+2 |
| | | |||||
* | | Add glue for llSetVehicleFlags(), llRemoveVehicleFlags(). ChODE: Add ↵ | Kitto Flora | 2010-01-21 | 2 | -0/+20 |
| | | | | | | | | associated methods. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2010-01-03 | 4 | -515/+509 |
|\ \ | |/ | |||||
| * | Formatting cleanup. Add copyright headers. | Jeff Ames | 2010-01-04 | 4 | -515/+509 |
| | | |||||
* | | Fix conflicts | Kitto Flora | 2009-12-22 | 2 | -2/+1 |
|\ \ | |||||
| * \ | Merge branch 'master' into careminster | Melanie | 2009-12-22 | 2 | -8/+9 |
| |\ \ | | |/ | |||||
| | * | Glue code for a couple of new LSL function implementations | Melanie | 2009-12-22 | 2 | -0/+18 |
| | | | |||||
* | | | Include ChOdePlugin | Kitto Flora | 2009-12-22 | 3 | -118/+31 |
|/ / | |||||
* | | 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 | 1 | -2/+8 |
|\ \ | |/ | |||||
| * | * Adds Normal to the fields returned by the Physics Raycaster | Teravus Ovares (Dan Olivares) | 2009-12-05 | 1 | -2/+8 |
| | | | | | | | | | | | | | | | | * 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 | 1 | -7/+0 |
| | | |||||
* | | Merge branch 'careminster' into tests | KittoFlora | 2009-11-16 | 4 | -87/+109 |
|\ \ | |/ | |||||
| * | 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 | ||||
| * | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2009-11-03 | 3 | -72/+94 |
| |\ | |||||
| | * | * Log progress messages when loading OAR files with a lot of assets | John Hurliman | 2009-10-29 | 3 | -64/+71 |
| | | | | | | | | | | | | | | | * 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 |
| | | |