aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | 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
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ 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
* | | | | | | | | | | | | | | | | | | | | UbitOde: remove useless water collider from active code.UbitUmarov2012-07-171-8/+8
| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'avination' into ubitworkUbitUmarov2012-07-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Reinstate sleeping because less CPU is preferred over reporting accuracy.Melanie2012-07-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Who needs accurate collisions when the sim lags and crashes?
* | | | | | | | | | | | | | | | | | | | | messing around... Let terrain and water have nullphysicsactors, letUbitUmarov2012-07-156-388/+268
|/ / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nullphyscisactors have a type water, ground or unknown (default). having this removed geom to name mapping no longer needed. Made some more methods comum to prims and characters acessible via PhysActor allowing for a more uniform access. ...
* | | | | | | | | | | | | | | | | | | | In collisions report linksets root parts to parts, and not all parts.UbitUmarov2012-07-134-41/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Temporary suspend collision checks on full stopped bodies, until a better away is found wake them, avoiding spurius collision end and start events. Until a nice way is found to avoid them, this may cause some higher cpu load. plus some clean up
* | | | | | | | | | | | | | | | | | | | fix bad vehicle reference frameUbitUmarov2012-07-131-1/+2
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Use faster any contact point collision detection for Volumedetect, plusUbitUmarov2012-07-123-98/+41
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | some clean up
* | | | | | | | | | | | | | | | | | | ubitODE leaksUbitUmarov2012-07-113-25/+33
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | let rotationVelocity or AngularVelocity be setted on prims. Limited toUbitUmarov2012-07-101-19/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 12rad/s
* | | | | | | | | | | | | | | | | | | retry fixing ode getconfiguration()UbitUmarov2012-07-091-1/+8
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | fix ode getconfigurationUbitUmarov2012-07-092-2/+2
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | log ODE lib configurationUbitUmarov2012-07-091-3/+7
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | fix ODE dispose plus minor clean. On regions restart ode.dispose seemsUbitUmarov2012-07-091-15/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to be called with scene still calling simulation, that should be changed, for now added a check for a valid world in ode simulation
* | | | | | | | | | | | | | | | | | | ODE turn off material dependent friction while vehicle linear motor is ↵UbitUmarov2012-07-073-5/+9
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Effective. Increase a bit world damping of velocities
* | | | | | | | | | | | | | | | | | ubitode: create and use 4 off world collision spaces for offworld static primsUbitUmarov2012-06-301-11/+38
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | fix addforce/impulse.UbitUmarov2012-06-041-3/+3
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | ubitode prim: if makebody() is called already having a body, do a full ↵UbitUmarov2012-05-301-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | destrution so there are no 'leaks'.
* | | | | | | | | | | | | | | | Guard setting the building flagMelanie2012-05-301-0/+4
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Whitespace fixMelanie2012-05-301-1/+1
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | fix physics not reporting collisions only with terrainUbitUmarov2012-05-291-0/+1
| |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | fix avatars collisions on sim crossings and other few cases where ↵UbitUmarov2012-05-281-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | freemove() is called
* | | | | | | | | | | | | | | a bit cleaner code (?) on sculpts/meshs meshing checkingUbitUmarov2012-05-281-7/+6
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | let meshs work indenpendently of mesh_sculpted_prim config optionUbitUmarov2012-05-281-29/+25
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | revert making sculpts phanton if sculpt meshing option is offUbitUmarov2012-05-281-2/+0
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Let OOB information usable outside ubitodeUbitUmarov2012-05-273-29/+33
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | also don't collide sculps or meshs if meshing is OFFUbitUmarov2012-05-211-0/+2
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | try to let avas climb higher steps. Will only work in some cases, may have ↵UbitUmarov2012-05-212-9/+75
| |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bad effects, so needs some more testing
* | | | | | | | | | | | | | minor changesUbitUmarov2012-05-203-32/+24
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | reduce useless waste of cpu. Make character collision events be done ↵UbitUmarov2012-05-193-125/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | similiar to parts. Let same thread do it all ( like in parts ) ( to change this some structs copies must be added)
* | | | | | | | | | | | | | fix character IsPhysicalUbitUmarov2012-05-191-1/+1
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | add colliders relative velocity projected in collision direction to ↵UbitUmarov2012-05-193-1/+13
| |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | collisions report information.
* | | | | | | | | | | | | ubitODE: if stopped having collisions do report zero colisions once, so ↵UbitUmarov2012-05-152-9/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | collision_end event can be triggered. Changed reports rate to the requested rate and not full ode rate.
* | | | | | | | | | | | | ubitODE: fix not reporting land collisions on same cases.UbitUmarov2012-05-151-2/+25
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
* | | | | | | | | | | | ubitODE fix force in case of mlinear motor offset presentUbitUmarov2012-05-131-4/+5
| | | | | | | | | | | |
* | | | | | | | | | | | ubitODE let vehicles responde faster to changes of some parameters like ↵UbitUmarov2012-05-121-12/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | motors decay times
* | | | | | | | | | | | ubitODE reduced again a bit the max allowed correction velocity on ↵UbitUmarov2012-05-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | colisions, to reduce a bit bouncing inerent to colisions.
* | | | | | | | | | | | ubitODE: trial workaround for avatar colisionsUbitUmarov2012-05-121-6/+49
| | | | | | | | | | | |
* | | | | | | | | | | | revert terminal vel reduction. It helped but not efectiveUbitUmarov2012-05-111-2/+2
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |