aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'master' into careminsterMelanie2013-08-076-86/+280
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * BulletSim: When converting linkset types, don't try to change the listRobert Adams2013-08-021-9/+20
| | | | | | | | of linkset children while iterating through the list.
| * BulletSim: add implementation of 'physSetLinksetType' and 'physGetLinksetType'Robert Adams2013-08-026-0/+95
| | | | | | | | | | and processing routines in BulletSim. Add linkset rebuild/conversion routine in BSLinkset.
| * BulletSim: add BSLinkInfo structure to remember link specific informationRobert Adams2013-08-023-86/+174
| | | | | | | | | | | | for each link in a linkset. Extend BSLinksetConstraint to create and use BSLinkInfo with the default static constraint.
* | Merge branch 'master' into careminsterMelanie2013-08-016-51/+83
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
| * BulletSim: distribute vehicle physical settings to all members ofRobert Adams2013-07-303-43/+61
| | | | | | | | | | | | a linkset. Enables constraint based linksets. Rename some internal variables to clarify whether values world or vehicle relative.
| * BulletSim: make density display and return value consistant with howRobert Adams2013-07-303-8/+22
| | | | | | | | the simulator expects it (scaled to 100kg/m^3).
* | Merge branch 'master' into careminsterMelanie2013-07-2410-65/+297
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Physics/Manager/PhysicsActor.cs OpenSim/Region/Physics/Manager/PhysicsScene.cs
| * BulletSim: Turn on center-of-mass calculation by default.Robert Adams2013-07-232-5/+7
| | | | | | | | | | Reduce object density by factor of 100 to bring physical mass computations into a range better suited for Bullet.
| * Revert "Revert "BulletSim: Add logic to linksets to change physical ↵Robert Adams2013-07-233-7/+59
| | | | | | | | | | | | | | | | properties for"" Found that the vehicle movement problem was not caused by these physics changes. This reverts commit 84d0699761b8da546f9faef084240d7b15f16321.
| * Revert "Revert "BulletSim: change BSDynamics to expect to be passed a ↵Robert Adams2013-07-231-2/+15
| | | | | | | | | | | | | | | | BSPrimLinkable"" Found that the vehicle movement problem was not caused by these physics changes. This reverts commit 7b187deb19517aa7c880458894643a5448566a94.
| * Revert "Revert "BulletSim: only create vehicle prim actor when vehicles are ↵Robert Adams2013-07-232-12/+33
| | | | | | | | | | | | | | | | enabled."" Found that the vehicle movement problem was not caused by these physics changes. This reverts commit 5f7b2ea81b95a60e882bc65b663a2c9fe134f92a.
| * Revert "Revert "BulletSim: move collision processing for linksets from ↵Robert Adams2013-07-235-18/+121
| | | | | | | | | | | | | | | | BSPrimLinkable"" Found that the vehicle movement problem was not caused by these physics changes. This reverts commit c45659863d8821a48a32e5b687c7b2a6d90b0300.
| * Revert "Revert "BulletSim: freshen up the code for constraint based linksets.""Robert Adams2013-07-233-23/+64
| | | | | | | | | | | | Found that the vehicle movement problem was not caused by these physics changes. This reverts commit 44543ebe638f391fc1c7ff532fe4470006dec55a.
| * Revert "BulletSim: freshen up the code for constraint based linksets."Robert Adams2013-07-223-64/+23
| | | | | | | | | | | | The changes don't seem to be ready for prime time. This reverts commit 803632f8f32d91bb4aec678d8b45a8430c2703e1.
| * Revert "BulletSim: move collision processing for linksets from BSPrimLinkable"Robert Adams2013-07-225-121/+18
| | | | | | | | | | | | The changes don't seem to be ready for prime time. This reverts commit b4c3a791aa55390bff071b3fe4bbe70c1d252703.
| * Revert "BulletSim: only create vehicle prim actor when vehicles are enabled."Robert Adams2013-07-222-33/+12
| | | | | | | | | | | | The changes don't seem to be ready for prime time. This reverts commit acb7b4a09ad564d1dfae3ad12adbb593ca3942c9.
| * Revert "BulletSim: change BSDynamics to expect to be passed a BSPrimLinkable"Robert Adams2013-07-221-15/+2
| | | | | | | | | | | | The changes don't seem to be ready for prime time. This reverts commit d0d654e2186c8b81c1150da89a549e4f7162a2b4.
| * Revert "BulletSim: Add logic to linksets to change physical properties for"Robert Adams2013-07-223-59/+7
| | | | | | | | | | | | The changes don't seem to be ready for prime time. This reverts commit b44f0e1a00eba7f76401692322e48a3b23a81164.
| * BulletSim: Add logic to linksets to change physical properties forRobert Adams2013-07-223-7/+59
| | | | | | | | | | | | whole linkset. Override physical property setting for BSLinksetCompound as there are not children to the compound spape.
| * BulletSim: change BSDynamics to expect to be passed a BSPrimLinkableRobert Adams2013-07-221-2/+15
| | | | | | | | | | and start changing the logic to handle the base prim as a complex object (ie, a linkset).
| * BulletSim: only create vehicle prim actor when vehicles are enabled.Robert Adams2013-07-222-12/+33
| |
| * BulletSim: move collision processing for linksets from BSPrimLinkableRobert Adams2013-07-225-18/+121
| | | | | | | | | | | | | | | | | | | | into the linkset implementation classes. Add HasSomeCollision attribute that remembers of any component of a linkset has a collision. Update vehicle code (BSDynamic) to use the HasSomeCollision in place of IsColliding to make constraint based linksets properly notice the ground. Add linkset functions to change physical attributes of all the members of a linkset.
| * BulletSim: freshen up the code for constraint based linksets.Robert Adams2013-07-223-23/+64
| |
* | Merge branch 'master' into careminsterMelanie2013-07-244-11/+30
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
| * BulletSim: add position resetting for stationary avatars so they don'tRobert Adams2013-07-182-5/+20
| | | | | | | | | | | | move around when standing on a stationary object. Create proper linkage between BSCharacter and its actor by generating a UpdatedProperties event the same way BSPrim does.
| * BulletSim: fix small bug where everything looked like it was collidingRobert Adams2013-07-172-6/+10
| | | | | | | | before the first simulator step.
* | Merge branch 'master' into careminsterMelanie2013-07-1812-437/+470
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs OpenSim/Server/Handlers/Simulation/AgentHandlers.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs OpenSim/Services/HypergridService/UserAgentService.cs
| * BulletSim: add parameter to optionally disable vehicle linear deflection.Robert Adams2013-07-092-16/+34
| | | | | | | | | | | | Add parameter to not apply vehicle linear deflection Z forces if vehicle is not colliding. This defaults to 'true' so vehicles will fall even if there is some linear deflection to apply.
| * BulletSim: make all the different angularVerticalAttraction algorithmsRobert Adams2013-07-084-138/+146
| | | | | | | | | | | | | | | | selectable from configuration paramters. Changed default algorithm to "1" from previous default as it seems to handle Y axis correction a little better. Add config file independent enablement of vehicle angular forces to make debugging easier (independent testing of forces).
| * BulletSim: Different Implementation of Angular Deflection for vehicles, ↵Vegaslon2013-07-071-15/+16
| | | | | | | | | | | | Activates it again and fixes problem with fighting with vertical attractor removing wobble of forward axis. Comments on testing welcome, May require adjustments of this force or other forces after this commit, exact tweaking to come after testing on other hardware. Signed-off-by: Robert Adams <Robert.Adams@intel.com>
| * BulletSim: fix jumping up and down of linksets when center-of-massRobert Adams2013-07-071-6/+2
| | | | | | | | | | | | was enabled. Didn't effect the physical position but the viewer saw the linkset jumping between its simulator center and its physical center.
| * BulletSim: rename position and orientation variables to remove theRobert Adams2013-07-073-95/+71
| | | | | | | | inconsistant use of Raw* and _* conventions.
| * BulletSim: implementation of linkset center-of-mass.Robert Adams2013-07-065-29/+70
| | | | | | | | | | | | Default off, for the moment, until more testing. Add separate thread and center-of-mass flags to OpenSimDefaults.ini. Clean up comments in OpenSimDefaults.ini.
| * BulletSim: More tweaking on center-of-mass. Almost there. Changes have no ↵Robert Adams2013-07-064-101/+51
| | | | | | | | effect if LinksetOffsetCenterOfMass=false (the default).
| * BulletSim: comments and non-functional changes working toward the ↵Robert Adams2013-07-064-20/+39
| | | | | | | | center-of-gravity implementation.
| * BulletSim: non-functional updates. Comments and formatting.Robert Adams2013-07-064-43/+67
| | | | | | | | Update TODO list.
* | Merge branch 'master' into careminsterMelanie2013-07-0412-74/+182
|\ \ | |/
| * BulletSim: add the reset of the last commit for flush log file problems.Robert Adams2013-06-302-2/+2
| | | | | | | | Fix small typo in one log message.
| * BulletSim: fix an occasional crash with flushing log files.Robert Adams2013-06-301-4/+2
| |
| * BulletSim: remove the handle to the vehicle actor and cause routinesRobert Adams2013-06-302-32/+70
| | | | | | | | that need it to look it up.
| * BulletSim: set linkset type to be prim specific rather than a simulatorRobert Adams2013-06-303-15/+8
| | | | | | | | | | wide default. This allows individual prims to differ in the underlying linkset implementation.
| * BulletSim: a better version of llMoveToTarget that doesn't go crazy.Robert Adams2013-06-305-19/+98
| | | | | | | | | | | | | | | | There is still some overshoot but mostly fixes Mantis 6693. Fix bug where moveToTarget was active for non-physical objects and while selected. Fix bug where move target was not getting changed if the script changed the target during a move.
| * BulletSim: add inTaintTime parameter to collision cache clear function.Robert Adams2013-06-301-3/+3
| |
* | Merge branch 'master' into careminsterMelanie2013-06-233-21/+92
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * BulletSim: move new linear deflection code to own routine.Robert Adams2013-06-211-29/+35
| | | | | | | | | | Remove VehicleForwardVelocity changed storage since the value will be modified as movement is processed.
| * BulletSim: Implementation of Linear Deflection, it is a partial help for the ↵Vegaslon2013-06-201-5/+33
| | | | | | | | | | | | vehicle tuning diffrence between Opensim and Second life. Signed-off-by: Robert Adams <Robert.Adams@intel.com>
| * BulletSim: rework velocity updating when not colliding and not flyingRobert Adams2013-06-202-5/+42
| | | | | | | | | | | | | | to prevent infinite jumps. Now jumps last only AvatarJumpFrames long (default 4) which is about as high as in SL. TODO: jumping should only depend on standing (collision with feet) rather than collision anywhere on the avatar.
* | Merge branch 'master' into careminsterMelanie2013-06-132-14/+30
|\ \ | |/
| * BulletSim: when meshing or asset fetching fails, include positionRobert Adams2013-06-112-14/+30
| | | | | | | | and region with the offending object's name in the error message.