aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-04-1017-815/+1403
|\ | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLAssetData.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
| * BulletSim: fixing problems with llMoveToTarget. Not all fixed yet.Robert Adams2013-04-093-6/+18
| |
| * BulletSim: some formatting changes.Robert Adams2013-04-091-10/+17
| |
| * Another algorithm for AngularVerticalAttraction. This one Takes into account ↵Vegaslon2013-04-091-0/+23
| | | | | | | | | | | | all rotations before it and makes the corrections more close to the time that sl does. Signed-off-by: Robert Adams <Robert.Adams@intel.com>
| * BulletSim: add Bullet HACD library invocation. Turned off by default as notRobert Adams2013-04-093-94/+183
| | | | | | | | totally debugged. Updated DLLs and SOs with more debugged HACD library code.
| * BulletSim: fix problem where large sets of mega-regions weren't registeringRobert Adams2013-04-091-3/+3
| | | | | | | | all the terrain with the base region.
| * BulletSim: moving comments around. No functional change.Robert Adams2013-04-083-10/+11
| |
| * BulletSim: clean up actor code so routines use the same coding pattern.Robert Adams2013-04-0810-123/+137
| | | | | | | | Fix a few enabling problems.
| * BulletSim: complete movement of physical object action code out of theRobert Adams2013-04-0811-636/+1078
| | | | | | | | | | physical object and into actors for setForce, setTorque, hover, lock axis and avatar move.
* | Merge branch 'master' into careminsterMelanie2013-04-0214-214/+529
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * BulletSim: create axis lock constraint with proper orientation andRobert Adams2013-04-021-4/+2
| | | | | | | | enable axis lock functionality.
| * BulletSim: update unmanaged API for HACD parameter passing. Bullet HACDRobert Adams2013-04-013-6/+20
| | | | | | | | | | mesh to hull conversion calls in place but code not working. Update BulletSim DLLs and SOs for new API and HACD code.
| * BulletSim: rearrange mega-region terrain code to make the thread flowRobert Adams2013-04-011-15/+18
| | | | | | | | a little clearer.
| * BulletSim: stop an avatar from moving if standing on a stationaryRobert Adams2013-03-311-1/+8
| | | | | | | | | | | | object. This will stop avatars from sliding down steep terrains or objects while still allowing an avatar to be moved if standing on a moving object.
| * BulletSim: not quite functional axis lock code.Robert Adams2013-03-315-35/+43
| |
| * BulletSim: start the renaming of local variables to m_ form to match the ↵Robert Adams2013-03-311-23/+23
| | | | | | | | OpenSim coding conventions.
| * BulletSim: fix line endings in BSActor*Robert Adams2013-03-312-291/+302
| |
| * BulletSim: convert BSDynamic to a BSActor and change BSPrim to setRobert Adams2013-03-315-112/+149
| | | | | | | | up the vehicle actor.
| * BulletSim: Add physical 'actors' that operate on the physical object.Robert Adams2013-03-314-74/+311
| | | | | | | | Add first 'actor' for locked axis.
* | Merge commit '6a9630d2bdc27ed702936f4c44e6978f728a9ef0' into careminsterMelanie2013-03-295-43/+64
|\ \ | |/
| * BulletSim: fix race condition when creating very large mega-regions.Robert Adams2013-03-285-22/+35
| | | | | | | | | | | | | | | | The symptom was exceptions while creating physical terrain. Reduce default terrain mesh magnification to 2 from 3 because the higher resolution uses a lot of memory and doesn't solve the terrain smoothness for vehicles. Added comments here and there and improved some debugging log messages.
| * BulletSim: tweaks to terrain boundry computation. No functional changes.Robert Adams2013-03-281-21/+29
| |
* | Merge branch 'master' into careminsterMelanie2013-03-271-52/+64
|\ \ | |/
| * BulletSim: prevent asset fetching loop when the fetched asset fails to mesh.Robert Adams2013-03-261-52/+64
| | | | | | | | | | | | | | Check for the case where the fetched mesh asset fails meshing (degenerate triangles or no physical mesh). In this case, the asset is marked 'failed' and BulletSim doesn't keep trying to fetch over-and-over trying to get a good asset.
* | Merge branch 'master' into careminsterMelanie2013-03-265-32/+158
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
| * BulletSim: new algorithm for vertical attraction which uses quaternionRobert Adams2013-03-251-3/+45
| | | | | | | | | | arithmetic to compute the shortest path between the current tilt and vertical.
| * BulletSim: small tweaks and formatting in the parameter fetching code.Robert Adams2013-03-251-5/+16
| |
| * BulletSim: fix possible race condition where an prim's asset can be ↵Robert Adams2013-03-253-11/+24
| | | | | | | | requested quicker than the asset fetcher returns and thus falsely reporting that an asset was not fetched and defaulting the assset to a bounding box.
| * BulletSim: parameterize C# HACD hull creation. Add feature of reducing max ↵Robert Adams2013-03-252-14/+74
| | | | | | | | hull count for simple (non-cut prims) meshes.
* | 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.