aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-07-181-1/+0
|\
| * minor: remove some mono compiler warnings in OdePluginJustin Clark-Casey (justincc)2013-07-081-1/+0
* | Merge branch 'master' into careminsterMelanie2012-11-301-0/+5
|\ \ | |/
| * Stop logging spurious asset data for {0} is zero length error for sculpts/meshJustin Clark-Casey (justincc)2012-11-281-0/+5
* | 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-181-1/+50
* | | Merge branch 'avination' into careminsterMelanie2012-10-181-3/+52
|\ \ \ | | |/ | |/|
| * | i update core ode plugin and make it load is meshs (i hope)UbitUmarov2012-10-071-9/+81
* | | Merge branch 'master' into careminsterMelanie2012-10-041-2/+11
|\ \ \ | | |/ | |/|
| * | Soliciting for comments on smoothness of physics objects for this build.teravus2012-10-031-2/+11
* | | 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-04-241-0/+1
|\ \ | |/
| * Restore _parent_scene.actor_name_map[prim_geom] = this; accidentally removed ...Justin Clark-Casey (justincc)2012-04-241-0/+1
* | Merge branch 'master' into careminsterMelanie2012-04-221-237/+220
|\ \ | |/
| * Comment out spurious Body != IntPtr.Zero code after disableBody(), since disa...Justin Clark-Casey (justincc)2012-04-211-9/+18
| * refactor: Simplify ODEPrim.AddChildPrim() by returning early where appropriate.Justin Clark-Casey (justincc)2012-04-211-115/+117
| * Remove redundant prim_geom != IntPtr.Zero checks in ODEPrim.Justin Clark-Casey (justincc)2012-04-211-116/+88
* | Merge branch 'master' into careminsterMelanie2012-04-201-12/+10
|\ \ | |/
| * If a physical prim is manually moved (e.g. by a user) then set the geometry p...Justin Clark-Casey (justincc)2012-04-201-12/+10
* | Merge branch 'master' into careminsterMelanie2012-03-201-10/+16
|\ \ | |/
| * Fix crash where two scene loop threads could changes m_MeshToTriMeshMap at th...Justin Clark-Casey (justincc)2012-03-201-10/+16
* | Merge branch 'master' into careminsterMelanie2012-02-241-0/+2
|\ \ | |/
| * Stop spurious scene loop startup timeout alarms for scenes with many prims.Justin Clark-Casey (justincc)2012-02-241-0/+2
| * Remove unused SetAcceleration and add set on Acceleration parameterDan Lake2011-12-201-0/+1
* | Merge branch 'master' into careminsterMelanie2011-12-221-0/+1
|\ \
| * | Remove unused SetAcceleration and add set on Acceleration parameterDan Lake2011-12-201-0/+1
| |/
* | Merge branch 'master' into bigmergeMelanie2011-11-241-11/+9
|\ \ | |/
| * slightly simplify OdeScene.Simulate() by removing bool processtaints, since w...Justin Clark-Casey (justincc)2011-11-221-1/+0
| * Comment out calls to OdeScene.waitForSpaceUnlock() since that method does not...Justin Clark-Casey (justincc)2011-11-211-9/+9
| * Have ODECharacter and ODEPrim both use PhysicsActor.Name instead of maintaini...Justin Clark-Casey (justincc)2011-11-211-1/+0
* | Merge branch 'master' into bigmergeMelanie2011-11-171-10/+1
|\ \ | |/
| * Stop OdePrim and OdeCharacter insanely overriding set LocalID to set their ow...Justin Clark-Casey (justincc)2011-11-161-10/+1
* | Merge branch 'master' into bigmergeMelanie2011-11-051-0/+3
|\ \ | |/
generated by cgit v1.1 at 2024-12-23 19:24:27 +0000