aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2012-04-233-476/+508
|\ \
| * | 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 doesn't...UbitUmarov2012-04-211-47/+93
| * | ubitODE: - Change triangles used in terrain height estimationUbitUmarov2012-04-201-11/+28
| * | ubitODE - again avatar/terrain collision. Reduce new viewers interpolators ef...UbitUmarov2012-04-201-6/+14
* | | Merge branch 'master' into careminsterMelanie2012-04-233-54/+343
|\ \ \ | | |/ | |/|
| * | 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
* | | Merge branch 'master' into careminsterMelanie2012-04-222-238/+222
|\ \ \ | |/ /
| * | Comment out spurious Body != IntPtr.Zero code after disableBody(), since disa...Justin Clark-Casey (justincc)2012-04-212-10/+20
| * | 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' 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
| |\ \ \
| * | | | Downgrade an error log message to info because there is nothing we can do ifMelanie2012-04-162-2/+2
* | | | | ubitODE still retouching character pidUbitUmarov2012-04-181-2/+2
* | | | | ubitODE - retouch character PIDsUbitUmarov2012-04-181-4/+4
* | | | | ubitODE: prims - update managed dinamic parameters from unmanaged at ODE rate...UbitUmarov2012-04-171-78/+46
* | | | | ubitODE: - character managed ode was only getting position etc from unmanaged...UbitUmarov2012-04-172-119/+48
* | | | | ubitODE: - made avatar/ground collision pid servo a bit softer since seems a ...UbitUmarov2012-04-172-6/+7
| |_|/ / |/| | |
* | | | ubitODE: bug fix let avatars colide with volume detectorsUbitUmarov2012-04-171-0/+1
| |/ / |/| |
* | | ubitODE: - fix remove characters from default raycasts filters as older code ...UbitUmarov2012-04-162-8/+16
|/ /
* | chODE: if character velocity > 50m/s apply breaks. In free fall this will giv...UbitUmarov2012-04-161-1/+10
* | chODE bug fixUbitUmarov2012-04-161-7/+9
* | ubitODE + physmanager: - Revised use of ODE collisions categories and bits(fl...UbitUmarov2012-04-167-729/+983
* | Use chode character actor.SetMomentum() to force full restore Velocity in sce...UbitUmarov2012-04-141-1/+19
* | chODE and ubitODE always return prim mass (they where returning object mass o...UbitUmarov2012-04-094-69/+315
* | reduced instability in vertical atractor with eficiency of 1 and bankingUbitUmarov2012-03-311-9/+13
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-273-9/+48
|\ \
| * \ Merge branch 'master' into careminsterMelanie2012-03-273-9/+48
| |\ \ | | |/
| | * BulletSim: make avatar animations update properly.Robert Adams2012-03-263-9/+48
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-265-40/+135
|\ \ \ | |/ /
| * | Merge branch 'master' into careminsterMelanie2012-03-265-40/+135
| |\ \ | | |/
| | * BulletSim: fix typo introducted by previous checkins (git merge sometimes mak...Robert Adams2012-03-261-3/+0
| | * Merge branch 'bulletsim1' of ssh://island.sciencesim.com/home/sceneapi/radams...Robert Adams2012-03-231-1/+6
| | |\
| | | * BulletSim: remove confusion between angularVelocity and rotationalVelocity (t...Robert Adams2012-03-223-15/+11
| | | * BulletSim: update TODO list. Rearrange code for readability. Add per object f...Robert Adams2012-03-212-17/+17
| | | * BulletSim: Add AvatarRestitution parameter. Centralize computation of buoyanc...Robert Adams2012-03-212-3/+9
| | | * BulletSim: set buoyancy in only one placeRobert Adams2012-03-211-5/+3
| | | * BulletSim: add some new runtime setable parameters to match the dll.Robert Adams2012-03-212-7/+16
| | | * BulletSim: Update list of TODO tasksRobert Adams2012-03-211-0/+13
| | * | BulletSim: change default of shouldDisableContactPoolDynamicAllocation from F...Robert Adams2012-03-231-2/+2
| | * | BulletSim: Add new configuration parameters to get and set console commandsRobert Adams2012-03-231-4/+32
| | * | BulletSim: add a bunch of internal Bullet configuration parameters to OpenSim...Robert Adams2012-03-232-0/+43