aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics (follow)
Commit message (Expand)AuthorAgeFilesLines
* Commented out instrumentation in ODEPrim.csKittoFlora2009-10-221-0/+8
* Merge branch 'master' into vehiclesMelanie2009-10-223-6/+21
|\
| * * Removing ODEPrim and ODECharacter GetHashCode() overrides since they were b...John Hurliman2009-10-202-10/+0
| * Merge branch 'prioritization' of ssh://opensimulator.org/var/git/opensim into...John Hurliman2009-10-191-0/+4
| |\
| | * Forgot {} on last commit.Diva Canto2009-10-191-0/+2
| | * More instrumentation in physics.Diva Canto2009-10-191-0/+2
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into priorit...John Hurliman2009-10-194-7/+7
| |\ \ | | |/ | |/|
| * | Merge branch 'prioritization' of ssh://opensimulator.org/var/git/opensim into...John Hurliman2009-10-182-1/+14
| |\ \
| | * | A bit of instrumentation to figure out what's going on with physics actors.Diva Canto2009-10-182-1/+14
| * | | Zero out PrimitiveBaseShape.SculptData after the JPEG2000 data has been decod...John Hurliman2009-10-181-0/+3
| |/ /
* | | Merge branch 'master' into vehiclesMelanie2009-10-195-9/+51
|\ \ \ | | |/ | |/|
| * | Formatting cleanup.Jeff Ames2009-10-194-7/+7
| * | * One more tweak to inform the user that they may not be able to move until r...Teravus Ovares (Dan Olivares)2009-10-161-1/+1
| * | * After seeing it repeat over and over again.. again, We won't inform the s...Teravus Ovares (Dan Olivares)2009-10-161-1/+1
| |/
| * * One more attempt at the NullRef In The OdePlugin. This might fix it, but ...Teravus Ovares (Dan Olivares)2009-10-162-1/+22
| * * Added a message for when the null reference exception occurs to make debugg...Teravus Ovares (Dan Olivares)2009-10-161-3/+4
| * * A hacky attempt at resolving mantis #4260. I think ODE was unable to allo...Teravus Ovares (Dan Olivares)2009-10-161-2/+22
* | Merge branch 'master' into vehiclesMelanie2009-10-151-1/+1
|\ \ | |/
| * * Eliminated unnecessary parameters from LLUDPServer.SendPacketData()John Hurliman2009-10-131-1/+1
* | Merge branch 'master' into vehiclesMelanie2009-10-124-21/+784
|\ \ | |/
| * Optimize ODE mesh by removing sleep. On a region with 100,000 prims and ODE e...unknown2009-10-121-1/+1
| * sync PrimMesher with r46dahlia2009-10-112-19/+782
| * disambiguate System.Path (preparation for new PrimMesher)dahlia2009-10-111-1/+1
* | Merge branch 'master' into vehiclesMelanie2009-10-122-2/+17
|\ \ | |/
| * * comment out the velocity test, using updates every 500 ms as set in ScenePr...Teravus Ovares (Dan Olivares)2009-10-101-0/+3
| * * Make ODECharacter respect the scene's requested collision update timeTeravus Ovares (Dan Olivares)2009-10-102-2/+14
* | Correct a build break caused by an optimization in trunkMelanie2009-10-071-1/+1
* | Merge branch 'master' into vehiclesMelanie2009-10-061-5/+2
|\ \ | |/
| * minor: remove mono compile warningJustin Clark-Casey (justincc)2009-10-051-5/+2
* | Merge branch 'master' into vehiclesMelanie2009-10-054-69/+124
|\ \ | |/
| * Eliminate pinned Mesh data on managed heap by using IntPtrs to memory allocat...Dan Lake2009-10-053-61/+120
| * only cache mesh if meshing was successfuldahlia2009-10-041-8/+4
* | Merge branch 'master' into vehiclesMelanie2009-10-051-7/+24
|\ \ | |/
| * flexible extrusion shape defaults to lineardahlia2009-10-041-1/+1
| * Exclude sculpt proxies from mesh cachingdahlia2009-10-041-6/+23
* | Merge branch 'master' into vehiclesMelanie2009-10-021-0/+14
|\ \ | |/
| * Merge branch 'master' into diva-texturesMelanie2009-10-0213-263/+341
| |\
| * | Create j2k cache directory if it doesn't exist. The Meshmerizer needs it there.Diva Canto2009-09-301-0/+14
* | | Merge branch 'master' into vehiclesMelanie2009-10-018-20/+12
|\ \ \ | | |/ | |/|
| * | Formatting cleanup.Jeff Ames2009-10-011-2/+2
| * | Formatting cleanup.Jeff Ames2009-10-015-10/+10
| * | Add copyright header. Formatting cleanup.Jeff Ames2009-09-292-2/+2
* | | Merge branch '0.6.7-post-fixes' into vehiclesKitto Flora2009-09-306-191/+257
|\ \ \ | |/ /
| * | corrections to viewerMode AddPos()dahlia2009-09-252-1/+40
| * | Meshmerizer stores dictionary of unique Meshes keyed on construction paramete...Dan Lake2009-09-243-78/+95
| * | modify BulletDotNETPrim.cs in preparation for Mantis #4181dahlia2009-09-241-112/+122
* | | Commit initial version of KittoFlora's vehicle changesopensim2009-09-304-564/+1300
|/ /
* | Alternate algorithm for fixing avatar capsule tilt (Mantis #2905)nlin2009-09-181-60/+72
|/
* Add test to check behaviour if an iar is loaded where no user profile exists ...Justin Clark-Casey (justincc)2009-09-091-16/+6
* * Fix for GetTerrainHeightAtXY to make it compatible when Constants.RegionSiz...Teravus Ovares (Dan Olivares)2009-09-041-3/+4