aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-11-3012-516/+865
|\ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs OpenSim/Region/Physics/Meshing/Meshmerizer.cs
| * BulletSim: fix boats floating low by removing LIMIT_MOTOR_UP flag from ↵Robert Adams2012-11-281-3/+15
| | | | | | | | TYPE_BOAT definition.
| * BulletSim: move GetWaterLevelAtXYZ from BSScene to BSPhysTerrain.Robert Adams2012-11-287-22/+63
| |
| * Stop logging spurious asset data for {0} is zero length error for sculpts/meshJustin Clark-Casey (justincc)2012-11-282-1/+9
| | | | | | | | | | | | | | | | ODEPrim, for instance, always hits this code path twice at the moment Firstly before any sculpt data has been loaded (hence the spurious message) Secondly when any sculpt data has been loaded or failed to load (when the message would be valid). Hence comment this out and rely on the message in ODEPrim.MeshAssetReceived() instead (though this is not ideal since it requires all physics plugins to copy/paste similar code).
| * BulletSim: reorganize linear movement routine into separate subroutines ↵Robert Adams2012-11-271-58/+79
| | | | | | | | enabling external calibration routines and unit tests.
| * BulletSim: fix terrain mesh generation for problem with regions that have ↵Robert Adams2012-11-271-6/+16
| | | | | | | | unequal edge heights. Thanks UBit.
| * BulletSim: reorganize angular movement routine into separate subroutines ↵Robert Adams2012-11-271-95/+114
| | | | | | | | enabling external calibration routines and unit testing.
| * BulletSim: implementation of vertical attraction motor.Robert Adams2012-11-271-41/+62
| |
| * BulletSim: add 'infinite' timescale that does not reduce motor target or ↵Robert Adams2012-11-271-10/+27
| | | | | | | | friction.
| * BulletSim: increase vehicle stability by suppressing Bullet's update to ↵Robert Adams2012-11-264-59/+26
| | | | | | | | angular velocity.
| * BulletSim: use m_angularMotor to do the basic movement. Add the setting of ↵Robert Adams2012-11-251-60/+64
| | | | | | | | same. Rename the angular forces and add comments to match MoveAngular to the form of MoveLinear.
| * BulletSim: up the vehicle angular damping to 0.95. Still trying to overcome ↵Robert Adams2012-11-251-2/+2
| | | | | | | | the movement added by Bullet.
| * BulletSim: organize MoveLinear code for understandability. Make ↵Robert Adams2012-11-251-89/+40
| | | | | | | | LIMIT_MOTOR_UP contribution a velocity and not a force.
| * BulletSim: add ToString override to BSVMotor.Robert Adams2012-11-251-1/+6
| |
| * BulletSim: add BSVMotor as BSDynamics linear motor.Robert Adams2012-11-252-27/+74
| | | | | | | | | | | | | | | | | | | | | | Properly limit *_MOTOR_DECAY_TIMESCALE to 120 as per specs. Invode BSDynamics.Refresh() when vehicle type is changed. Previously the vehicle properties weren't getting set because the physical properties were set before the vehicle type was set. Add a "use name" to BSMotors for identification while debugging. Correct current and target confusion in BSVMotor design. Rename CurrentValueReductionTimescale to FrictionTimescale. Event more detailed logging.
| * BulletSim: clean up TODO list. It is kept somewhere wlse that should be more ↵Robert Adams2012-11-252-18/+17
| | | | | | | | public. Add error logging for the detail log writer so a message is output when it cannot write to the specified logging directory. Modify friction defaults to be closer to ODE's values. Add new collision margin and vehicle angular damping parameters.
| * BulletSim: small change to add position correction force with AddForce ↵Robert Adams2012-11-252-16/+22
| | | | | | | | rather than just storing it in the variable
| * BulletSim: complete vector motor. Correct line endings.Robert Adams2012-11-251-104/+129
| |
| * BulletSim: add terrain collision margin and vehicle angular dampingRobert Adams2012-11-251-0/+7
| | | | | | | | | | parameters to the parameter block. New API call for setting collision margin.
| * BulletSim: add parameter for terrain collision margin.Robert Adams2012-11-253-54/+45
| | | | | | | | Add locking around unlikely but possible race conditions on terrain list.
| * BulletSim: Add tables and initialization for different attributes for ↵Robert Adams2012-11-252-0/+198
| | | | | | | | different materials. For the moment, the per material tables are not used.
* | Merge branch 'master' into careminsterMelanie2012-11-251-1/+2
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
| * Consistenly make NUnit test cases inherit from OpenSimTestCase which ↵Justin Clark-Casey (justincc)2012-11-241-1/+2
| | | | | | | | automatically turns off any logging enabled between tests
* | Merge branch 'master' into careminsterMelanie2012-11-2211-54/+54
|\ \ | |/
| * Rename BulletSim's PhysicsShapeType to BSPhysicsShapeType because itMelanie2012-11-2211-54/+54
| | | | | | | | conflicts with PhysicsShape type defined in later libOMV
* | Merge branch 'master' into careminsterMelanie2012-11-2212-321/+713
|\ \ | |/
| * BulletSim: Make avatar capsule so it is not circular.Robert Adams2012-11-216-21/+39
| | | | | | | | | | | | | | | | | | Simple attempt to make avatars better shaped. Replace parameter 'avatarCapsuleRadius' with 'avatarCapsuleWidth' and 'avatarCapsuleDepth'. More tweeking to avatar height calculation. A little better but short avatar's feet are above the terrain and tall avatar's feet are a little below the ground.
| * BulletSim: Properly position mesh terrain on creation (fixes terrain not ↵Robert Adams2012-11-212-76/+44
| | | | | | | | appearing to be working). Centralize terrain shape creation logic. Remove very chatty detail log messages.
| * BulletSim: add terrainImplementation parameter with default to Mesh.Robert Adams2012-11-213-5/+46
| |
| * BulletSim: fix line endings to be all Linux style (windows style keeps ↵Robert Adams2012-11-212-454/+454
| | | | | | | | creeping in)
| * BulletSim: enablement and debugging of mesh terrain.Robert Adams2012-11-214-36/+253
| |
| * BulletSim: pull heightmap implementation out of the terrain manager so a ↵Robert Adams2012-11-214-181/+327
| | | | | | | | mesh terrain can be implemented.
| * BulletSim: rename SHAPE_AVATAR to SHAPE_CAPSULE with the eye to eventually ↵Robert Adams2012-11-214-8/+8
| | | | | | | | having mesh avatars.
| * BulletSim: uplevel FixedShapeKey out of ShapeData structure (since it is ↵Robert Adams2012-11-213-20/+22
| | | | | | | | getting simplified out of existance someday) and update all the references to same.
| * BulletSim: uplevel PhysicsShapeType out of ShapeData structure (since it is ↵Robert Adams2012-11-219-66/+67
| | | | | | | | getting simplified out of existance someday) and update all the references to that enum.
| * BulletSim: change PositionSanityCheck to apply a force to correct position ↵Robert Adams2012-11-212-33/+30
| | | | | | | | corrections (below ground and floating).
| * BulletSim: tweek avatar capsule parameters so avatar feet don't go below ↵Robert Adams2012-11-212-8/+10
| | | | | | | | ground. This solves the bouncing, short avatar problem (Mantis 6403).
* | Merge branch 'master' into careminsterMelanie2012-11-196-352/+220
|\ \ | |/
| * BulletSim: Use base class constructors for initialization of BSShape and ↵Robert Adams2012-11-184-216/+214
| | | | | | | | other classes.
| * BulletSim: fix the problem with flying being disabled when crossing region ↵Robert Adams2012-11-181-2/+6
| | | | | | | | boundries.
| * BulletSim: remove the obsolete interface to the Bullet code. Update ↵Robert Adams2012-11-181-134/+0
| | | | | | | | BulletSim libraries with code stripped of the obsolete code.
* | Merge branch 'avination' into careminsterMelanie2012-11-171-2/+2
|\ \
| * | add debug position on bad primmesh errorUbitUmarov2012-11-021-2/+2
| | |
* | | Merge branch 'master' into careminsterMelanie2012-11-157-9/+75
|\ \ \ | | |/ | |/|
| * | Added AssemblyInfos to every dll in the OpenSim.Region namespace.Diva Canto2012-11-146-4/+70
| | |
| * | Updated all existing AssemblyVersions's to 0.7.5.*. Many DLLs still don't ↵Diva Canto2012-11-135-5/+5
| | | | | | | | | | | | have an AssemblyInfo file.
* | | Merge branch 'master' into careminsterMelanie2012-11-091-1/+15
|\ \ \ | |/ /
| * | ODECharacter overrides TargetVelocity. No change to existing behaviorDan Lake2012-11-081-1/+15
| | |
* | | Merge branch 'master' into careminsterMelanie2012-11-0811-105/+593
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
| * | BulletSim: add skeleton classes for shape objectification. This will ↵Robert Adams2012-11-071-0/+213
| | | | | | | | | | | | eventually replace all the if's and switches in ShapeCollection with polymorphism.