aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'avination' into careminsterMelanie2012-05-072-21/+108
|\
| * UbitODE: reduced the diference btw dinamic and static friction, making ↵UbitUmarov2012-05-051-17/+17
| | | | | | | | dinamic larger more identical to static.
| * ubitODE prims: - moved outbounds checking back to ↵UbitUmarov2012-05-051-4/+91
| | | | | | | | UpdatePositionAndVelocity() from move() so it's done at end of each ode step and when it reports positions to core. There should be no need to check in both places. - Addforce() and AddAngularForce now apply a force if parameter pushforce is true or apply a impulse if false as it's actually needed (the prims grab case should be a force)
* | Merge branch 'avination' into careminsterMelanie2012-05-051-2/+8
|\ \ | |/
| * force lower avatar density for testingUbitUmarov2012-05-051-0/+4
| |
| * UbitODE: leave avatar 'freemove' state (entered on setmomentum) on any ↵UbitUmarov2012-05-041-2/+4
| | | | | | | | significant change like new 'velocity' or new position, etc, requests
* | Merge branch 'avination'Melanie2012-05-031-5/+6
|\ \ | |/
| * Improved sitted avatars crossings ( plus tests on vehicles)UbitUmarov2012-05-021-5/+6
| |
* | Merge branch 'avination'Melanie2012-05-023-112/+123
|\ \ | |/
| * ubitODE fix applyROtationImpulse, let vehicle hover be relative to root ↵UbitUmarov2012-04-292-15/+32
| | | | | | | | prim and not center of mass ( as SL docs said) updated some flags to current ones
| * ubitode fix inertia for same cases. Added a nasty lock on llGetCenterOfMass ↵UbitUmarov2012-04-292-97/+91
| | | | | | | | and simulate
* | Merge branch 'avination'Melanie2012-04-294-219/+314
|\ \ | |/
| * fix llGetCenterOfMass ( checked with ubitODE only)UbitUmarov2012-04-281-5/+30
| |
| * Oooops don't hover underground but do hoverUbitUmarov2012-04-271-26/+27
| |
| * reorder priority of vehicle hover flagsUbitUmarov2012-04-271-109/+114
| |
| * testUbitUmarov2012-04-271-1/+7
| |
| * testUbitUmarov2012-04-271-2/+2
| |
| * itestUbitUmarov2012-04-271-2/+1
| |
| * testUbitUmarov2012-04-271-13/+11
| |
| * testingUbitUmarov2012-04-271-1/+1
| |
| * testing....UbitUmarov2012-04-271-41/+78
| |
| * ubitODE fix don't report colisions with a volume detector ( only report to it )UbitUmarov2012-04-271-12/+16
| |
| * testingUbitUmarov2012-04-271-1/+1
| |
| * testingUbitUmarov2012-04-271-58/+71
| |
| * testingUbitUmarov2012-04-271-1/+1
| |
| * testingUbitUmarov2012-04-271-0/+6
| |
| * TESTINGUbitUmarov2012-04-271-0/+1
| |
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-04-253-13/+43
|\ \ | |/ | | | | careminster
| * fix chODE loosing some part positions when doing isPhysical falseUbitUmarov2012-04-242-11/+42
| |
| * let objects/avas push avasUbitUmarov2012-04-241-2/+1
| |
* | Merge branch 'master' into careminsterMelanie2012-04-241-0/+1
|\ \ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Warp3DMap/MapImageModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Restore _parent_scene.actor_name_map[prim_geom] = this; accidentally removed ↵Justin Clark-Casey (justincc)2012-04-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | from ODEPrim.SetGeom. This occurred in 7a574be3fd from Sat 21 Apr 2012. This should fix collision detection. Mnay thanks to tglion for the spot and the fix in http://opensimulator.org/mantis/view.php?id=5988
* | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-04-233-476/+508
|\ \ \ | | |/ | |/| | | | careminster
| * | ubitODE - do own timing control (as chODE does) until heartbeat does it rightUbitUmarov2012-04-232-21/+34
| | |
| * | ubitODE - several changes...UbitUmarov2012-04-233-431/+379
| | |
| * | ubitODE: - don't try to hover underground unless volumedetector (that ↵UbitUmarov2012-04-211-47/+93
| | | | | | | | | | | | doesn't colide with it)
| * | ubitODE: - Change triangles used in terrain height estimationUbitUmarov2012-04-201-11/+28
| | |
| * | ubitODE - again avatar/terrain collision. Reduce new viewers interpolators ↵UbitUmarov2012-04-201-6/+14
| | | | | | | | | | | | efects reporting null velocity and aceleration when stopped near the right position, where they can still have instantanius large values that can get magnified by interpolators, specially using diferent timing estimation.
* | | Merge branch 'master' into careminsterMelanie2012-04-233-54/+343
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * | refactor: simply some properties code in BasicPhysicsPluginJustin Clark-Casey (justincc)2012-04-222-72/+12
| | |
| * | Fix bug where setting phantom on a prim would result in a server log message ↵Justin Clark-Casey (justincc)2012-04-222-18/+367
| | | | | | | | | | | | | | | | | | | | | | | | rather than setting phantom. This was an oversight when removing some race conditions from PhysicsActor setting recently. Regression tests extended to probe this code path. Extending regression tests required implementation of a BasicPhysicsPrim (there was none before). However, BasicPhysics plugin is still of no current practical use other than to fill in as a component for other parts of regression testing.
* | | Merge branch 'master' into careminsterMelanie2012-04-222-238/+222
|\ \ \ | |/ /
| * | Comment out spurious Body != IntPtr.Zero code after disableBody(), since ↵Justin Clark-Casey (justincc)2012-04-212-10/+20
| | | | | | | | | | | | disableBody() sets Body == IntPtr.Zero on all code paths.
| * | 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
| | | | | | | | | | | | | | | | | | prim_geom == IntPtr.Zero only before a new add prim taint is processed (which is the first taint) or in operations such as scale change which are done in taint or under lock. Therefore, we can remove these checks which were not consistently applied anyway. If there is a genuine problem, better to see it quickly in a NullReferenceException than hide the bug.
* | | 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 ↵Justin Clark-Casey (justincc)2012-04-201-12/+10
| | | | | | | | | | | | | | position as well as the body position This is necessary to stop the moved prim snapping back to the original position on deselection if moved only once This resolves http://opensimulator.org/mantis/view.php?id=5966
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-04-192-2/+2
|\ \
| * \ Merge branch 'ubitwork'Melanie2012-04-171-0/+1
| |\ \
| * \ \ Merge branch 'ubitwork'Melanie2012-04-162-8/+16
| |\ \ \
generated by cgit v1.1 at 2024-12-18 20:44:28 +0000