aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-07-287-488/+1171
|\
| * Remove the LandGeom checks in OdeScene - these are pointless since LandGeom i...Justin Clark-Casey (justincc)2012-07-271-4/+2
| * BulletSim: fix a recursive loop when fetching the mass of the root of a linkset.Robert Adams2012-07-262-4/+4
| * BulletSim: refactor all the linkset logic out of the prim classRobert Adams2012-07-264-235/+409
| * Add check so Ode does not try to simulate after it has been Dispose()'ed. Fix...Robert Adams2012-07-261-0/+9
| * BulletSim: remove unused, commented out code in BSConstraintRobert Adams2012-07-251-8/+0
| * BulletSim: fix line endings in newly added files (Is it DOS or is it UNIX? On...Robert Adams2012-07-252-301/+301
| * BulletSim: add parameters for setting linkset constraint factorsRobert Adams2012-07-252-17/+32
| * BulletSim: small change to use the pointer to the bullet object for zeroing f...Robert Adams2012-07-251-6/+5
| * BulletSim: Redo parameter specification so only one place hasRobert Adams2012-07-251-248/+378
| * BulletSim: Add C# classes for storing and tracking constraints.Robert Adams2012-07-252-0/+301
| * BulletSim: Move constraint tracking from C++ code to C# codeRobert Adams2012-07-252-18/+83
* | Merge branch 'master' into careminsterMelanie2012-07-253-96/+265
|\ \ | |/
| * BulletSim: change how prim mass is saved so it is always calculated but zero ...Robert Adams2012-07-231-20/+23
| * BulletSim: small optimizations for link and unlink codeRobert Adams2012-07-231-12/+8
| * BulletSim: add Dispose() code to free up resources and close log files.Robert Adams2012-07-231-0/+21
| * BulletSim: add all the new functions to BulletSimAPI.Robert Adams2012-07-232-6/+139
| * BulletSim: improve linking to add each link individually rather than rebuildi...Robert Adams2012-07-231-60/+76
* | Merge branch 'master' into careminsterMelanie2012-07-235-242/+533
|\ \ | |/
| * BulletSim: add reference to OpenSim.Region.CoreModules in BSScene.cs attempti...Robert Adams2012-07-201-1/+2
| * BulletSim: more detail logging for vehicle and general physics debugging.Robert Adams2012-07-204-75/+244
| * BulletSim: fix compile errors from last commit. Clean up passing of physics s...Robert Adams2012-07-202-15/+14
| * BulletSim: Add very detailed logging to BSDynamics for vehicle debuggingRobert Adams2012-07-203-45/+146
| * BulletSim: Add PID variables to physical scene. Not PIDing yet, but soon.Robert Adams2012-07-203-101/+97
| * BulletSim: Add detailed and voluminous debug logging that is enabledRobert Adams2012-07-202-40/+65
* | Update ubitMesh primMesher with new Dahlia version on core ( reckick gitUbitUmarov2012-07-191-143/+183
* | Merge branch 'avination' into ubitworkUbitUmarov2012-07-1712-570/+1267
|\ \
| * \ Merge branch 'avination' into careminsterMelanie2012-07-166-136/+84
| |\ \
| * \ \ Merge branch 'master' into careminsterMelanie2012-07-161-143/+183
| |\ \ \ | | | |/ | | |/|
| | * | update PrimMesher.cs to dll version r72 which fixes some path errors in slice...dahlia2012-07-131-143/+183
| * | | Merge branch 'avination' into careminsterMelanie2012-07-115-62/+140
| |\ \ \
| * \ \ \ Merge branch 'master' into careminsterMelanie2012-07-114-58/+107
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Clean up collision reporting code so they are properly passed toRobert Adams2012-07-064-58/+107
| * | | | Merge branch 'avination' into careminsterMelanie2012-07-061-11/+38
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into careminsterMelanie2012-07-011-2/+3
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Remove some mono compiler warningsJustin Clark-Casey (justincc)2012-06-301-2/+3
| * | | | | Merge branch 'master' into careminsterMelanie2012-06-292-16/+16
| |\ \ \ \ \ | | |/ / / /
| | * | | | Move update of the final optional ODE total frame stat inside the OdeLock rat...Justin Clark-Casey (justincc)2012-06-291-3/+3
| | * | | | refactor: rename _collisionEventPrim to m_collisionEventActors and _collision...Justin Clark-Casey (justincc)2012-06-291-12/+12
| | * | | | Fix a regression where we stopped removing avatars from collision event repor...Justin Clark-Casey (justincc)2012-06-291-1/+1
| * | | | | Merge branch 'avination' into careminsterMelanie2012-06-061-3/+3
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-06-021-60/+256
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Add optional total avatars, total prims and active prims stats to ODE plugin.Justin Clark-Casey (justincc)2012-06-011-0/+21
| | * | | | | If OdeScene.Near() returns no collision contacts, then exit as early as possi...Justin Clark-Casey (justincc)2012-06-011-0/+4
| | * | | | | Add optional stat for the other collision time per frame not spent in ODE nat...Justin Clark-Casey (justincc)2012-06-011-1/+16
| | * | | | | Add avatar forces calculation, prim force and raycasting per frame millisecon...Justin Clark-Casey (justincc)2012-06-011-7/+46
| | * | | | | Collection optional avatar and prim taint frame millisecond timesJustin Clark-Casey (justincc)2012-06-011-7/+36
| | * | | | | Remove recent optional native collision frame milliseconds statJustin Clark-Casey (justincc)2012-06-011-13/+1
| | * | | | | Add optional stat that records milliseconds spent notifying collision listene...Justin Clark-Casey (justincc)2012-06-011-0/+14
| | * | | | | Add avatar and prim update milliseconds per frame optional statsJustin Clark-Casey (justincc)2012-06-011-7/+31