aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/OdePlugin (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-06-272-14/+14
|\
| * minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2010-06-252-14/+14
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-191-0/+1
|\ \ | |/
| * Hunting for the problem in #4777Diva Canto2010-06-191-0/+1
| * Reverting my last two commits, putting back Melanie's exception handler. Does...Diva Canto2010-06-191-1/+10
| * Reinstated the behavior of AddPrimShape *exactly* as it was as of December. T...Diva Canto2010-06-191-10/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-181-1/+1
|\ \ | |/
| * Remove an error in meshing error reporting. Now doesn't double-bombMelanie2010-06-181-1/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-121-1/+12
|\ \ | |/
| * Log and eat sculpt meshing exceptions caused by bad jp2 data.Melanie2010-06-121-1/+12
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-03-151-2/+2
|\ \ | |/
| * * Added a better check to the SimianGrid connectors to test if they are enabl...John Hurliman2010-03-121-2/+2
* | Resolved mergeKitto Flora2010-03-123-78/+391
|\ \
| * \ Merge branch '0.6.9-post-fixes' into careminsterMelanie2010-03-063-65/+398
| |\ \ |/ / / | | _
| * Formatting cleanup.Jeff Ames2010-02-151-25/+25
| * Revolution is on the roll again! :)Revolution2010-02-143-39/+372
* | Merge branch 'master' into careminsterMelanie2010-02-081-0/+2
|\ \ | |/
| * Applying patch #4534 by Misterblue to fix ODE physics stickinessJohn Hurliman2010-02-041-0/+2
* | Add glue for llSetVehicleFlags(), llRemoveVehicleFlags(). ChODE: Add associat...Kitto Flora2010-01-212-0/+20
* | Merge branch 'master' into careminsterMelanie2010-01-034-515/+509
|\ \ | |/
| * Formatting cleanup. Add copyright headers.Jeff Ames2010-01-044-515/+509
* | Fix conflictsKitto Flora2009-12-222-2/+1
|\ \
| * \ Merge branch 'master' into careminsterMelanie2009-12-222-8/+9
| |\ \ | | |/
| | * Glue code for a couple of new LSL function implementationsMelanie2009-12-222-0/+18
* | | Include ChOdePluginKitto Flora2009-12-223-118/+31
|/ /
* | Fix GetWorldRotation(), and a host of related Sit fixes.Kitto Flora2009-12-171-1/+5
* | Merge branch 'master' into careminsterMelanie2009-12-121-1/+8
|\ \ | |/
| * * Commit some sit code that's commented out for now.Teravus Ovares (Dan Olivares)2009-12-081-1/+8
* | Merge branch 'master' into careminsterMelanie2009-12-061-2/+8
|\ \ | |/
| * * Adds Normal to the fields returned by the Physics RaycasterTeravus Ovares (Dan Olivares)2009-12-051-2/+8
* | Merge branch 'master' into careminsterMelanie2009-12-053-1/+9
|\ \ | |/
| * * Fixes mantis 4416. Animator is dereferenced on logoutTeravus Ovares (Dan Olivares)2009-12-051-1/+4
| * * Fixes the 10x10x10 hard physics limitation. (wierdly, you have to set thi...Teravus Ovares (Dan Olivares)2009-12-032-0/+5
* | Merge branch 'master' into careminsterMelanie2009-11-271-1/+4
|\ \ | |/
| * * Fixes a case of d.BodyEnable with IntPtr.Zero passed as the parameter in li...Teravus Ovares (Dan Olivares)2009-11-261-1/+4
* | Merge branch 'master' into careminsterMelanie2009-11-241-1/+1
|\ \ | |/
| * * Resolves mantis 4390 http://opensimulator.org/mantis/view.php?id=4390Teravus Ovares (Dan Olivares)2009-11-231-1/+1
* | Merge branch 'master' into careminsterMelanie2009-11-232-4/+38
|\ \ | |/
| * * Adds a test for if the collision is at the bottom of the capsule on avatar....Teravus Ovares (Dan Olivares)2009-11-221-1/+12
| * * Added missing lock to m_forcelist when AddForce is called. When a user dr...Teravus Ovares (Dan Olivares)2009-11-221-3/+26
* | Merge branch 'master' into careminsterMelanie2009-11-211-1/+12
|\ \ | |/
| * * Fixes the second of two terse update issues. Physical objects should react ...Teravus Ovares (Dan Olivares)2009-11-211-0/+3
| * * Fixes one of two terse update issues. There's still one left, but this one...Teravus Ovares (Dan Olivares)2009-11-211-1/+9
* | Clean up messages in ODEKittoFlora2009-11-192-4/+4
* | Fix merge conflictsKittoFlora2009-11-161-7/+0
* | Merge branch 'careminster' into testsKittoFlora2009-11-164-87/+109
|\ \ | |/
| * Following various discussions on irc and in the OpenSim dev OSGrid meeting la...Justin Clark-Casey (justincc)2009-11-091-1/+1
| * Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2009-11-033-72/+94
| |\
| | * * Log progress messages when loading OAR files with a lot of assetsJohn Hurliman2009-10-293-64/+71
| | * Always send a time dilation of 1.0 while we debug rubberbanding issuesJohn Hurliman2009-10-281-1/+2
generated by cgit v1.1 at 2024-11-06 13:26:15 +0000