OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
22,793 Commits
104 Branches
0 Tags
299 MiB
Commit Graph

90 Commits (12f732fd3f1883dc016fc801bfd834290aa1cd06)

Author SHA1 Message Date
Melanie 069e587841 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
	OpenSim/Data/MySQL/Resources/RegionStore.migrations
 2013-02-10 00:17:14 +00:00
Robert Adams 4808b8ee38 BulletSim: add parameter to set global contact breaking threshold. Update DLLs and SOs for setting same. 2013-02-08 16:29:52 -08:00
Melanie f567ff9f51 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
 2013-02-06 02:22:12 +00:00
Robert Adams 3646361279 BulletSim: make removing zero width triangles from meshes optional 
and, for the moment, default to 'off'.
 2013-02-05 17:19:55 -08:00
Robert Adams ad438ee59f BulletSim: rework some parameter setting implementation moving functionality 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. 2013-02-05 16:56:23 -08:00
Melanie 9a4de546fe Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
 2013-01-31 02:53:11 +00:00
Robert Adams e9aff0a91d BulletSim: do not zero an avatar's standing velocity if it is standing 
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.
 2013-01-28 15:11:50 -08:00
Robert Adams 2cd56014a7 BulletSim: update Bullet with profiling disabled. This seems to fix the memory leak problem. 2013-01-28 06:21:51 -08:00
Melanie 2ce4a758e2 Merge branch 'master' into careminster 2013-01-24 00:27:00 +00:00
Robert Adams 1c3d84fe03 BulletSim: pass up and report the real collision penetration. 2013-01-23 16:20:44 -08:00
Melanie fc5711fa7a Merge commit '8bf0a9f85dda4b1831630b65620d5c6868196c11' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
 2013-01-16 01:11:20 +00:00
Robert Adams 459fcd81c9 BulletSim: move center of gravity of linkset to its geometric center. 
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.
 2013-01-11 16:47:53 -08:00
Melanie 3a495ccd56 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
 2013-01-10 01:38:03 +00:00
Robert Adams 9393403253 BulletSim: update DLLs and SOs with better debugging output. 
Add definition of hand crafted avatar mesh. Not used yet.
Comments and cleanup.
 2013-01-06 14:01:15 -08:00
Melanie 40955fee2a Merge branch 'master' into careminster 2013-01-06 10:52:16 +00:00
Robert Adams 2eda385f5e BulletSim: add ResetBroadphasePool and ResetConstraintSolver diagnostic 
functions. If values set from console, the functions are called. Looking
for why the collision pools fill up with unnecessary stuff.
 2013-01-04 17:06:48 -08:00
Melanie 7943c8d11c Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2013-01-02 11:52:37 +00:00
Robert Adams 9396ccc078 BulletSim: eliminate the use of the unmanaged HeightMapInfo structure. 
Remove all related calls from the unmanaged and BSAPITemplate interfaces.
Update DLLs and SOs to include the version without HeightMapInfo structures.
 2012-12-31 19:57:25 -08:00
Robert Adams 3d0fc70864 BulletSim: complete movement of BulletSimAPI functions to BSAPITemplate. 
Update BulletSim DLLs and SOs with simplier step function interface.
 2012-12-31 19:57:24 -08:00
Melanie 2cb824d3fc Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-12-07 03:49:04 +00:00
Robert Adams 707e186aa3 BulletSim: update DLLs and SOs with vehicle collision event check 2012-12-06 09:34:30 -08:00
Melanie 5837e731bf Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
 2012-12-04 23:01:18 +00:00
Robert Adams 787636b97a BulletSim: Reduce idle region physics overhead where there are MANY 
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.
 2012-12-03 16:25:51 -08:00
Robert Adams b124aae05e BulletSim: Add DumpActivationInfo2 function. Change static objects from DISABLE_SIMULATION to ISLAND_SLEEPING. Update DLLs and SOs to add DumpActivationInfo2 function. 2012-12-01 15:39:13 -08:00
Melanie daa1d99513 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
	OpenSim/Region/Physics/Meshing/Meshmerizer.cs
 2012-11-30 01:19:08 +00:00
Robert Adams 24b3b4df2e BulletSim: update DLLs and SOs to remove simulator crash when calling SetInterpolationAngularVelocity. 2012-11-28 09:48:41 -08:00
Robert Adams bd635e264a BulletSim: update DLLs and SOs with new collision margin setting function. 2012-11-25 20:04:31 -08:00
Melanie c4c6121752 Merge branch 'master' into careminster 2012-11-22 03:17:33 +00:00
Robert Adams 56ef180c92 BulletSim: update DLLs and SOs. No functional changes. Only the parameter block format changed. 2012-11-21 16:44:02 -08:00
Melanie 9f2d232c71 Merge branch 'master' into careminster 2012-11-19 22:53:03 +00:00
Robert Adams 079a1e704f BulletSim: remove the obsolete interface to the Bullet code. Update BulletSim libraries with code stripped of the obsolete code. 2012-11-18 18:17:30 -08:00
Melanie b3e99a4d48 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
 2012-11-08 04:51:00 +00:00
Robert Adams 6df9d40d99 BulletSim: update the DLLs and SOs 2012-11-06 18:17:00 -08:00
Melanie c623e35805 Merge branch 'master' into careminster 2012-11-04 22:44:42 +00:00
Robert Adams 895d28f14d BulletSim: update the DLLs and SOs 2012-11-03 21:28:23 -07:00
Melanie e7a6328ea4 Merge branch 'master' into careminster 2012-11-01 15:52:32 +00:00
Justin Clark-Casey (justincc) ccb17eab71 Replace the 64 bit macosx version of libopenjpeg-dotnet.dylib with a 32-bit version from libopenmetaverse commit 3731ee4 
This is because macosx mono is 32-bit and this can't p/invoke 64-bit binaries.
However, the reverse is also true.
If OpenSimulator stops working for you then please complain!  Long term alternative is probably to build a fat binary with both architectures.
 2012-11-01 03:31:30 +00:00
Melanie 26cc57b6ca Merge branch 'master' into careminster 
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
 2012-10-26 21:13:01 +01:00
Robert Adams de47646c3d BulletSim: update binaries with small change that insures that manual position/rotation setting results in an update event. 2012-10-23 17:34:14 -07:00
Melanie 6ad8d3c43f Merge branch 'master' into careminster 2012-10-20 02:33:24 +01:00
Robert Adams 45df324ab3 Bulletsim: update DLLs and SOs. Brings C++ routine in sync with C# sources and fixes problem where BulletSim would crash on startup on 32 bit Linux. 2012-10-19 15:47:51 -07:00
Melanie 6ce93b22d1 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-10-12 19:05:06 +01:00
Robert Adams b63134764f BulletSim: update the DLLs and SOs 2012-10-11 14:01:35 -07:00
Melanie 8a552ac907 Merge branch 'master' into careminster 2012-10-03 17:40:13 +01:00
Robert Adams a5b8359b8e BulletSim: fix crash on load that showed up on 32bit Linux. 2012-10-02 17:04:33 -07:00
Melanie 71dd55a1ce Merge branch 'master' into careminster 
Conflicts:
	CONTRIBUTORS.txt
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
 2012-09-29 19:21:07 +01:00
Robert Adams 7f96bb601a BulletSim: update SOs and DLLs 2012-09-28 12:51:47 -07:00
Melanie bbaf2c5a80 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-09-24 20:14:00 +01:00
Justin Clark-Casey (justincc) e50b6b5334 Update libopenjpeg libraries used by libopenmetaverse back up to 1.5, this time using lkalif's linux libraries built against a much earlier libc (2.7) 2012-09-20 01:26:35 +01:00
Justin Clark-Casey (justincc) e50155ebca Downgrade libopenjpeg back to 1.3 from 1.5. 
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.
 2012-09-19 00:35:06 +01:00