aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/OdePlugin (follow)
Commit message (Expand)AuthorAgeFilesLines
* Revert "Merge master into teravuswork", it should have been avination, not ma...teravus2012-11-153-36/+10
* Merge branch 'master' into careminsterMelanie2012-10-311-1/+7
|\
| * Log warning if mesh/sculpt asset couldn't be found by ODEPrim.MeshAssetReceiv...Justin Clark-Casey (justincc)2012-10-301-0/+6
| * Add asset != null check to ODEPrim.MeshAssetReceived instead of throwing exce...Justin Clark-Casey (justincc)2012-10-301-1/+1
* | Merge branch 'master' into careminsterMelanie2012-10-301-3/+2
|\ \ | |/
| * Make MeshAssetReceived private.Justin Clark-Casey (justincc)2012-10-301-1/+1
| * correct ODEPrim.MeshAssetReveived -> MeshAssetReceivedJustin Clark-Casey (justincc)2012-10-301-3/+2
* | Merge branch 'avination' into careminsterMelanie2012-10-281-7/+13
|\ \
| * | [UNTESTED] core Ode: let broken mesh physical prims collide with land asUbitUmarov2012-10-191-6/+11
| * | [UNTESTED] core Ode: stop trying to load a broken asset. Make brokenUbitUmarov2012-10-191-21/+97
* | | 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-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
| * | i update core ode plugin and make it load is meshs (i hope)UbitUmarov2012-10-182-2/+51
* | | Merge branch 'avination' into careminsterMelanie2012-10-183-13/+55
|\ \ \ | | |/ | |/|
| * | i update core ode plugin and make it load is meshs (i hope)UbitUmarov2012-10-073-24/+118
* | | Merge branch 'master' into careminsterMelanie2012-10-122-3/+16
|\ \ \ | | |/ | |/|
| * | av_av_collisions_off = false OdePhysics Settings in OpenSimDefaults.ini - No...teravus2012-10-091-2/+9
| * | Add config option to plant avatar where they are reducing avatar avatar 'push...teravus2012-10-092-3/+9
* | | Merge branch 'master' into careminsterMelanie2012-10-042-8/+46
|\ \ \ | |/ /
| * | Soliciting for comments on smoothness of physics objects for this build.teravus2012-10-032-8/+46
* | | Merge branch 'master' into careminsterMelanie2012-10-031-5/+19
|\ \ \ | |/ / | | / | |/ |/|
| * I propose that 0.5m/step change for linear velocity is too big of a change to...teravus2012-10-031-1/+15
| * Minor Modification, switch /2 to 0.5f in ODEPrim.Velocityteravus2012-10-021-4/+4
* | Merge branch 'master' into careminsterMelanie2012-07-281-4/+11
|\ \ | |/
| * Remove the LandGeom checks in OdeScene - these are pointless since LandGeom i...Justin Clark-Casey (justincc)2012-07-271-4/+2
| * Add check so Ode does not try to simulate after it has been Dispose()'ed. Fix...Robert Adams2012-07-261-0/+9
* | 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 '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
generated by cgit v1.1 at 2024-12-27 00:47:48 +0000