aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/lib32 (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * Update libopenjpeg libraries used by libopenmetaverse back up to 1.5, this ↵Justin Clark-Casey (justincc)2012-09-201-0/+0
| | | | | | | | time using lkalif's linux libraries built against a much earlier libc (2.7)
| * Downgrade libopenjpeg back to 1.3 from 1.5.Justin Clark-Casey (justincc)2012-09-191-0/+0
| | | | | | | | | | This is because libopenjpeg 1.5 appears to require a minimum of glibc 2.14, whereas at least one fairly recent distro (openSUSE 11.4 from 2011-03-10) only has glibc Further investigation pending.
| * Update libopenmetaverse components to commit f5cecaajustincc2012-09-183-0/+0
| | | | | | | | | | | | | | Among other things this allows pCampbot to work under Windows since libopenmateverse now ships the same log4net.dll (publicly signed) as OpenSimulator This also updates the libopenmetaverse embedded libopenjpeg from 1.3 to 1.5. DLL naming and mapping for non-Windows libopenjpeg changes to remove version number to make future udpates easier and bring it into line with names of other shipped DLLs. libopenjpeg updates have been made for OSX, Windows (32 and 64 bit) and Linux (32 and 64 bit). Please report any issues.
* | Merge branch 'master' into careminsterMelanie2012-09-162-0/+0
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/Framework/Scenes/EventManager.cs
| * BulletSim: update DLLs and SOs and remove some debugging code.Robert Adams2012-09-152-0/+0
| |
* | Merge branch 'master' into careminsterMelanie2012-09-092-0/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * BulletSim: update the DLLs and SOsRobert Adams2012-09-072-0/+0
| |
* | Merge branch 'master' into careminsterMelanie2012-09-022-0/+0
|\ \ | |/
| * BulletSim: update the SOs and DLLsRobert Adams2012-08-312-0/+0
| |
* | Merge branch 'master' into careminsterMelanie2012-08-232-0/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/IClientAPI.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * BulletSim: update DLLs and SOs to eliminate terrain update crash which ↵Robert Adams2012-08-212-0/+0
| | | | | | | | manifested itself on Linux.
* | Merge branch 'master' into careminsterMelanie2012-08-182-0/+0
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * BulletSim: update DLLs and SOs to fix the problem with avatars jumping ↵Robert Adams2012-08-152-0/+0
| | | | | | | | around at altitudes less than 25m.
* | Merge branch 'master' into careminsterMelanie2012-08-162-0/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs