ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 08:06:27 +08:00
Code Issues Packages Projects Releases Wiki Activity
24,902 Commits 5 Branches 88 Tags
5f364dbed5ecc46240c727cdc8103db2d4d2dce3
Commit Graph

673 Commits

Author SHA1 Message Date
Melanie
4ccb15290e Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2014-01-28 20:47:36 +00:00
Robert Adams
239b85d7ce Fix crash in BulletSim which sometimes happens making a linkset physical 
(like sitting on and activating a vehicle) and crossing borders.
This keeps better bookkeeping on compound shapes so BulletSim can
identify them when being freed.
 2014-01-10 22:52:31 -08:00
Melanie
91b70bf3fe Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
 2013-11-08 17:55:01 +00:00
Melanie
ba203ed94f Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2013-11-03 21:34:36 +00:00
Robert Adams
93d5d66fbd BulletSim: update collision flags to make sure they fit in the shorts provided. 2013-10-26 21:20:19 -07:00
Robert Adams
511122834b BulletSim: change collision flags for groundplane to not interact with static objects. 
Reorder collision flag setting code for terrain to fit pattern used elsewhere.
 2013-10-23 16:07:03 -07:00
Robert Adams
766a31431e BulletSim: implement the SL bug where VEHICLE_HOVER_UP_ONLY disables 
the vehicle buoyancy if the vehicle is above its hover height.

This is a known misfeature of this vehicle flag which has been accepted
since it would break too many implementations. The problem is noticed
when creating a jetski-like vehicle that jumps over sand bars. A boat
normally is configured with neutral buoyancy and hovering at water
height. When it jumps the sandbar, it needs to have gravity applied
to get back to water level.
 2013-10-15 17:02:22 -07:00
Robert Adams
8b5e2f2cd2 BulletSim: Fix snap back from edge of region problem. Mantis 6794. 2013-10-11 13:29:43 -07:00
Melanie
69054ad134 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/Servers/VersionInfo.cs
	OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
 2013-10-06 18:32:20 +01:00
Justin Clark-Casey (justincc)
42bdf44658 Bump OPenSimulator version and assembly versions up to 0.8.0 Dev 2013-10-04 23:33:47 +01:00
Melanie
75c68fa29e Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
	OpenSim/Data/MySQL/Resources/RegionStore.migrations
	OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
	OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
	OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs
	OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2013-10-04 20:03:12 +01:00
Robert Adams
35a6361b24 BulletSim: reduce avatar walking stopped threshold. 
Add parameter for setting the walking stopped threshold.

This fixes the slight jump when an avatar stops walking.
 2013-09-20 09:58:45 -07:00
Robert Adams
07d7a5fd76 BulletSim: zero velocity when avatar not moving. 
This fixes a movement jitter that happens when an avatar is standing on a
tilted surface.
 2013-09-20 09:58:25 -07:00
Robert Adams
dacc20ee48 BulletSim: remove collision cache clearing logic for physical objects. 
This fixes constraints from getting messed up when properties change.
 2013-09-11 16:50:27 -07:00
Robert Adams
6e39cc316f BulletSim: add ClearCollisionProxyCache function to API. 
Add proxy cache clearing when some properties are changed. This fixes
a problem where objects would stop colliding of they were moved
with setPosition mulitple times.
 2013-09-11 09:12:24 -07:00
Robert Adams
c5eabb28b4 BulletSim: add LSL function and plumbing for setting a spring 
equilibrium point in the physics engine constraint.
 2013-09-11 09:12:19 -07:00
Robert Adams
5827b6e1aa BulletSim: add extended physics LSL constants for axis specification. 
Add specific error warnings for mis-matched parameter types in extended
   physics functions.
 2013-09-11 09:12:18 -07:00
Robert Adams
cf2cdc191d BulletSim: ability to specify groups of axis to modify in constraint parameters that control multiple axis. Add useLinearReferenceFrameA constraint parameter. 2013-09-11 09:12:16 -07:00
Robert Adams
7c54630a2d BulletSim: add axis parameter for specifying enable, damping, and stiffness for spring constraints. Renumber parameter ops since I can as no one is using them yet. 2013-09-11 09:12:14 -07:00
Robert Adams
30b3657a66 BulletSim: implementation of setting spring specific physical parameters. Add setting of linkset type to physChangeLinkParams. Lots of detail logging for setting of linkset constraint parameters. 2013-09-11 09:12:12 -07:00
Robert Adams
67195618d5 BulletSim: add requestor's ID to post taint detail log message. 2013-09-11 09:12:10 -07:00
Robert Adams
d09c35f506 BulletSim: pass both root and child BSPhysObjects to Extension function. Update routines to use the new parameters list from above change. 2013-09-11 09:12:05 -07:00
Robert Adams
995314f91f BulletSim: add ID parameter to TaintedObject calls so logging will include LocalID of object which created the taint. 2013-09-11 09:12:03 -07:00
Robert Adams
4781297b4e BulletSim: Extension parameters passed through the classes made to pass just and array of objects rather than a mixture of parameters and array. Makes understanding and parsing what is being passed much easier. 2013-09-11 09:12:02 -07:00
Robert Adams
6d83f3f021 BulletSim: adjust avatar capsule height calculation to be closer to defined SL heights. Correct BSParam avatar height defaults to be what's in OpenSimDefaults.ini. 2013-09-11 09:12:00 -07:00
Robert Adams
e1120cb74d BulletSim: add extended physics function physGetLinkType(linkNum). Add implementation of physChangeLinkParams() in BSLinksetConstraint. 2013-09-11 09:11:58 -07:00
Robert Adams
f6fdfd16f5 BulletSim: change ExtendedPhysics constants to 'const' so they can be used as case variables in switch statements. 2013-09-11 09:11:54 -07:00
Robert Adams
455d36c4c7 BulletSim: add physChangeLinkParams to set individual parameters on link constraints. Not fully functional. Remove double definition of ExtendedPhysics parameters by having BulletSim reference the optional module (addition to prebuild.xml and usings). 2013-09-11 09:11:52 -07:00
Robert Adams
b2a1348adc BulletSim: update C++ HACD parameters to values that handle enclosed hollow spaces better. This shouldn't affect many since this HACD routine is off by default. 2013-09-11 09:11:50 -07:00
Robert Adams
6aee08ac3c BulletSim: add physChangeLinkSpring to change linkset link to be a spring constraint. Add implementation to create spring constraint. Send up property updates for linkset children at the end of flexible linkset links. The simulator probably doesn't do the right thing yet. 2013-09-11 09:11:48 -07:00
Robert Adams
dff0fb5690 BulletSim: Linkset.Refresh() calls internal ScheduleRebuild() to recreate the linkset physics at next PostTaint time. Replace the existing calls to ScheduleRebuild to be calls to Refresh(). This allows external routines to make changes to parameters and then cause the linkset to rebuild. 2013-09-11 09:11:46 -07:00
Robert Adams
f3cc20050e BulletSim: initial implementation of physChangeLinkFixed that resets a linkset's link back to a fixed, non-moving connection. 2013-09-11 09:11:45 -07:00
Robert Adams
c6a6631efc BulletSim: move linkset extension operations into BSPrimLinkable where they should be. 2013-09-11 09:11:43 -07:00
Robert Adams
993bcec088 BulletSim: add unmanaged and XNA functions for hinge, slider and spring constraints. 2013-09-11 09:11:41 -07:00
Robert Adams
0971c7ae77 BulletSim: complete linkage of spring constraint into linkset constraint. 2013-09-11 09:11:39 -07:00
Robert Adams
9a7d0e489c BulletSim: add spring constraint to linkset constraint types. 2013-09-11 09:11:37 -07:00
Robert Adams
48ee73bfa7 BulletSim: add API and calls for spring constraint parameters. 2013-09-11 09:11:36 -07:00
Robert Adams
725751fd6c BulletSim: fixes for change linkset implementation of physical linksets. 2013-09-11 09:11:34 -07:00
Melanie
008c98a974 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/World/Region/RestartModule.cs
	OpenSim/Region/Framework/Scenes/SceneGraph.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
 2013-09-01 22:49:31 +01:00
Robert Adams
0882cf0fc3 BulletSim: add some protections for processing when shutting down. 
Attempt to fix Mantis 6740 (http://opensimulator.org/mantis/view.php?id=6740).
 2013-08-27 09:55:50 -07:00
teravus
a6af561660 * Fix some threading issues in BulletXNA (the managed bullet library), this should better allow you to run it in multiple region scenarios (but why would you really want to do that?) Source in OpenSimLibs. 
* Fixed a null ref during shutdown.
 2013-08-20 21:09:17 -05:00
Melanie
bef03fb30b Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
 2013-08-17 03:23:45 +01:00
Robert Adams
e8b1e91a1d BulletSim: include check for volume detect in check for zeroing avatar motion. 
Normally, avatar motion is zeroed if colliding with a stationary object so
they don't slide down hills and such. Without volume detect check this also
allowed avatars to stand on volume detect objects and to have some jiggling
when they were in the volume detect object. This commit fixes both.
 2013-08-14 14:49:24 -07:00
Robert Adams
7c3b71d294 BulletSim: add physical object initialized flag so updates and collisions 
don't happen until the object is completely initialized.

This fixes the problem of doing a teleport while the simulator is running.
The destruction of the physical object while the engine is running means
that the physics parameter update would overwrite the new position of the
newly created avatar.
 2013-08-14 14:49:22 -07:00
Melanie
df7a1e68f6 Merge branch 'master' into careminster 2013-08-14 21:25:22 +01:00
Robert Adams
0feb5da31e BulletSim: move the creation of the avatar movement actor creating to 
taint time. Attempt to fix a problem of teleporting within the same
region where the remove and addition of the physical avatar occasionally
ends up with a non-moving avatar.
 2013-08-13 21:06:24 -07:00
Melanie
4a6eff1ee8 Merge branch 'master' into careminster 2013-08-13 22:53:47 +01:00
Robert Adams
2c31fe4614 BulletSim: add check in avatar stair step code to verify the collision 
is not with a volume detect object.

This fixes a problem of avatars trying to step over a volume detect object
that they collide with. This appeared as the avatar popping up as it started
to step up but then continuing on since the object wasn't physically interacting.
 2013-08-12 13:44:53 -07:00
Melanie
ad1b2902f2 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Application/OpenSimBase.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2013-08-11 17:31:25 +01:00
Robert Adams
6410a25cef BulletSim: adjust avatar position when the avatar's size is changed. 
This fixes the problem of avatars bouncing when logged in.
Added a little height to the avatar height fudges to eliminate a problem
of feet being in the ground a bit.
 2013-08-08 13:55:17 -07:00