aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-02-183-5/+29
|\
| * Report an error if the required native Windows ODE library can't be found.Justin Clark-Casey (justincc)2012-02-181-1/+4
| * On Windows automatically load the correct native ODE library depending on whe...Justin Clark-Casey (justincc)2012-02-182-3/+24
| * Comment out "experimental" log message printed out whenever a physics mesh wa...Justin Clark-Casey (justincc)2012-02-161-2/+2
* | Merge branch 'master' into careminsterMelanie2012-02-152-1/+53
|\ \ | |/
| * correct the default avatar_terminal_velocity value that I accidentally left i...Justin Clark-Casey (justincc)2012-02-111-1/+1
| * Clamp ODE character velocity. Make ODE falling character 54m/s by default.Justin Clark-Casey (justincc)2012-02-112-1/+53
* | Merge branch 'master' into careminsterMelanie2012-01-264-7/+63
|\ \ | |/
| * Update BulletSim.dll with some interface changes and tuning (see opensim-libs...Robert Adams2012-01-252-6/+31
| * Serialize calls to ODE Collide() function across OdeScene instances to preven...Justin Clark-Casey (justincc)2012-01-252-1/+32
* | Merge branch 'master' into careminsterMelanie2012-01-252-12/+27
|\ \ | |/
| * Restrict accessible of ODECharacter Shell and Body. Add method doc and some ...Justin Clark-Casey (justincc)2012-01-242-12/+27
* | Merge branch 'master' into careminsterMelanie2012-01-021-0/+1
|\ \ | |/
| * Adding commented out log messages and some minor formatting for future bug hu...Justin Clark-Casey (justincc)2012-01-021-0/+1
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2011-12-241-2/+2
|\ \
| * \ Merge branch 'master' into careminsterMelanie2011-12-231-2/+2
| |\ \ | | |/
| | * Align default ODE_STEPSIZE with that already used through OpenSimDefaults.iniJustin Clark-Casey (justincc)2011-12-221-2/+2
* | | Add setter for Acceleration on physics objects.Melanie2011-12-242-0/+2
|/ /
* | Merge branch 'master' into careminsterMelanie2011-12-2210-34/+13
|\ \ | |/
| * Remove unused SetAcceleration and add set on Acceleration parameterDan Lake2011-12-2010-34/+13
* | Merge branch 'master' into careminsterMelanie2011-12-201-2/+2
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2011-12-201-1/+1
| |\
| * | Fixed bug of avie going under the terrain when crossing regions in certain di...Diva Canto2011-12-201-2/+2
* | | Merge branch 'master' into careminsterMelanie2011-12-184-27/+52
|\ \ \ | | |/ | |/|
| * | Comment out accidentally left in "Adding physics prim" log messageJustin Clark-Casey (justincc)2011-12-161-1/+1
| |/
| * Stop pointlessly setting the m_colliderarr[] to false in the ODECharacter con...Justin Clark-Casey (justincc)2011-12-151-5/+0
| * Stop having to call SetHeight again in ScenePresence.AddToPhysicalScene() whe...Justin Clark-Casey (justincc)2011-12-153-18/+25
| * Code cleanup related to ScenePresence.PhysicsActor and OdeScene/OdeCharacterJustin Clark-Casey (justincc)2011-12-152-8/+24
| * minor: add some currently commented log lines for use in debuggingJustin Clark-Casey (justincc)2011-12-141-1/+8
* | Merge branch 'master' into careminsterMelanie2011-12-141-58/+20
|\ \ | |/
| * Simplify some manipulation of _taintedActors in OdeSceneJustin Clark-Casey (justincc)2011-12-141-13/+6
| * Eliminate _taintedPrimsH and _taintedPrimsL (and _taintedPrimLock) in favour ...Justin Clark-Casey (justincc)2011-12-141-45/+14
* | Merge branch 'master' into careminsterMelanie2011-12-141-2/+1
|\ \ | |/
| * minor: remove pointless comment from OdeScene.csJustin Clark-Casey (justincc)2011-12-121-2/+1
* | Merge branch 'master' into bigmergeMelanie2011-12-011-9/+6
|\ \ | |/
| * minor: remove mono compile warning, a Vector3 can never be null since it's a ...Justin Clark-Casey (justincc)2011-11-291-9/+6
* | Merge branch 'master' into bigmergeMelanie2011-11-283-8/+8
|\ \ | |/
| * remove some mono compiler warningsJustin Clark-Casey (justincc)2011-11-253-8/+8
* | Merge branch 'master' into bigmergeMelanie2011-11-245-539/+525
|\ \ | |/
| * Log error if we attempt to add/remove an OdeCharacter from the _characters li...Justin Clark-Casey (justincc)2011-11-221-23/+33
| * Stop removing actor from the hash maps in OdeScene.RemoveCharacter() since th...Justin Clark-Casey (justincc)2011-11-221-6/+1
| * Comment out uncalled OdeScene.UnCombine()Justin Clark-Casey (justincc)2011-11-222-66/+60
| * slightly simplify OdeScene.Simulate() by removing bool processtaints, since w...Justin Clark-Casey (justincc)2011-11-223-141/+128
| * Slightly improve "Unable to space collide" logging message, though I don't th...Justin Clark-Casey (justincc)2011-11-211-1/+2
| * Get rid of OdeCharacter != null checks since OdeScene._characters can never c...Justin Clark-Casey (justincc)2011-11-211-17/+4
| * remove unnecessary OdeScene._activeprims locking. Code is single-threadedJustin Clark-Casey (justincc)2011-11-211-53/+46
| * Restore defects list. In hindsight, the reason for this is becuase we can't ...Justin Clark-Casey (justincc)2011-11-212-92/+112
| * simplify operation of OdeScene._perloopContactJustin Clark-Casey (justincc)2011-11-211-45/+51
| * don't bother locking OdeScene._perloopContact in single threaded codeJustin Clark-Casey (justincc)2011-11-211-47/+42
| * don't lock OdeScene.contacts since only ever accessed by a single threadJustin Clark-Casey (justincc)2011-11-211-10/+24