aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-03-227-20/+213
|\ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
| * BulletSim: change 'degenerate mesh' message from Error to Debug because thereRobert Adams2013-03-191-1/+1
| | | | | | | | | | seem to be lots of sculpties with this problem while the condition really doesn't change region operation.
| * BulletSim: code to generate a higher resolution terrain mesh. ParameterRobert Adams2013-03-194-18/+189
| | | | | | | | | | TerrainMeshMagnification controls number of vertices generated per heightmap point. Default is 3.
| * BulletSim: add terrain contact processing threshold parameter. Initialize ↵Robert Adams2013-03-194-1/+23
| | | | | | | | contact processing threshold for static object as well as mesh terrain.
* | Merge commit '464201b41d5f5fdd7c88ab5e95dd7b6fbae6d766' into careminsterMelanie2013-03-192-16/+22
|\ \ | |/
| * BulletSim: add INI parameter for angular banking timescale fudge parameter.Robert Adams2013-03-162-7/+12
| |
| * BulletSim: Working Implementation of Angular Banking for Vehicles (Not SL ↵Vegaslon2013-03-161-16/+17
| | | | | | | | | | | | Grade, Other features when implemented should slow it down for now be Strong with Vertical Angular attraction setting and conservative with Angular Velocity on X axis) Signed-off-by: Robert Adams <Robert.Adams@intel.com>
* | Merge branch 'master' into careminsterMelanie2013-03-151-1/+1
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Framework/Servers/BaseOpenSimServer.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * BulletSim: Tweak vertical angular attraction to remove double ↵Vegaslon2013-03-151-1/+1
| | | | | | | | | | | | VehicleOrientation application fixing the problem with the vertical attractor pushing vehicles nose first into ground when tilted on side. Signed-off-by: Robert Adams <Robert.Adams@intel.com>
* | Merge branch 'avination' into careminsterMelanie2013-03-131-2/+2
|\ \
| * | Spot fix the interpenetration issue. Thanks, Ter.Melanie2013-03-121-2/+2
| | |
| * | Rename "Bounce" to "Restitution" in PhysicsActor as well. It appears theseMelanie2013-02-071-1/+1
| | | | | | | | | | | | values are not even used.
* | | Merge branch 'master' into careminsterMelanie2013-03-114-23/+117
|\ \ \ | | |/ | |/|
| * | BulletSim: remove the ability for avatars to fly off the edge ofRobert Adams2013-03-094-23/+117
| | | | | | | | | | | | | | | regions when there are no region neighbors. Add some terrain location processing routines to support above.
* | | Merge branch 'master' into careminsterMelanie2013-03-081-2/+7
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
| * | Add regression test for presence crossing between regions on the same simulator.Justin Clark-Casey (justincc)2013-03-061-2/+7
| | | | | | | | | | | | Unlike a much earlier commented out version of this test, this is done in synchronous mode.
* | | Merge branch 'master' into careminsterMelanie2013-03-014-15/+63
|\ \ \ | |/ /
| * | BulletSim: more things into the TODO list.Robert Adams2013-03-011-1/+6
| | |
| * | BulletSim: add parameters, code cleanup around checking and enforcingRobert Adams2013-03-013-14/+57
| | | | | | | | | | | | maximum velocity and angular velocity values for prims.
* | | Merge branch 'master' into careminsterMelanie2013-02-272-8/+12
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
| * | BulletSim: fix crash around race condition when a mesh asset cannotRobert Adams2013-02-262-8/+12
| | | | | | | | | | | | | | | be fetched. Update TODO list.
* | | Merge branch 'master' into careminsterMelanie2013-02-261-4/+6
|\ \ \ | |/ /
| * | BulletSim: tweeks to make avatar jump work better.Robert Adams2013-02-251-4/+6
| | |
* | | Merge branch 'master' into careminsterMelanie2013-02-2217-494/+826
|\ \ \ | |/ /
| * | BulletSim: add OutOfBounds logic and some position sanity checkingRobert Adams2013-02-215-33/+68
| | | | | | | | | | | | to eliminate some of the "cannot find terrain height" warning messages.
| * | Deleted all AssemblyFileVersion directivesDiva Canto2013-02-193-3/+3
| | |
| * | BulletSim: experimental lock axis code using constraints. Not enabledRobert Adams2013-02-172-22/+74
| | | | | | | | | | | | by default. Like more debugging is needed.
| * | BulletSim: add calls for creating all the different Bullet constraint types.Robert Adams2013-02-175-47/+338
| | | | | | | | | | | | | | | Updated the DLLs and SOs and code for BulletXNA to create the types. All the detailed control calls are not all in place yet.
| * | BulletSim: rework parameter setting for different types of valuesRobert Adams2013-02-175-394/+348
| | | | | | | | | | | | (like vectors or quaternions).
| * | BulletSim: fix physical object appearing to slowly float off whenRobert Adams2013-02-161-1/+1
| | | | | | | | | | | | they stop moving.
* | | Merge branch 'master' into careminsterMelanie2013-02-139-141/+304
|\ \ \ | |/ /
| * | BulletSim: fix density since the simulator/viewer track density in aRobert Adams2013-02-127-25/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | funny unit that is 100 times real density (default 1000). Fix avatar drifting slowly when stationary flying. Fix for physical prims getting corrected for being under terrain when it was just its geometric center that was below terrain. Add PreUpdatePropertyAction allowing plugable modifiction of phys parameters returned from Bullet. Fix an exception setting GravityMultiplier on initialization. Update DLLs and SOs for good measure (no functional change).
| * | BulletSim: More work on center-of-mass. Remove linksetinfo and rely on ↵Robert Adams2013-02-128-124/+162
| | | | | | | | | | | | simulator to update info.
* | | Merge branch 'master' into careminsterMelanie2013-02-1012-255/+446
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations
| * | BulletSim: add parameter to set global contact breaking threshold. Update ↵Robert Adams2013-02-082-0/+7
| | | | | | | | | | | | DLLs and SOs for setting same.
| * | BulletSim: Change BSCharacter to use new base Density and FrictionRobert Adams2013-02-082-16/+12
| | | | | | | | | | | | variables rather than own local varaibles.
| * | BulletSim: fix avatar bobbing or jiggling while stationary flying.Robert Adams2013-02-085-18/+25
| | | | | | | | | | | | Various comments and debugging message mods.
| * | BulletSim: include the linkage to the layered prim implementation. Separate ↵Robert Adams2013-02-088-225/+109
| | | | | | | | | | | | layers for physical (vs simulator) location displacement and linksets.
| * | BulletSim: reclass BSPrim into layers so linkset and physical world ↵Robert Adams2013-02-082-0/+297
| | | | | | | | | | | | displacement is implemented as overlay classes rather than if statements scattered about.
* | | Merge branch 'master' into careminsterMelanie2013-02-084-36/+106
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
| * | BulletSim: Adapt BulletSim to the newer physical properties. ViewerRobert Adams2013-02-072-30/+28
| | | | | | | | | | | | dialog setting of friction, restitution, ... working.
| * | BulletSim: fix exceptions caused by setting physical properties before the ↵Robert Adams2013-02-071-5/+10
| | | | | | | | | | | | prim body is initialized.
| * | BulletSim: add user setting of friction, density and restitution.Robert Adams2013-02-073-27/+94
| | |
| * | Add some more code from Avination. This changes physics actor stuff aroundMelanie2013-02-072-3/+13
| | | | | | | | | | | | to work with the new params. Not actually plumbed just yet.
| * | Revert "Add plumbing for physics properties to get to the physics engine."Melanie2013-02-071-5/+0
| | | | | | | | | | | | This reverts commit c658fa1c0dd83f23c66ccfedb12e8ab02ff01d0a.
| * | Add plumbing for physics properties to get to the physics engine.Robert Adams2013-02-071-0/+5
| | | | | | | | | | | | Addition of entries to PhysicsActor and setting code in SceneObjectPart.
* | | Merge branch 'master' into careminsterMelanie2013-02-073-29/+52
|\ \ \ | |/ / | | | | | | | | | Conflicts: bin/HttpServer_OpenSim.dll
| * | Change passed PhysicsParameter value from float to the more general string valueRobert Adams2013-02-073-29/+52
| | |
* | | Merge branch 'master' into careminsterMelanie2013-02-073-12/+25
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
| * | BulletSim: set removing zero width triangles in meshes to be enabled by ↵Robert Adams2013-02-062-1/+2
| | | | | | | | | | | | default. This should fix the invisible barrier in sculptie doorways bug.