UbitUmarov
|
aeb5aed5b7
|
changed - VolumeDetect and phantom setting interaction. Script VD(true) forces phantom ON. UI phantom off turns off VD. Other transitions should only change specific parameter. This is not as current SL. - Fixed volumedetect prims being wrongly removed from physics.
|
2012-04-19 23:01:22 +01:00 |
UbitUmarov
|
9b02e1cf4a
|
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
|
2012-04-19 01:52:23 +01:00 |
Melanie
|
411bd0574d
|
Allow setting a specific target velocity on TeleportWithMomentum
|
2012-04-18 22:16:59 +02:00 |
Melanie
|
5936e0c376
|
Allow scripts in attachments owned by the NPC to control the NPC
|
2012-04-18 19:51:27 +02:00 |
UbitUmarov
|
08714a0d38
|
ubitODE still retouching character pid
|
2012-04-18 03:59:38 +01:00 |
UbitUmarov
|
7f42069295
|
ubitODE - retouch character PIDs
|
2012-04-18 03:02:28 +01:00 |
Melanie
|
0fe0b2ceec
|
Prevent objects rezzed in sim from being seen as attachments and becoming uneditable or crashers. (Foxtail of death)
|
2012-04-17 23:39:41 +02:00 |
UbitUmarov
|
9464fcebcd
|
ubitODE: prims - update managed dinamic parameters from unmanaged at ODE rate and not heartbeat.
|
2012-04-17 16:49:08 +01:00 |
UbitUmarov
|
9132c9e499
|
ubitODE: - character managed ode was only getting position etc from unmanaged at heartbeat rate like core ode. Now do it at ODE rate in move(..). UpdatePositionAndVelocity() called once per heartbeat is now empty.
|
2012-04-17 15:50:14 +01:00 |
UbitUmarov
|
d7e2454281
|
ubitODE: - made avatar/ground collision pid servo a bit softer since seems a bit unstable with small avas in AVI even if fine on my testsite - Removed reading of PID parameters from config files since that only serves to mess things up and adds more unknowns
|
2012-04-17 14:24:13 +01:00 |
UbitUmarov
|
36207b88ff
|
ubitODE: bug fix let avatars colide with volume detectors
|
2012-04-17 01:00:50 +01:00 |
Melanie
|
d30b18b1de
|
Merge branch 'ubitwork'
|
2012-04-17 00:09:04 +02:00 |
UbitUmarov
|
723015e4f0
|
fix (http://opensimulator.org/mantis/view.php?id=5965) llGetObjectMass was bad for sitted avatars not checking for the null physicsactor
|
2012-04-16 21:58:25 +01:00 |
UbitUmarov
|
6480b72eda
|
ubitODE: - fix remove characters from default raycasts filters as older code (or camera is very odd) - Slow down avatar if velocity is higher than 50m/s as in chODE
|
2012-04-16 19:44:02 +01:00 |
Melanie
|
adb629a416
|
Merge branch 'ubitwork'
|
2012-04-16 20:02:15 +02:00 |
UbitUmarov
|
fff5c61ae8
|
chODE: if character velocity > 50m/s apply breaks. In free fall this will give a terminal velocity +- 60m/s
|
2012-04-16 17:47:17 +01:00 |
UbitUmarov
|
04ed5519a5
|
chODE bug fix
|
2012-04-16 17:14:31 +01:00 |
UbitUmarov
|
f05a977afa
|
Let llCastRay use ubitODE raycast if avaiable plus a few changes/fixes that should be checked. PROBLEM: it will not detect nonphysical phantons :(
|
2012-04-16 16:35:35 +01:00 |
UbitUmarov
|
25a2f97bc2
|
added suport funtions for ubitODE raycastFiltered
|
2012-04-16 16:33:57 +01:00 |
Melanie
|
03139f07d7
|
Downgrade an error log message to info because there is nothing we can do if
an asset is damaged so it should not spew red ink.
|
2012-04-16 17:32:30 +02:00 |
UbitUmarov
|
86a2169d73
|
ubitODE + physmanager: - Revised use of ODE collisions categories and bits(flags) for better use as filters together with top spaces (for example physical prims are on topactivespace and not physical are on topstaticspace) - Added new world raycast with filters. This blocks calling thread with a timeout of 500ms waiting for heartbeat ode thread signal job done. - Don't let ode bodies being disabled for 2 long except for vehicles. This is necessary to detect when the object is at rest at top of other and that is removed. Assume that vehicles can be enabled by used action.
|
2012-04-16 16:16:55 +01:00 |
UbitUmarov
|
3999822e13
|
Use chode character actor.SetMomentum() to force full restore Velocity in scenepresence TeleportWithMomentum(), since actor.Velocity was selected by original coders as the input of a desired velocity (even 'forces') that is modified by character conditions, like not changing velocity.Z if it is in free fall.
|
2012-04-14 05:07:52 +01:00 |
UbitUmarov
|
b574d43c5d
|
Use presence absolute position to request raycast to camera. Used m_pos maybe a sitting offset. For reasons i don't understand that also seems to crash ode more when i let this rays colide with heighmaps (ubitODE with normal ode lib).
|
2012-04-13 20:34:56 +01:00 |
UbitUmarov
|
5da77e047a
|
don't do Animator.UpdateMovementAnimations() in scenepresence RegionHeartbeatEnd if agent is sitting. Also restore Velocity in teleportWithMomentum()
|
2012-04-13 17:50:03 +01:00 |
UbitUmarov
|
c4a9eae961
|
make llGetGeometricCenter() work as in current SL. Now this is not real geom center but a average of positions relative to root prim ignoring prims details, so no need to use physics engine.
|
2012-04-09 23:33:42 +01:00 |
UbitUmarov
|
39079a62c0
|
chODE and ubitODE always return prim mass (they where returning object mass on physical prims) so SOG can do the total add. (ubitODE as more code to use a simpler terrain geom on a modified ode lib but should do autodetect and work with normal lib).
|
2012-04-09 20:58:40 +01:00 |
UbitUmarov
|
87fdb2ed7e
|
llGetMass and llGetObjectMass (and push estimation) always use object mass as in current SL ( push is what makes sense or impulse will depend on what prim it is and not object). Added llGetMassMKS() that just returns 100 x llGetMass() as it seems to be in SL.
|
2012-04-09 20:53:29 +01:00 |
UbitUmarov
|
ad544bdd3d
|
sop.AddToPhysics(..) fixed and in use. For now it seems it needs to set sop.PhysActor, so made it return void.
|
2012-04-09 18:03:37 +01:00 |
Melanie
|
6b5b73bfae
|
Fix a LSL merge artefact
|
2012-04-08 13:18:03 +02:00 |
Melanie
|
b39de2425c
|
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/CoreModules/World/Land/LandObject.cs
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
|
2012-04-07 04:52:14 +01:00 |
Diva Canto
|
806082cd6e
|
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
|
2012-04-06 20:35:01 -07:00 |
Diva Canto
|
9637e50956
|
Moved the inventory manipulation from HGEntityTransferModule to HGInventoryAccessModule where it belongs. They need to exchange some events, so added those to EventManager. Those events (TeleportStart and TeleportFail) are nice to have anyway.
|
2012-04-06 20:34:31 -07:00 |
Justin Clark-Casey (justincc)
|
cce760dbfc
|
Rather than having a FromFolderID property on every single prim and only ever using the root prim one, store on SOG instead.
This reduces pointless memory usage.
|
2012-04-07 00:40:55 +01:00 |
Justin Clark-Casey (justincc)
|
7d8bb33c5b
|
Store FromItemID for attachments once on SOG instead of on every SOP and only ever using the root part entry.
This eliminates some pointless memory use.
|
2012-04-07 00:33:02 +01:00 |
Justin Clark-Casey (justincc)
|
70b5a2dace
|
refactor: Eliminate unnecessary SOP.m_physActor
|
2012-04-06 23:49:23 +01:00 |
Justin Clark-Casey (justincc)
|
33e91f1088
|
Implement PRIM_POS_LOCAL on llSetPrimitiveParams() and other prim params LSL functions.
This is the same as PRIM_POSITION
|
2012-04-06 23:43:03 +01:00 |
Justin Clark-Casey (justincc)
|
4a58d4c5a4
|
refactor: Use clearer part.ParentGroup.IsAttachment in LSL_Api.GetPartLocalPos()
|
2012-04-06 23:36:13 +01:00 |
Justin Clark-Casey (justincc)
|
3af1cd65f9
|
Fix llGetLinkPrimParams for PRIM_POS_LOCAL for child prims whether in scene or attachments.
Return relative position to root prim rather than 0,0,0.
Should fix same issue with llGetLocalPos()
http://opensimulator.org/mantis/view.php?id=5951
|
2012-04-06 22:41:35 +01:00 |
Justin Clark-Casey (justincc)
|
47108bb351
|
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
|
2012-04-06 21:15:31 +01:00 |
Justin Clark-Casey (justincc)
|
f2903db390
|
For llGetMass(), return the mass of the avatar is the object is attached.
As per http://lslwiki.net/lslwiki/wakka.php?wakka=llGetMass
This is the mass as used by the physics engine (ODE or Bullet).
|
2012-04-06 21:14:19 +01:00 |
Talun
|
c3a8c00ce0
|
Addition of missing constants for llGetObjectDetails including for Mantis 5502
Signed-off-by: nebadon <michael@osgrid.org>
|
2012-04-06 12:42:46 -07:00 |
Justin Clark-Casey (justincc)
|
627efc172b
|
Make llGetMass() return total mass of object when called on root prim.
As per http://lslwiki.net/lslwiki/wakka.php?wakka=llGetMass
Aims to resolve http://opensimulator.org/mantis/view.php?id=5954
|
2012-04-06 20:32:39 +01:00 |
Justin Clark-Casey (justincc)
|
908cebbea8
|
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
|
2012-04-06 20:29:54 +01:00 |
Diva Canto
|
6a9f36788d
|
Deleted the unused and commented code from 2 commits ago.
|
2012-04-06 12:28:15 -07:00 |
Diva Canto
|
4c32f79c10
|
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
|
2012-04-06 11:52:38 -07:00 |
Diva Canto
|
7435582b70
|
If an AddItem fails, try adding it to the right folder type.
|
2012-04-06 11:52:05 -07:00 |
Diva Canto
|
25b3edc21c
|
WARNING: LOTS OF COMMENTED AND UNUSED CODE IN THIS COMMIT. This is on purpose; it's an historical record of what works and what doesn't wrt manipulating inventory at the viewer. I'll remove the unused code in a subsequent commit, but wanted to place it in history. The uncommented code works.
|
2012-04-06 11:51:12 -07:00 |
Diva Canto
|
953fe46811
|
A few minor tweaks here and there in XInventoryService.
|
2012-04-06 11:48:41 -07:00 |
Diva Canto
|
6eaff18961
|
Finish the implementation of GetUserInventory, even though it's still not used.
|
2012-04-06 11:38:47 -07:00 |
Diva Canto
|
8fd86c9156
|
Packing of folder in SendBulkUpdateInventory always set the folder type to -1. Not sure if there's a reason for it, but I'm changing it to the given folder type.
|
2012-04-06 11:24:34 -07:00 |