aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge commit '978fb3d482072d840e6280aa5acd090b67ee6205' into bigmergeMelanie2011-10-252-53/+36
|\
| * reduce access to ODECharacter methods to make code analysis easier. Eliminat...Justin Clark-Casey (justincc)2011-10-152-54/+36
* | Merge commit '9cc2694776e261868138c325a82ce5481c2908ec' into bigmergeMelanie2011-10-251-19/+17
|\ \ | |/
| * restrict unnecessary access levels on ODEPrim fields/propertiesJustin Clark-Casey (justincc)2011-10-151-19/+17
* | Merge commit 'f2132329a358db2c66c29501d35ef54eae8d6eed' into bigmergeMelanie2011-10-253-129/+195
|\ \ | |/
| * refactor: make methods that do not need to be public in ODE private or intern...Justin Clark-Casey (justincc)2011-10-153-129/+195
* | Merge commit '4bfc2f5cdea4b739110cae3b37945d88ad527334' into bigmergeMelanie2011-10-251-1/+1
|\ \ | |/
| * Change hardcoded ODE total frame time to match the default total frame time (...Justin Clark-Casey (justincc)2011-10-141-1/+1
* | Merge commit '77c65951e06c1d309f2bc8f6d2451b2b9a82c9df' into bigmergeMelanie2011-10-252-88/+125
|\ \ | |/
| * Extract NullPhysicsScene from PhysicsScene to improve code readabilityJustin Clark-Casey (justincc)2011-10-142-88/+125
* | Merge commit '20da04fd0c909a00c0cdc2585f242e95c868801a' into bigmergeMelanie2011-10-252-8/+33
|\ \ | |/
| * More method doc and formatting changes. Makes DestroyOdeStructures() privateJustin Clark-Casey (justincc)2011-10-132-8/+33
* | Merge commit '227db07f2ff8a1ba840a0d3018bb242a34d6038f' into bigmergeMelanie2011-10-252-91/+79
|\ \ | |/
| * refactor: move 3x copy/pasted ode structure removal code in ODECharacter into...Justin Clark-Casey (justincc)2011-10-132-91/+79
* | Merge commit '9090039324ecc45bf1005e719f61a80f0187cb73' into bigmergeMelanie2011-10-121-3/+0
|\ \ | |/
| * Remove unused local variable i from OdeScene.Simulate()Justin Clark-Casey (justincc)2011-10-051-3/+0
* | Merge commit '1e798136c3458b8255fcb6341713bf9dbb689f4b' into bigmergeMelanie2011-10-111-2/+2
|\ \ | |/
| * adjust some whitespace to trigger another build, to check the last failure wa...Justin Clark-Casey (justincc)2011-09-171-2/+2
* | Merge commit 'f95033812402aaf31a9f2f66c946165d2d79669f' into bigmergeMelanie2011-10-119-7026/+0
|\ \ | |/
| * Remove old bullet DotNET and X libraries in preparation for BulletSJustin Clark-Casey (justincc)2011-09-179-7027/+0
* | Merge commit '6f542f73d4aacc0b92c2ebcff84b4ce2c8d9433b' into bigmergeMelanie2011-10-111-6/+13
|\ \ | |/
| * Stop the avatar stalling on its first boarder cross when using the ODE pluginJustin Clark-Casey (justincc)2011-09-161-6/+13
* | Resolve merge commits, stage 1Tom2011-09-0439-925/+10812
|\ \ | |/
| * Use GetMeshKey from PrimitiveBaseShape.Robert Adams2011-08-292-15/+23
| * Merge branch 'master' into bulletsimMic Bowman2011-08-292-67/+43
| |\
| | * Move GetMeshKey from buried inside Meshmerizer to a public method on Primitiv...Robert Adams2011-08-281-62/+1
| | * Add level of detail specification to optionally reduce the number of vertices...Robert Adams2011-08-282-5/+42
| * | BulletSim: add mesh representation. Use meshes for static objects and switch ...Robert Adams2011-08-263-129/+228
| * | Merge branch 'master' into bulletsimMic Bowman2011-08-191-1/+7
| |\ \ | | |/
| | * If SP.MoveToTarget has been called with a force walk, begin by landing the av...Justin Clark-Casey (justincc)2011-08-111-1/+5
| | * Add a OS_NPC_LAND_AT_TARGET option to osMoveToTarget()Justin Clark-Casey (justincc)2011-08-101-0/+2
| * | BulletSim: add runtime setting of physics parameters. Update default values.Robert Adams2011-08-185-28/+329
| * | BulletSim: fix problem with not convex hulling large objects by creating unit...Mic Bowman2011-08-051-3/+5
| * | Merge branch 'master' into bulletsimMic Bowman2011-08-056-821/+924
| |\ \ | | |/
| | * extend move test to check one beat of the simulator without actually asking t...Justin Clark-Casey (justincc)2011-08-031-4/+8
| | * Move common gemo/agent map name code into CreateGeom()Justin Clark-Casey (justincc)2011-08-011-11/+5
| | * Instead of preserving old name in geom_name_map in change size or shape, use ...Justin Clark-Casey (justincc)2011-08-011-7/+3
| | * comment out unused code in OdeScene.TriCallback()Justin Clark-Casey (justincc)2011-08-011-12/+12
| | * On geom removal, remove the name from the OdeScene.geom_name_map tooJustin Clark-Casey (justincc)2011-08-011-0/+1
| | * remove the unused ODEPrim.prev_geom fieldJustin Clark-Casey (justincc)2011-08-011-3/+0
| | * When an ODE geom is removed (as when a non-phantom prim is deleted, resized o...Justin Clark-Casey (justincc)2011-08-011-0/+2
| | * refactor: centralize prim geom removal code from four places to oneJustin Clark-Casey (justincc)2011-08-013-43/+48
| | * minor: add note to RemovePrimThreadLocked() to the effect that it contrary to...Justin Clark-Casey (justincc)2011-08-012-1/+4
| | * If a prim changes size or shape, add actor to _parent_scene.actor_name_map wi...Justin Clark-Casey (justincc)2011-08-011-1/+4
| | * minor: indentation correctionJustin Clark-Casey (justincc)2011-08-011-17/+13
| | * Remove _mesh field since the mesh data no longer needs to be stored after it'...Justin Clark-Casey (justincc)2011-07-311-49/+16
| | * refactor: Remove argument to pass in an initial mesh to OdePrim since this is...Justin Clark-Casey (justincc)2011-07-312-27/+5
| | * minor: correct method doc for last commitJustin Clark-Casey (justincc)2011-07-311-1/+1
| | * refactor: rename CreateGeom _mesh argument to mesh, so as to not confuse this...Justin Clark-Casey (justincc)2011-07-311-3/+3
| | * minor: method docJustin Clark-Casey (justincc)2011-07-312-4/+20