Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge branch 'master' into bigmerge | Melanie | 2011-10-26 | 1 | -23/+24 | |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs | |||||
| * | Remove unused fields from CollisionEventUpdate | Justin Clark-Casey (justincc) | 2011-10-25 | 1 | -24/+6 | |
| | | ||||||
| * | Get rid of the pointless null checks on collision listeners. Add warning ↵ | Justin Clark-Casey (justincc) | 2011-10-25 | 1 | -0/+6 | |
| | | | | | | | | about synchronicity for PhysicsActor.OnCollisionUpdate event doc | |||||
| * | When sending object collision updates, don't null out and recreate the ↵ | Justin Clark-Casey (justincc) | 2011-10-25 | 1 | -0/+5 | |
| | | | | | | | | CollisionEventUpdate() if the number of collisions falls to zero. Reuse the existing one instead. | |||||
| * | For ScenePresence collision events, instead of creating a new ↵ | Justin Clark-Casey (justincc) | 2011-10-25 | 1 | -0/+8 | |
| | | | | | | | | | | | | CollisionEventsThisFrame every time we need to send some new ones, reuse the existing one instead. This assumes that the listener is using the data synchronously, which is currently the case. | |||||
* | | Merge commit '03202ada2918c0c0837e8de50e3a0436e4407c91' into bigmerge | Melanie | 2011-10-25 | 1 | -0/+5 | |
|\ \ | |/ | ||||||
| * | Store scene identifier passed in to OdeScene for later debug messages | Justin Clark-Casey (justincc) | 2011-10-18 | 1 | -0/+5 | |
| | | ||||||
* | | Merge commit 'f2132329a358db2c66c29501d35ef54eae8d6eed' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+0 | |
|\ \ | |/ | ||||||
| * | refactor: make methods that do not need to be public in ODE private or ↵ | Justin Clark-Casey (justincc) | 2011-10-15 | 1 | -1/+0 | |
| | | | | | | | | internal to aid code reading/analysis. Remove some unused method arguments | |||||
* | | Merge commit '77c65951e06c1d309f2bc8f6d2451b2b9a82c9df' into bigmerge | Melanie | 2011-10-25 | 2 | -88/+125 | |
|\ \ | |/ | ||||||
| * | Extract NullPhysicsScene from PhysicsScene to improve code readability | Justin Clark-Casey (justincc) | 2011-10-14 | 2 | -88/+125 | |
| | | ||||||
* | | Merge commit '20da04fd0c909a00c0cdc2585f242e95c868801a' into bigmerge | Melanie | 2011-10-25 | 1 | -2/+23 | |
|\ \ | |/ | ||||||
| * | More method doc and formatting changes. Makes DestroyOdeStructures() private | Justin Clark-Casey (justincc) | 2011-10-13 | 1 | -2/+23 | |
| | | ||||||
* | | Merge commit '227db07f2ff8a1ba840a0d3018bb242a34d6038f' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+22 | |
|\ \ | |/ | ||||||
| * | refactor: move 3x copy/pasted ode structure removal code in ODECharacter ↵ | Justin Clark-Casey (justincc) | 2011-10-13 | 1 | -1/+22 | |
| | | | | | | | | | | | | into a DestroyOdeStructures() method also adds some method doc | |||||
* | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 3 | -12/+111 | |
|\ \ | |/ | ||||||
| * | Merge branch 'master' into bulletsim | Mic Bowman | 2011-08-29 | 1 | -0/+11 | |
| |\ | ||||||
| | * | Add level of detail specification to optionally reduce the number of ↵ | Robert Adams | 2011-08-28 | 1 | -0/+11 | |
| | | | | | | | | | | | | | | | | | | vertices in generated prim meshes Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | |||||
| * | | BulletSim: add runtime setting of physics parameters. Update default values. | Robert Adams | 2011-08-18 | 1 | -0/+73 | |
| |/ | ||||||
| * | refactor: centralize prim geom removal code from four places to one | Justin Clark-Casey (justincc) | 2011-08-01 | 1 | -0/+4 | |
| | | ||||||
| * | Removed unused AddPrimShape methods in PhysicsScene caused by merge conflicts | Dan Lake | 2011-07-20 | 1 | -14/+0 | |
| | | ||||||
| * | Fix some local id issues in physics glue | root | 2011-07-15 | 1 | -12/+7 | |
| | | ||||||
| * | Port implementation of llCastRay() from Aurora. | Justin Clark-Casey (justincc) | 2011-07-12 | 1 | -1/+23 | |
| | | | | | | | | I haven't been able to test this since the viewer won't parse the llCastRay() function. Maybe some activation cap is missing. Could wait until it is activated by default in the viewer. | |||||
* | | Fox some local id issues in physics glue | Melanie | 2011-07-15 | 1 | -12/+7 | |
| | | ||||||
* | | Revert "Add localid support to ch0de properly" | Melanie | 2011-07-15 | 1 | -7/+12 | |
| | | | | | | | | This reverts commit bb402d0d95c934fbcd8b1c03e228ec1d0a14f14d. | |||||
* | | Add localid support to ch0de properly | Tom | 2011-07-15 | 1 | -12/+7 | |
|/ | ||||||
* | minor: commented out log lines for future use and very small code tidy | Justin Clark-Casey (justincc) | 2011-07-08 | 1 | -1/+4 | |
| | ||||||
* | Add localID to physical object creation functions. | Mic Bowman | 2011-06-15 | 2 | -1/+21 | |
| | ||||||
* | adding configurable j2kDecodeCache path | BlueWall | 2010-09-26 | 2 | -3/+4 | |
| | | | | | | | | allowing the decoded sculpt map cache path to be defined in the configuration files. Use DecodedSculpMapPath in the [Startup] section to set the path. The default is still ./bin/j2kDecodeCache | |||||
* | Revolution is on the roll again! :) | Revolution | 2010-02-14 | 2 | -2/+16 | |
| | | | | | | | | 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> | |||||
* | Formatting cleanup. Add copyright headers. | Jeff Ames | 2010-01-04 | 1 | -1/+1 | |
| | ||||||
* | Glue code for a couple of new LSL function implementations | Melanie | 2009-12-22 | 1 | -2/+12 | |
| | ||||||
* | * Adds Normal to the fields returned by the Physics Raycaster | Teravus Ovares (Dan Olivares) | 2009-12-05 | 1 | -2/+2 | |
| | | | | | | | | * 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 | |||||
* | * Log progress messages when loading OAR files with a lot of assets | John Hurliman | 2009-10-29 | 1 | -8/+21 | |
| | | | | | * 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 | |||||
* | Move the calculation of time dilation from the scene to the physics engine. ↵ | John Hurliman | 2009-10-27 | 1 | -0/+5 | |
| | | | | 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 | |||||
* | Experimental change of PhysicsVector to Vector3. Untested | John Hurliman | 2009-10-26 | 7 | -82/+85 | |
| | ||||||
* | Changing Scene.ForEachClient to use the synchronous for loop instead of ↵ | John Hurliman | 2009-10-25 | 1 | -0/+3 | |
| | | | | | | | | | | Parallel. This is quite possibly the source of some deadlocking, and at the very least the synchronous version gives better stack traces * Lock the LLUDPClient RTO math * Add a helper function for backing off the RTO, and follow the optional advice in RFC 2988 to clear existing SRTT and RTTVAR values during a backoff * Removing the unused PrimitiveBaseShape.SculptImage parameter * Improved performance of SceneObjectPart instantiation * ZeroMesher now drops SculptData bytes like Meshmerizer, to allow the texture data to be GCed * Improved typecasting speed in MySQLLegacyRegionData.BuildShape() * Improved the instantiation of PrimitiveBaseShape | |||||
* | Formatting cleanup. | Jeff Ames | 2009-10-19 | 1 | -1/+1 | |
| | ||||||
* | Eliminate pinned Mesh data on managed heap by using IntPtrs to memory ↵ | Dan Lake | 2009-10-05 | 1 | -0/+2 | |
| | | | | 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. | |||||
* | Formatting cleanup. | Jeff Ames | 2009-10-01 | 1 | -2/+2 | |
| | ||||||
* | Formatting cleanup. | Jeff Ames | 2009-10-01 | 2 | -2/+2 | |
| | ||||||
* | * One last attempt to get the bordercrossing/primcrossing/attachmentcrossing ↵ | Teravus Ovares (Dan Olivares) | 2009-09-02 | 1 | -0/+5 | |
| | | | | | | right in the new border framework. * This also contains some inactive preliminary code for disconnecting combined regions that will be used to make one root region a virtual region of a new root region. | |||||
* | Merge branch 'master' of ssh://MyConnection/var/git/opensim | Teravus Ovares (Dan Olivares) | 2009-08-26 | 1 | -0/+5 | |
|\ | ||||||
| * | Add copy constructor to PhysicsVector. | Jeff Ames | 2009-08-26 | 1 | -0/+5 | |
| | | ||||||
* | | * Some Physics Scene Changes to prepare for larger regions | Teravus Ovares (Dan Olivares) | 2009-08-18 | 1 | -1/+1 | |
| | | ||||||
* | | * part one of adding physics combining | Teravus Ovares (Dan Olivares) | 2009-08-15 | 1 | -0/+10 | |
|/ | ||||||
* | Formatting cleanup. | Jeff Ames | 2009-07-23 | 1 | -1/+1 | |
| | ||||||
* | * Created a way that the OpenSimulator scene can ask the physics scene to do ↵ | Teravus Ovares | 2009-07-19 | 1 | -0/+36 | |
| | | | | | | | | | a raycast test safely. * Test for prim obstructions between the avatar and camera. If there are obstructions, inform the client to move the camera closer. This makes it so that walls and objects don't obstruct your view while you're moving around. Try walking inside a hollowed tori. You'll see how much easier it is now because your camera automatically moves closer so you can still see. * Created a way to know if the user's camera is alt + cammed or just following the avatar. * Changes IClientAPI interface by adding SendCameraConstraint(Vector4 CameraConstraint) | |||||
* | Minor: Change OpenSim to OpenSimulator in older copyright headers and ↵ | Jeff Ames | 2009-06-01 | 10 | -10/+10 | |
| | | | | LICENSE.txt. | |||||
* | * Upped version number to 0.6.5 | lbsa71 | 2009-05-25 | 1 | -1/+1 | |
| |