aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '440905ad14d4261df9da0fd2ce7e20a350982af1' into careminsterMelanie2013-05-251-53/+83
|\
| * change a hull debugging message to Debug instead of Infodahlia2013-05-241-1/+1
| |
| * correct some errors in decoding of mesh asset convex decomposition datadahlia2013-05-241-53/+83
| |
* | Merge branch 'master' into careminsterMelanie2013-05-243-154/+241
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
| * add decoder for bounding convex hulldahlia2013-05-231-4/+53
| |
| * Add DEBUG level logging in Meshmerizer for mesh parsing. There isRobert Adams2013-05-231-2/+25
| | | | | | | | a compile time variable to turn this logging off if it is too spammy.
| * BulletSim: add locking around Meshmerizer use to eliminate possible raceRobert Adams2013-05-231-145/+157
| | | | | | | | condition when extracting the convex hulls.
| * BulletSim: correct errors caused by misspelled INI parameter spec.Robert Adams2013-05-222-4/+7
| | | | | | | | Add debugging messages for hull asset use.
* | Merge branch 'master' into careminsterMelanie2013-05-2410-49/+352
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * BulletSim: add code to experimentally use asset hull data.Robert Adams2013-05-222-4/+54
| | | | | | | | Default to 'off' as it needs debugging.
| * BulletSim: fix problem with walking up stairs that are orientedRobert Adams2013-05-221-2/+9
| | | | | | | | | | in certain directions. The problem was really that the avatar capsule orientation was being set incorrectly.
| * Revert "BulletSim: add code to experimentally use asset hull data."Robert Adams2013-05-212-54/+4
| | | | | | | | | | | | | | | | This reverts commit 2fd8819a043269f9308cb46c71893e6eb35a426e. Remove this code until I can figure out why the references that are clearly in prebuild.xml doesn't work for the 'using OpenSim.Region.Physics.Meshing' in BSShape.cs.
| * BulletSim: add code to experimentally use asset hull data.Robert Adams2013-05-212-4/+54
| | | | | | | | Default to 'off' as it needs debugging.
| * BulletSim: add gImpact shape type. Add logic to use gImpact shapeRobert Adams2013-05-217-14/+167
| | | | | | | | | | for prims that have cuts or holes. Default logic to 'off' as it needs debugging.
| * Merge branch 'master' of git://opensimulator.org/git/opensimRobert Adams2013-05-211-21/+110
| |\
| | * fix error in hull point indexingdahlia2013-05-181-1/+1
| | |
| | * remove duplicate hull scalingdahlia2013-05-181-3/+3
| | |
| | * add prototype code to decode convex hulls from mesh assets. Please do not ↵dahlia2013-05-181-21/+110
| | | | | | | | | | | | use yet; the interface will be defined in a later commit.
| * | BulletSim: fix BulletSim crashing if there is no [BulletSim] sectionRobert Adams2013-05-172-8/+12
| |/ | | | | | | in any INI file. Update TODO list.
* | Merge branch 'master' into careminsterMelanie2013-05-165-9/+53
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
| * fall back to using a display mesh for physics proxy if no physics_mesh entry ↵dahlia2013-05-151-0/+4
| | | | | | | | was wound in a mesh asset
| * BulletSim: Fix for mantis 6487, also minor adjustment to fix flying while ↵Vegaslon2013-05-141-2/+5
| | | | | | | | | | | | you are running. Signed-off-by: Robert Adams <Robert.Adams@intel.com>
| * BulletSim: add a lock to try and catch a native shape creation/destructionRobert Adams2013-05-131-2/+7
| | | | | | | | race condition.
| * BulletSim: add adjustment for avatar capsule height scaling. MakesRobert Adams2013-05-132-4/+32
| | | | | | | | avatar standing on ground view better and enables tuning.
| * BulletSim: use heightmap terrain when using BulletXNA.Robert Adams2013-05-132-1/+5
| | | | | | | | Output messages on features disabled when using BulletXNA.
* | Merge branch 'master' into careminsterMelanie2013-05-111-2/+6
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Services/LLLoginService/LLLoginResponse.cs OpenSim/Services/LLLoginService/LLLoginService.cs OpenSim/Tests/Common/Mock/TestClient.cs
| * BulletSim: fix CPU loop that occurs when any 'degenerate' sculptieRobert Adams2013-05-101-2/+6
| | | | | | | | | | is in a region. This fixes the high CPU usage for regions with nothing else going on.
* | Merge branch 'master' into careminsterMelanie2013-05-083-21/+54
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
| * Bulletsim: and the rotational friction.Vegaslon2013-05-071-3/+5
| | | | | | | | Signed-off-by: Robert Adams <Robert.Adams@intel.com>
| * BulletSim: Another way to create vehicle framed friction.Vegaslon2013-05-071-3/+5
| | | | | | | | Signed-off-by: Robert Adams <Robert.Adams@intel.com>
| * BulletSim: normalize quaternian rotations when building compound linksets.Robert Adams2013-05-061-7/+7
| | | | | | | | Attempt to fix vehicles being twisted off the ground when they go physical.
| * BulletSim: properly free references to simple convex hull shapes. Didn'tRobert Adams2013-05-061-8/+37
| | | | | | | | loose memory since shapes are shared but did mess up usage accounting.
* | Merge branch 'master' into careminsterMelanie2013-05-071-6/+6
|\ \ | |/
| * BulletSim: apply linear and angular friction in vehicle coordinatesRobert Adams2013-05-061-6/+6
| | | | | | | | and not world coordinates.
* | Merge branch 'master' into careminsterMelanie2013-05-0611-268/+169
|\ \ | |/
| * BulletSim: remove friction calcuation from BSMotor and move linear andRobert Adams2013-05-067-67/+47
| | | | | | | | | | | | | | angular friction computation into linear and angular movement code. The friction wasn't being applied properly. This will make it so vehicles don't drift as much and the drift is tunable by changing the friction timescales.
| * BulletSim: simplify parameter specification by reducing the number ofRobert Adams2013-05-062-191/+94
| | | | | | | | specifications required for simple properties with defaults.
| * BulletSim: extend BSActorLockAxis to allow locking linear movement inRobert Adams2013-05-063-10/+28
| | | | | | | | addition to angular movement. Not enabled by anything yet.
* | Merge branch 'master' into careminsterMelanie2013-05-0430-1638/+1353
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
| * BulletSim: zero vehicle motion when changing vehicle type.Robert Adams2013-05-036-26/+18
| | | | | | | | | | Rebuild compound linkset of any child in the linkset changes shape. Comments and better detailed logging messages.
| * BulletSim: prims with no cuts created with single convex hull shape.Robert Adams2013-05-024-2/+99
| | | | | | | | Parameter added to enable/disable this feature.
| * BulletSim: Rebuild physical body if physical shape changes for mesh and hull.Robert Adams2013-05-024-24/+73
| | | | | | | | | | Properly rebuilds collision caches. Release asset data fetched when building mesh or hulls.
| * BulletSim: fix crash when mesh asset wasn't available when meshingRobert Adams2013-05-012-10/+19
| | | | | | | | | | the first time. Debugging added for mesh/hull asset fetch.
| * BulletSim: rework LinksetCompound to work with new BSShape system.Robert Adams2013-05-011-106/+40
| | | | | | | | Not all working yet.
| * Merge branch 'master' into bulletsim4Robert Adams2013-05-011-0/+3
| |\
| * | BulletSim: improvements to LinksetCompound and PrimDisplaced. Not all ↵Robert Adams2013-04-305-17/+50
| | | | | | | | | | | | working yet.
| * | BulletSim: Add non-static BSShape.GetReference for getting another referenceRobert Adams2013-04-292-32/+102
| | | | | | | | | | | | | | | | | | | | | to an existing shape instance. BSShapeNative rebuilds shape for all references. BSShapeCompound returns another reference copy if the compound shape already exists (for linksets).
| * | BulletSim: LinksetCompound work to disable collision for root andRobert Adams2013-04-291-14/+30
| | | | | | | | | | | | | | | | | | | | | child prims so compound shape can do all collisions. Don't try to build a compound linkset for non-physical linksets. Remove and replace root body when compound shape is added so collision cache is rebuilt.
| * | BulletSim: remove trailing white space to make git happier. No functional ↵Robert Adams2013-04-2920-152/+152
| | | | | | | | | | | | changes.
| * | BulletSim: rename variable 'PhysicsScene' to be either 'PhysScene' or ↵Robert Adams2013-04-2911-282/+282
| | | | | | | | | | | | 'm_physicsScene' to match coding conventions and reduce confusion.
generated by cgit v1.1 at 2024-12-30 16:06:35 +0000