aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-10-264-18/+26
|\
| * BulletSim: fix problem with avatars sinking into the ground.Robert Adams2012-10-234-15/+23
| * BulletSim: minor change to insure avatar body recreation when shape changes.Robert Adams2012-10-231-3/+3
* | Merge branch 'master' into careminsterMelanie2012-10-2310-374/+510
|\ \ | |/
| * BulletSim: remove chatty debug message.Robert Adams2012-10-222-2/+2
| * BulletSim: fix bug that caused error (and a crash on 32 bit Linux) when mesh ...Robert Adams2012-10-228-35/+51
| * BulletSim: fix problem of not rebuilding shape by clearing last rebuild faile...Robert Adams2012-10-222-2/+8
| * BulletSim: remove trailing spaces to make git happy.Robert Adams2012-10-228-36/+36
| * BulletSim: encorporate UBit's suggestion to save a copy of mesh raw data.Robert Adams2012-10-221-2/+1
| * BulletSim: Create LinkSet abstract class and sparate constraint based linkset...Robert Adams2012-10-223-319/+434
* | Merge branch 'master' into careminsterMelanie2012-10-231-12/+14
|\ \ | |/
| * minor: remove unnecessary bit of method doc from OdePrim.BadMeshAssetCollideB...Justin Clark-Casey (justincc)2012-10-201-3/+0
| * Fix minor issues from commit 28483150Justin Clark-Casey (justincc)2012-10-201-12/+17
* | Merge branch 'master' into careminsterMelanie2012-10-207-406/+623
|\ \ | |/
| * BulletSim: add asset fetching so BulletSim works with new physics asset handl...Robert Adams2012-10-194-165/+240
| * BulletSim: reorder avatar collision checking to eliminate double collision_end.Robert Adams2012-10-196-35/+43
| * BulletSim: change nonimal physics frame rate to 55 to give same numbers as ODE.Robert Adams2012-10-196-52/+57
| * BulletSim: remove code in ShapeCollection that hinted at shape sharing.Robert Adams2012-10-195-161/+138
| * BulletSim: Fix small problems with last patch: BSScene.World properly initial...Robert Adams2012-10-193-11/+6
| * BulletSim: Update BSCharacter to use API2 interface.Robert Adams2012-10-196-93/+250
* | Merge branch 'master' into careminsterMelanie2012-10-191-6/+11
|\ \ | |/
| * [UNTESTED] core Ode: let broken mesh physical prims collide with land asUbitUmarov2012-10-191-6/+11
* | Merge branch 'master' into careminsterMelanie2012-10-191-21/+97
|\ \ | |/
| * [UNTESTED] core Ode: stop trying to load a broken asset. Make brokenUbitUmarov2012-10-191-21/+97
| * missing changed fileUbitUmarov2012-10-181-1/+1
| * i update core ode plugin and make it load is meshs (i hope)UbitUmarov2012-10-182-2/+51
* | Merge branch 'avination' into careminsterMelanie2012-10-1817-1163/+2271
|\ \
| * | coment a debug warningUbitUmarov2012-10-161-1/+1
| * | fixesUbitUmarov2012-10-163-67/+82
| * | missing fileUbitUmarov2012-10-131-0/+2
| * | add mesh cache expire on region startup. Expires will be relative toUbitUmarov2012-10-134-3/+88
| * | retouch mesh idsUbitUmarov2012-10-132-11/+21
| * | missing file (again)UbitUmarov2012-10-131-4/+8
| * | longer meshs identification keys, so first part on disk cache is it's asset idUbitUmarov2012-10-131-1/+3
| * | missing fileUbitUmarov2012-10-121-0/+6
| * | [TEST] disk cache meshsUbitUmarov2012-10-123-282/+532
| * | commit the right files!UbitUmarov2012-10-122-5737/+4763
| * | remove some more debug spam on odeUbitUmarov2012-10-122-4766/+5735
| * | add some quaternion normalizations to keep errors under controlUbitUmarov2012-10-101-0/+3
| * | debugUbitUmarov2012-10-101-0/+6
| * | fix debug :)UbitUmarov2012-10-091-1/+1
| * | debug...UbitUmarov2012-10-091-0/+5
| * | debug...UbitUmarov2012-10-091-2/+5
| * | avoid crashing so debug is seenUbitUmarov2012-10-091-0/+1
| * | another debug msgUbitUmarov2012-10-091-0/+22
| * | force allocation of mesh data on creation ( messy code version )UbitUmarov2012-10-099-12/+45
| * | temporary debug codeUbitUmarov2012-10-091-0/+19
| * | fire a extra terseupdate when stopping (like in loosing physics). In someUbitUmarov2012-10-091-0/+3
| * | Change ray to land colision range limitation so it has no impact on otherUbitUmarov2012-10-091-6/+8
| * | move terrain geom to own ode space. Limit range on raycast if includesUbitUmarov2012-10-094-83/+229