aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge branch 'master' into careminsterMelanie2013-03-014-15/+63
|\ \ \ | |/ /
| * | BulletSim: more things into the TODO list.Robert Adams2013-03-011-1/+6
| | |
| * | BulletSim: add parameters, code cleanup around checking and enforcingRobert Adams2013-03-013-14/+57
| | | | | | | | | | | | maximum velocity and angular velocity values for prims.
* | | Merge branch 'master' into careminsterMelanie2013-02-272-8/+12
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
| * | BulletSim: fix crash around race condition when a mesh asset cannotRobert Adams2013-02-262-8/+12
| | | | | | | | | | | | | | | be fetched. Update TODO list.
* | | Merge branch 'master' into careminsterMelanie2013-02-261-4/+6
|\ \ \ | |/ /
| * | BulletSim: tweeks to make avatar jump work better.Robert Adams2013-02-251-4/+6
| | |
* | | Merge branch 'master' into careminsterMelanie2013-02-2217-494/+826
|\ \ \ | |/ /
| * | BulletSim: add OutOfBounds logic and some position sanity checkingRobert Adams2013-02-215-33/+68
| | | | | | | | | | | | to eliminate some of the "cannot find terrain height" warning messages.
| * | Deleted all AssemblyFileVersion directivesDiva Canto2013-02-193-3/+3
| | |
| * | BulletSim: experimental lock axis code using constraints. Not enabledRobert Adams2013-02-172-22/+74
| | | | | | | | | | | | by default. Like more debugging is needed.
| * | BulletSim: add calls for creating all the different Bullet constraint types.Robert Adams2013-02-175-47/+338
| | | | | | | | | | | | | | | Updated the DLLs and SOs and code for BulletXNA to create the types. All the detailed control calls are not all in place yet.
| * | BulletSim: rework parameter setting for different types of valuesRobert Adams2013-02-175-394/+348
| | | | | | | | | | | | (like vectors or quaternions).
| * | BulletSim: fix physical object appearing to slowly float off whenRobert Adams2013-02-161-1/+1
| | | | | | | | | | | | they stop moving.
* | | Merge branch 'master' into careminsterMelanie2013-02-139-141/+304
|\ \ \ | |/ /
| * | BulletSim: fix density since the simulator/viewer track density in aRobert Adams2013-02-127-25/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | funny unit that is 100 times real density (default 1000). Fix avatar drifting slowly when stationary flying. Fix for physical prims getting corrected for being under terrain when it was just its geometric center that was below terrain. Add PreUpdatePropertyAction allowing plugable modifiction of phys parameters returned from Bullet. Fix an exception setting GravityMultiplier on initialization. Update DLLs and SOs for good measure (no functional change).
| * | BulletSim: More work on center-of-mass. Remove linksetinfo and rely on ↵Robert Adams2013-02-128-124/+162
| | | | | | | | | | | | simulator to update info.
* | | Merge branch 'master' into careminsterMelanie2013-02-1012-255/+446
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations
| * | BulletSim: add parameter to set global contact breaking threshold. Update ↵Robert Adams2013-02-082-0/+7
| | | | | | | | | | | | DLLs and SOs for setting same.
| * | BulletSim: Change BSCharacter to use new base Density and FrictionRobert Adams2013-02-082-16/+12
| | | | | | | | | | | | variables rather than own local varaibles.
| * | BulletSim: fix avatar bobbing or jiggling while stationary flying.Robert Adams2013-02-085-18/+25
| | | | | | | | | | | | Various comments and debugging message mods.
| * | BulletSim: include the linkage to the layered prim implementation. Separate ↵Robert Adams2013-02-088-225/+109
| | | | | | | | | | | | layers for physical (vs simulator) location displacement and linksets.
| * | BulletSim: reclass BSPrim into layers so linkset and physical world ↵Robert Adams2013-02-082-0/+297
| | | | | | | | | | | | displacement is implemented as overlay classes rather than if statements scattered about.
* | | Merge branch 'master' into careminsterMelanie2013-02-084-36/+106
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
| * | BulletSim: Adapt BulletSim to the newer physical properties. ViewerRobert Adams2013-02-072-30/+28
| | | | | | | | | | | | dialog setting of friction, restitution, ... working.
| * | BulletSim: fix exceptions caused by setting physical properties before the ↵Robert Adams2013-02-071-5/+10
| | | | | | | | | | | | prim body is initialized.
| * | BulletSim: add user setting of friction, density and restitution.Robert Adams2013-02-073-27/+94
| | |
| * | Add some more code from Avination. This changes physics actor stuff aroundMelanie2013-02-072-3/+13
| | | | | | | | | | | | to work with the new params. Not actually plumbed just yet.
| * | Revert "Add plumbing for physics properties to get to the physics engine."Melanie2013-02-071-5/+0
| | | | | | | | | | | | This reverts commit c658fa1c0dd83f23c66ccfedb12e8ab02ff01d0a.
| * | Add plumbing for physics properties to get to the physics engine.Robert Adams2013-02-071-0/+5
| | | | | | | | | | | | Addition of entries to PhysicsActor and setting code in SceneObjectPart.
* | | Merge branch 'master' into careminsterMelanie2013-02-073-29/+52
|\ \ \ | |/ / | | | | | | | | | Conflicts: bin/HttpServer_OpenSim.dll
| * | Change passed PhysicsParameter value from float to the more general string valueRobert Adams2013-02-073-29/+52
| | |
* | | Merge branch 'master' into careminsterMelanie2013-02-073-12/+25
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
| * | BulletSim: set removing zero width triangles in meshes to be enabled by ↵Robert Adams2013-02-062-1/+2
| | | | | | | | | | | | default. This should fix the invisible barrier in sculptie doorways bug.
| * | BulletSim: check for completely degenerate meshes (ones with allRobert Adams2013-02-061-9/+19
| | | | | | | | | | | | | | | triangles having zero width) and output an error rather than throwing and exception.
| * | BulletSim: remove an exception which occurs if a physics meshRobert Adams2013-02-061-2/+4
| | | | | | | | | | | | asset is not found.
* | | Merge branch 'master' into careminsterMelanie2013-02-0612-182/+230
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
| * | BulletSim: make removing zero width triangles from meshes optionalRobert Adams2013-02-052-24/+33
| | | | | | | | | | | | and, for the moment, default to 'off'.
| * | BulletSim: remove degenerate triangles from meshes. This fixes theRobert Adams2013-02-055-45/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | invisible barriers in sculptie doorways (Mantis 6529). Bump up level-of-detail for physical meshes to 32 (the max). This fixes the invisible barriers that showed up in prim cut arches. NOTE: the default LOD values are removed from OpenSimDefaults.ini. If you don't change your OpenSimDefaults.ini, you will continue to see the arch problem.
| * | BulletSim: add debugging looking for doorway sculpty problemsRobert Adams2013-02-053-4/+33
| | |
| * | BulletSim: rework some parameter setting implementation moving functionality ↵Robert Adams2013-02-055-158/+152
| | | | | | | | | | | | that was in BSScene to BSParam. Remove unused parameters that were passed to the unmanaged code. Update DLLs and SOs for the new param block.
| * | BulletSim: correct angular vertical attraction to properly correct an upside ↵Robert Adams2013-02-051-1/+1
| | | | | | | | | | | | down vehicle.
* | | Merge branch 'master' into careminsterMelanie2013-02-058-10/+10
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * | Bump version and assembly version numbers from 0.7.5 to 0.7.6Justin Clark-Casey (justincc)2013-02-057-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | This is mostly Bluewall's work but I am also bumping the general version number OpenSimulator 0.7.5 remains in the release candidate stage. I'm doing this because master is significantly adding things that will not be in 0.7.5 This update should not cause issues with existing external binary DLLs because our DLLs do not have strong names and so the exact version match requirement is not in force.
* | | Merge branch 'master' into careminsterMelanie2013-02-048-149/+166
|\ \ \ | |/ /
| * | Correct spelling mistake in new RayFilterFlags, LSLPhanton -> LSLPhantomJustin Clark-Casey (justincc)2013-02-021-2/+2
| | |
| * | BulletSim: fix problem where editting a physical linkset caused theRobert Adams2013-02-012-19/+33
| | | | | | | | | | | | | | | child prim physical positions to get out of sync with the view. More reliably compute the offset of children in a physical linkset.
| * | BulletSim: fix crash caused when linksets were rebuilt. A problem addedRobert Adams2013-01-315-80/+106
| | | | | | | | | | | | | | | when individual child pos/rot changes were implementated a week or so ago. Remove some passing of inTaintTime flag when it was never false.
| * | BulletSim: make sure vehicle physical properties are set when goingRobert Adams2013-01-315-46/+35
| | | | | | | | | | | | | | | | | | physical by delaying setting until pre-step time. Change vehicle.Refresh() to schedule the pre-step setting. Comments and updating of TODO list.
| * | BulletSim: clean up TargetVelocity implementation by using the default defn ↵Robert Adams2013-01-312-14/+2
| | | | | | | | | | | | in the PhysicsActor base class.