aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
| | * | | | | Add option native step frame ms statJustin Clark-Casey (justincc)2012-06-011-9/+21
| | * | | | | Add total ODE frame time optional stat, as a sanity check on the main scene p...Justin Clark-Casey (justincc)2012-06-011-7/+21
| | * | | | | Break down native ODE collision frame time stat into native space collision a...Justin Clark-Casey (justincc)2012-06-011-4/+22
| | * | | | | Rename new collision stats to 'contacts' - there are/can be multiple contacts...Justin Clark-Casey (justincc)2012-06-011-6/+6
| | * | | | | Stop adding an unnecessary duplicate _perloopcontact if the avatar is standin...Justin Clark-Casey (justincc)2012-06-011-9/+4
| | * | | | | minor: comment out currently unused OdeScene.sCollisionDataJustin Clark-Casey (justincc)2012-06-011-9/+9
| | * | | | | Add ODE avatar and prim collision numbers if extra stats collection is enabled.Justin Clark-Casey (justincc)2012-06-011-5/+34
| | * | | | | Fix OdeScene.GetTopColliders() to return the top 25 colliders rather than the...Justin Clark-Casey (justincc)2012-06-011-19/+13
| * | | | | | Merge branch 'avination' into careminsterMelanie2012-05-312-4/+10
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-05-312-10/+143
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Add an optional mechanism for physics modules to collect and return arbitrary...Justin Clark-Casey (justincc)2012-05-312-10/+143
| * | | | | | | Merge branch 'avination'Melanie2012-05-294-70/+134
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'avination' into careminsterMelanie2012-05-274-154/+178
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-05-191-2/+8
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | * | | | | | | | refactor: move EventQueueGet path generation into common method. Rename some...Justin Clark-Casey (justincc)2012-05-181-1/+1
| | * | | | | | | | Don't eagerly clear frame collision events when physics actors subscribe and ...Justin Clark-Casey (justincc)2012-05-171-2/+8
| * | | | | | | | | Merge branch 'avination' into careminsterMelanie2012-05-152-11/+68
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'avination' into careminsterMelanie2012-05-133-24/+69
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'avination' into careminsterMelanie2012-05-133-106/+163
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'avination' into careminsterMelanie2012-05-081-11/+17
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'avination' into careminsterMelanie2012-05-072-21/+108
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'avination' into careminsterMelanie2012-05-051-2/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'avination'Melanie2012-05-031-5/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'avination'Melanie2012-05-023-112/+123
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'avination'Melanie2012-04-294-219/+314
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \