Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-27 | 1 | -13/+13 |
|\ | |||||
| * | minor: remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2010-06-25 | 1 | -13/+13 |
| | | |||||
* | | 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 | 1 | -7/+2 |
|\ \ | |||||
| * \ | Merge branch '0.6.9-post-fixes' into careminster | Melanie | 2010-03-06 | 1 | -1/+6 |
| |\ \ |/ / / | | _ | |||||
| * | Revolution is on the roll again! :) | Revolution | 2010-02-14 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | 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 | 1 | -0/+10 |
| | | | | | | | | associated methods. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2010-01-03 | 1 | -280/+282 |
|\ \ | |/ | |||||
| * | Formatting cleanup. Add copyright headers. | Jeff Ames | 2010-01-04 | 1 | -280/+282 |
| | | |||||
* | | Fix conflicts | Kitto Flora | 2009-12-22 | 1 | -1/+1 |
|\ \ | |||||
| * \ | Merge branch 'master' into careminster | Melanie | 2009-12-22 | 1 | -6/+9 |
| |\ \ | | |/ | |||||
| | * | Glue code for a couple of new LSL function implementations | Melanie | 2009-12-22 | 1 | -0/+9 |
| | | | |||||
* | | | Include ChOdePlugin | Kitto Flora | 2009-12-22 | 1 | -84/+24 |
|/ / | |||||
* | | 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-05 | 1 | -0/+3 |
|\ \ | |/ | |||||
| * | * Fixes the 10x10x10 hard physics limitation. (wierdly, you have to set ↵ | Teravus Ovares (Dan Olivares) | 2009-12-03 | 1 | -0/+3 |
| | | | | | | | | | | | | | | 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-23 | 1 | -3/+26 |
|\ \ | |/ | |||||
| * | * 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 | 1 | -3/+3 |
| | | |||||
* | | Fix merge conflicts | KittoFlora | 2009-11-16 | 1 | -7/+0 |
| | | |||||
* | | Merge branch 'careminster' into tests | KittoFlora | 2009-11-16 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2009-11-03 | 1 | -2/+2 |
| |\ | |||||
| | * | * Log progress messages when loading OAR files with a lot of assets | John Hurliman | 2009-10-29 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | * 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 | ||||
| * | | minor: remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2009-11-03 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'vehicles' into tests | KittoFlora | 2009-10-27 | 1 | -141/+163 |
|\ \ | |/ | | | | | | | | | | | Conflicts: OpenSim/Region/Physics/Manager/PhysicsActor.cs OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | ||||
| * | Experimental change of PhysicsVector to Vector3. Untested | John Hurliman | 2009-10-26 | 1 | -137/+132 |
| | | |||||
| * | No need to create dupe TriMeshData for ODE. A previous patch created a ↵ | Dan Lake | 2009-10-26 | 1 | -6/+14 |
| | | | | | | | | dictionary to store unique meshes in Meshmerizer based on creation params. This patch contains a dictionary to map each of those unique meshes to its ODE TriMeshData. This eliminated hundreds of megabytes of memory consumption in the unmanaged heap when there are lots of the same prim (roof tiles, bricks, siding, decks, chairs, etc). The objects do not need to be physical to benefit from this patch. | ||||
| * | * Moved Copyrights above the comments in ODEPrim and ODEDynamics so they're ↵ | Teravus Ovares (Dan Olivares) | 2009-10-22 | 1 | -14/+15 |
| | | | | | | | | consistent with the rest (and so chi11ken's auto copyright adding script doesn't duplicate the copyright. | ||||
| * | Commented out instrumentation in ODEPrim.cs | KittoFlora | 2009-10-22 | 1 | -0/+8 |
| | | |||||
* | | llRotLookAt Pt 2 | KittoFlora | 2009-10-27 | 1 | -21/+34 |
| | | |||||
* | | Add llRotLookat pt1. | KittoFlora | 2009-10-26 | 1 | -21/+62 |
| | | |||||
* | | Commented out instrumentation in ODEPrim.cs | KittoFlora | 2009-10-22 | 1 | -0/+8 |
|/ | |||||
* | Merge branch 'master' into vehicles | Melanie | 2009-10-19 | 1 | -2/+2 |
|\ | |||||
| * | Formatting cleanup. | Jeff Ames | 2009-10-19 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'master' into vehicles | Melanie | 2009-10-12 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Optimize ODE mesh by removing sleep. On a region with 100,000 prims and ODE ↵ | unknown | 2009-10-12 | 1 | -1/+1 |
| | | | | | | | | enabled, the first Heartbeat loop call to UpdatePhysics takes 20 minutes. 75% of that time is spent in this sleep. (100k prims * 10ms) | ||||
* | | Merge branch 'master' into vehicles | Melanie | 2009-10-05 | 1 | -7/+6 |
|\ \ | |/ | |||||
| * | Eliminate pinned Mesh data on managed heap by using IntPtrs to memory ↵ | Dan Lake | 2009-10-05 | 1 | -7/+6 |
| | | | | | | | | allocated on the unmanaged heap. This prevents fragmentation of the managed heap and the resulting stress on GC. A region with ~150,000 prims using ODE and Meshmerizer saw memory remain flat around 1.2GB as opposed to 1.5GB and continually growing due to pinned memory. This patch complements the unique mesh dictionary patch applied to Meshmerizer but is independent. The net effect is a 60-75% reduction in memory for our largest regions. | ||||
* | | Merge branch '0.6.7-post-fixes' into vehicles | Kitto Flora | 2009-09-30 | 1 | -14/+3 |
|\ \ | |/ | |||||
| * | Meshmerizer stores dictionary of unique Meshes keyed on construction ↵ | Dan Lake | 2009-09-24 | 1 | -14/+3 |
| | | | | | | | | | | | | parameters. CreateMesh() returns a Mesh from the dictionary or creates a new Mesh if it has not been created before. Meshes are never purged from the dictionary. The raw Mesh data is discarded once the memory is pinned for ODE use. All copies of the same prim/mesh use the same pinned memory. ONLY IMPLEMENTED AND TESTED WITH MESHMERIZER AND ODE Signed-off-by: dahlia <dahliaTrimble@gmailDotCom> | ||||
* | | Commit initial version of KittoFlora's vehicle changes | opensim | 2009-09-30 | 1 | -271/+323 |
|/ | |||||
* | Thank you, dslake, for a set of patches to improve OpenSim startup | Melanie | 2009-09-02 | 1 | -0/+5 |
| | | | | and idle performance. |