aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/lib32 (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-02-222-0/+0
|\
| * BulletSim: add calls for creating all the different Bullet constraint types.Robert Adams2013-02-172-0/+0
| | | | | | | | | | Updated the DLLs and SOs and code for BulletXNA to create the types. All the detailed control calls are not all in place yet.
* | Merge branch 'master' into careminsterMelanie2013-02-132-0/+0
|\ \ | |/
| * BulletSim: fix density since the simulator/viewer track density in aRobert Adams2013-02-122-0/+0
| | | | | | | | | | | | | | | | | | | | | | 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).
* | Merge branch 'master' into careminsterMelanie2013-02-102-0/+0
|\ \ | |/ | | | | | | | | 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/+0
| | | | | | | | DLLs and SOs for setting same.
* | Merge branch 'master' into careminsterMelanie2013-02-062-0/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
| * BulletSim: make removing zero width triangles from meshes optionalRobert Adams2013-02-051-0/+0
| | | | | | | | and, for the moment, default to 'off'.
| * BulletSim: rework some parameter setting implementation moving functionality ↵Robert Adams2013-02-052-0/+0
| | | | | | | | 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.
* | Merge branch 'master' into careminsterMelanie2013-01-312-0/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
| * BulletSim: do not zero an avatar's standing velocity if it is standingRobert Adams2013-01-282-0/+0
| | | | | | | | | | | | | | on a moving object. Rearrange pre/post action subscription code to put more in locks. Add meshmerizer params to BulletSimTestUtil scene creation (and fix line endings). Rebuilt version of DLLs and SOs with cleaned up code and no profiling for sure.
| * BulletSim: update Bullet with profiling disabled. This seems to fix the ↵Robert Adams2013-01-282-0/+0
| | | | | | | | memory leak problem.
* | Merge branch 'master' into careminsterMelanie2013-01-242-0/+0
|\ \ | |/
| * BulletSim: pass up and report the real collision penetration.Robert Adams2013-01-232-0/+0
| |
* | Merge commit '8bf0a9f85dda4b1831630b65620d5c6868196c11' into careminsterMelanie2013-01-162-0/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * BulletSim: move center of gravity of linkset to its geometric center.Robert Adams2013-01-112-0/+0
| | | | | | | | | | | | | | Necessitated allowing simulator and physical position of a body to get out of sync since Bullet assumes that <0,0,0> is the center of mass. Update DLLs and SOs for the UpdateChildTransform so positions of individual prim in a linkset can be implemented.
* | Merge branch 'master' into careminsterMelanie2013-01-102-0/+0
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * BulletSim: update DLLs and SOs with better debugging output.Robert Adams2013-01-062-0/+0
| | | | | | | | | | Add definition of hand crafted avatar mesh. Not used yet. Comments and cleanup.
* | Merge branch 'master' into careminsterMelanie2013-01-062-0/+0
|\ \ | |/
| * BulletSim: add ResetBroadphasePool and ResetConstraintSolver diagnosticRobert Adams2013-01-042-0/+0
| | | | | | | | | | functions. If values set from console, the functions are called. Looking for why the collision pools fill up with unnecessary stuff.
* | Merge branch 'master' into careminsterMelanie2013-01-022-0/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * BulletSim: eliminate the use of the unmanaged HeightMapInfo structure.Robert Adams2012-12-312-0/+0
| | | | | | | | | | Remove all related calls from the unmanaged and BSAPITemplate interfaces. Update DLLs and SOs to include the version without HeightMapInfo structures.
| * BulletSim: complete movement of BulletSimAPI functions to BSAPITemplate.Robert Adams2012-12-312-0/+0
| | | | | | | | Update BulletSim DLLs and SOs with simplier step function interface.
* | Merge branch 'master' into careminsterMelanie2012-12-072-0/+0
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * BulletSim: update DLLs and SOs with vehicle collision event checkRobert Adams2012-12-062-0/+0
| |
* | Merge branch 'master' into careminsterMelanie2012-12-042-0/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
| * BulletSim: Reduce idle region physics overhead where there are MANYRobert Adams2012-12-032-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | static objects by more restrictive selection of objects that collide with static objects. Rename collision mask fuctions from 'filter' to 'group' so it is clear what is being set. Rename BulletSimAPI.SetCollisionFilterMask() to SetCollisionGroupMask to match above. Restore passing of time step to linear and angular motion component routines. Use buffering vehicle physical parameter get/set routines consistantly. Make range enforcement clearer by using ClampInRange() function for parameter setting. Remove commented out experimental vehicle calculations.
| * BulletSim: Add DumpActivationInfo2 function. Change static objects from ↵Robert Adams2012-12-012-0/+0
| | | | | | | | DISABLE_SIMULATION to ISLAND_SLEEPING. Update DLLs and SOs to add DumpActivationInfo2 function.
* | Merge branch 'master' into careminsterMelanie2012-11-302-0/+0
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs OpenSim/Region/Physics/Meshing/Meshmerizer.cs
| * BulletSim: update DLLs and SOs to remove simulator crash when calling ↵Robert Adams2012-11-282-0/+0
| | | | | | | | SetInterpolationAngularVelocity.
| * BulletSim: update DLLs and SOs with new collision margin setting function.Robert Adams2012-11-252-0/+0
| |
* | Merge branch 'master' into careminsterMelanie2012-11-222-0/+0
|\ \ | |/
| * BulletSim: update DLLs and SOs. No functional changes. Only the parameter ↵Robert Adams2012-11-212-0/+0
| | | | | | | | block format changed.
* | Merge branch 'master' into careminsterMelanie2012-11-192-0/+0
|\ \ | |/
| * BulletSim: remove the obsolete interface to the Bullet code. Update ↵Robert Adams2012-11-182-0/+0
| | | | | | | | BulletSim libraries with code stripped of the obsolete code.
* | Merge branch 'master' into careminsterMelanie2012-11-082-0/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
| * BulletSim: update the DLLs and SOsRobert Adams2012-11-062-0/+0
| |
* | Merge branch 'master' into careminsterMelanie2012-11-042-0/+0
|\ \ | |/
| * BulletSim: update the DLLs and SOsRobert Adams2012-11-032-0/+0
| |
* | Merge branch 'master' into careminsterMelanie2012-10-262-0/+0
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
| * BulletSim: update binaries with small change that insures that manual ↵Robert Adams2012-10-232-0/+0
| | | | | | | | position/rotation setting results in an update event.
* | Merge branch 'master' into careminsterMelanie2012-10-202-0/+0
|\ \ | |/
| * Bulletsim: update DLLs and SOs. Brings C++ routine in sync with C# sources ↵Robert Adams2012-10-192-0/+0
| | | | | | | | and fixes problem where BulletSim would crash on startup on 32 bit Linux.
* | Merge branch 'master' into careminsterMelanie2012-10-122-0/+0
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * BulletSim: update the DLLs and SOsRobert Adams2012-10-112-0/+0
| |
* | Merge branch 'master' into careminsterMelanie2012-10-032-0/+0
|\ \ | |/
| * BulletSim: fix crash on load that showed up on 32bit Linux.Robert Adams2012-10-022-0/+0
| |
* | Merge branch 'master' into careminsterMelanie2012-09-292-0/+0
|\ \ | |/ | | | | | | | | | | Conflicts: CONTRIBUTORS.txt OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
| * BulletSim: update SOs and DLLsRobert Adams2012-09-282-0/+0
| |
* | Merge branch 'master' into careminsterMelanie2012-09-243-0/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
generated by cgit v1.1 at 2024-10-23 15:23:44 +0000