aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-05-302-2/+5
|\
| * BulletSim: don't zero motion when changing vehicle type.Robert Adams2013-05-281-1/+4
| * BulletSim: default using mesh asset hulls to 'true'. This means that,Robert Adams2013-05-271-2/+2
| * BulletSim: enable GImpact shape for prims with cuts. Include DLLs and SOsRobert Adams2013-05-261-1/+1
* | Merge branch 'master' into careminsterMelanie2013-05-254-5/+16
|\ \ | |/
| * Meshmerizer: remember to add the copied hull verts to the list of hulls.Robert Adams2013-05-241-0/+1
| * BulletSim: add VehicleInertiaFactor to allow modifying inertia.Robert Adams2013-05-242-1/+5
| * BulletSim: properly set mesh hash key in use tracking structure.Robert Adams2013-05-241-1/+4
| * Meshmerizer: add INI parameter to enable DEBUG mesh detail logging.Robert Adams2013-05-241-3/+6
* | Merge commit '440905ad14d4261df9da0fd2ce7e20a350982af1' into careminsterMelanie2013-05-251-53/+83
|\ \ | |/
| * change a hull debugging message to Debug instead of Infodahlia2013-05-241-1/+1
| * correct some errors in decoding of mesh asset convex decomposition datadahlia2013-05-241-53/+83
* | Merge branch 'master' into careminsterMelanie2013-05-243-154/+241
|\ \ | |/
| * add decoder for bounding convex hulldahlia2013-05-231-4/+53
| * Add DEBUG level logging in Meshmerizer for mesh parsing. There isRobert Adams2013-05-231-2/+25
| * BulletSim: add locking around Meshmerizer use to eliminate possible raceRobert Adams2013-05-231-145/+157
| * BulletSim: correct errors caused by misspelled INI parameter spec.Robert Adams2013-05-222-4/+7
* | Merge branch 'master' into careminsterMelanie2013-05-2410-49/+352
|\ \ | |/
| * BulletSim: add code to experimentally use asset hull data.Robert Adams2013-05-222-4/+54
| * BulletSim: fix problem with walking up stairs that are orientedRobert Adams2013-05-221-2/+9
| * Revert "BulletSim: add code to experimentally use asset hull data."Robert Adams2013-05-212-54/+4
| * BulletSim: add code to experimentally use asset hull data.Robert Adams2013-05-212-4/+54
| * BulletSim: add gImpact shape type. Add logic to use gImpact shapeRobert Adams2013-05-217-14/+167
| * Merge branch 'master' of git://opensimulator.org/git/opensimRobert Adams2013-05-211-21/+110
| |\
| | * fix error in hull point indexingdahlia2013-05-181-1/+1
| | * remove duplicate hull scalingdahlia2013-05-181-3/+3
| | * add prototype code to decode convex hulls from mesh assets. Please do not use...dahlia2013-05-181-21/+110
| * | BulletSim: fix BulletSim crashing if there is no [BulletSim] sectionRobert Adams2013-05-172-8/+12
| |/
* | Merge branch 'master' into careminsterMelanie2013-05-165-9/+53
|\ \ | |/
| * fall back to using a display mesh for physics proxy if no physics_mesh entry ...dahlia2013-05-151-0/+4
| * BulletSim: Fix for mantis 6487, also minor adjustment to fix flying while you...Vegaslon2013-05-141-2/+5
| * BulletSim: add a lock to try and catch a native shape creation/destructionRobert Adams2013-05-131-2/+7
| * BulletSim: add adjustment for avatar capsule height scaling. MakesRobert Adams2013-05-132-4/+32
| * BulletSim: use heightmap terrain when using BulletXNA.Robert Adams2013-05-132-1/+5
* | Merge branch 'master' into careminsterMelanie2013-05-111-2/+6
|\ \ | |/
| * BulletSim: fix CPU loop that occurs when any 'degenerate' sculptieRobert Adams2013-05-101-2/+6
* | Merge branch 'master' into careminsterMelanie2013-05-083-21/+54
|\ \ | |/
| * Bulletsim: and the rotational friction.Vegaslon2013-05-071-3/+5
| * BulletSim: Another way to create vehicle framed friction.Vegaslon2013-05-071-3/+5
| * BulletSim: normalize quaternian rotations when building compound linksets.Robert Adams2013-05-061-7/+7
| * BulletSim: properly free references to simple convex hull shapes. Didn'tRobert Adams2013-05-061-8/+37
* | Merge branch 'master' into careminsterMelanie2013-05-071-6/+6
|\ \ | |/
| * BulletSim: apply linear and angular friction in vehicle coordinatesRobert Adams2013-05-061-6/+6
* | Merge branch 'master' into careminsterMelanie2013-05-0611-268/+169
|\ \ | |/
| * BulletSim: remove friction calcuation from BSMotor and move linear andRobert Adams2013-05-067-67/+47
| * BulletSim: simplify parameter specification by reducing the number ofRobert Adams2013-05-062-191/+94
| * BulletSim: extend BSActorLockAxis to allow locking linear movement inRobert Adams2013-05-063-10/+28
* | Merge branch 'master' into careminsterMelanie2013-05-0430-1638/+1353
|\ \ | |/
| * BulletSim: zero vehicle motion when changing vehicle type.Robert Adams2013-05-036-26/+18
| * BulletSim: prims with no cuts created with single convex hull shape.Robert Adams2013-05-024-2/+99