Commit Graph

19479 Commits (dbbfe0cdd78c919b39da52e1ccc0c1fc500b57d5)

Author SHA1 Message Date
UbitUmarov dbbfe0cdd7 fix avatars collisions on sim crossings and other few cases where freemove() is called 2012-05-28 22:23:32 +01:00
UbitUmarov 2122c336b0 a bit cleaner code (?) on sculpts/meshs meshing checking 2012-05-28 14:44:06 +01:00
UbitUmarov 60cebe9a5b let meshs work indenpendently of mesh_sculpted_prim config option 2012-05-28 14:32:16 +01:00
UbitUmarov 5141f4075f Merge branch 'avination' into ubitwork
Conflicts:
	OpenSim/Region/Framework/Scenes/CollisionSounds.cs
2012-05-28 13:13:01 +01:00
UbitUmarov 121433d03a disable collision sounds for now 2012-05-28 13:10:02 +01:00
UbitUmarov 20baa6334c revert making sculpts phanton if sculpt meshing option is off 2012-05-28 13:05:50 +01:00
Melanie b70fb7df78 Place the return back into collision sounds. 2012-05-28 11:28:46 +02:00
Melanie ca3b229e94 If a region is not found on a simulator, make the health query return
0 to indicate it's still starting rather than an error. There are other
methods that can discover the presence of a region and slow starting regions
may cause the watchdog to kill them while they start,
2012-05-28 09:15:24 +02:00
Melanie c5e73c0cb8 Merge branch 'ubitwork' into avination 2012-05-28 02:19:29 +02:00
Melanie bbaf450c30 Modify SceneManeger to use a DoubleDictionary and work without locks.
Changes to the scenes dictionary are exceedingly rare and using atomic
operations makes the chance of collisions nearly nil in any case.
2012-05-28 02:14:14 +02:00
UbitUmarov f740c9522a Let OOB information usable outside ubitode 2012-05-27 14:01:42 +01:00
UbitUmarov d2260423e5 also don't collide sculps or meshs if meshing is OFF 2012-05-21 17:11:19 +01:00
UbitUmarov b92ecc5382 Merge branch 'avination' into ubitwork 2012-05-21 12:47:28 +01:00
UbitUmarov 85f5789993 try to let avas climb higher steps. Will only work in some cases, may have bad effects, so needs some more testing 2012-05-21 12:35:17 +01:00
Melanie 7305d2e0ef Merge branch 'ubitwork' into avination 2012-05-21 07:32:27 +02:00
UbitUmarov 32e63fc04f missing update script events call 2012-05-20 17:30:01 +01:00
UbitUmarov 11f582b26d minor changes 2012-05-20 13:18:15 +01:00
UbitUmarov 2767574d0f fix m_sitAvatarHeight to be half size.z, reduced default to a more resonable value ( 1m); 2012-05-19 18:10:44 +01:00
UbitUmarov 10889c86d9 reduce useless waste of cpu. Make character collision events be done similiar to parts. Let same thread do it all ( like in parts ) ( to change this some structs copies must be added) 2012-05-19 16:35:48 +01:00
UbitUmarov 2c498baf58 a bit faster collision sound type verification plus a few fixes/changes 2012-05-19 13:53:49 +01:00
UbitUmarov a2c64d9795 temp work: sounds simetric acording to materials, still 'window close' test sound. Included in coment full assimetric ( since seems we have files for it now ) case with some uuids 2012-05-19 12:25:31 +01:00
Melanie d69f197a5d Fix setting positions of attachments. The recent security fix regarding
prim entry messed it up.
2012-05-19 12:35:07 +02:00
UbitUmarov 9ecdef2686 modulate collision sound intensity with collision relative velocity for parts also 2012-05-19 02:04:10 +01:00
UbitUmarov 98a2c7bfee modulate collision sounds intensity with relative collision speed 2012-05-19 01:10:39 +01:00
UbitUmarov deb87e7890 fix character IsPhysical 2012-05-19 01:01:46 +01:00
UbitUmarov a7ece8c688 add colliders relative velocity projected in collision direction to collisions report information. 2012-05-19 00:17:37 +01:00
UbitUmarov 0d0c472181 removed redundant colision sounds. Temporary muted sounds ( returns at top of funtions ). 2012-05-17 23:15:07 +01:00
Melanie 24b35b7e93 Merge branch 'ubitwork' into avination
Conflicts:
	OpenSim/Region/Framework/Scenes/CollisionSounds.cs
2012-05-17 22:29:44 +02:00
Melanie 511fc663a2 Temprorarily disable collision sounds until we have some sound bites 2012-05-17 21:36:27 +02:00
UbitUmarov 7652b3a957 udp transfer: make number packets estimation coerent with number actually sent. Use the safer lower max packet size defined in os source (600) and not OMV one (1100). 2012-05-17 13:13:31 +01:00
UbitUmarov 6af78836a5 trigger collision sounds on active agent position for better spatial effect without using the detailed collision position. (current error will be half max physical prim size). Moved some checks from sop to collisionSound code 2012-05-17 12:17:29 +01:00
UbitUmarov e4231e95a9 increase avatars collisions report to 10 per sec, Stopped sound on avatar to volumedetect collision 2012-05-17 04:41:46 +01:00
UbitUmarov 038986baff add avatar colision sounds. Changed test sound UUID 2012-05-17 04:14:13 +01:00
UbitUmarov b743835f9e default colisionVolume is 0, use it only for user specified sound 2012-05-17 01:36:42 +01:00
UbitUmarov 7cbc54d92a default collision sounds. Incomplete, untested, needs revision 2012-05-17 01:04:30 +01:00
UbitUmarov 0de7219485 collision sounds: simplify send code a bit and limit sending rate to 5 per sec per part ??? 2012-05-16 23:36:37 +01:00
UbitUmarov ea47b03625 Added a invalidCollisionSoundUUID so that scripts can stop all collision sounds with llCollisionSound("",...). UUID.Zero means defaults should be used. In case part has several scripts with confliting llCollisionSound result depende on exec order. Specially on reset the efect of "" depends on reset order, it should override the others. This is intermediate improve(?) since collisions sounds seem to need a deaper revision. 2012-05-16 12:27:49 +01:00
UbitUmarov 81d7844f51 use part VolumeDetectActive and not rootPart.VolumeDetectActive to be coerent with other places in case of future changes. Should be equivalent if all is well. 2012-05-15 17:01:00 +01:00
UbitUmarov accab1e086 sop colisions don't play sounds on volume detectors 2012-05-15 16:56:43 +01:00
UbitUmarov ca14534b91 sop: - added UpdatePhysicsSubscribedEvents() to update physics ator collision events subcription where needed. Made it consider also VolumeDtc and phantom cases. - added extra calls to it on physics ator proprieties changes. - Fixed land collisions reports. - Handle the case of physics sending a last zero colisions reports to trigger collision_end. - Made the physics collisions report rate be 20 per second. (needs review/testing) 2012-05-15 15:54:02 +01:00
UbitUmarov 9d67523235 ubitODE: if stopped having collisions do report zero colisions once, so collision_end event can be triggered. Changed reports rate to the requested rate and not full ode rate. 2012-05-15 15:45:01 +01:00
UbitUmarov 338be76e0a ubitODE: fix not reporting land collisions on same cases. 2012-05-15 13:41:13 +01:00
Melanie 995cd25f30 Port the mel/dahlia fix 2012-05-15 02:36:11 +02:00
UbitUmarov 325973d36f don't send colision events to volume detectors 2012-05-15 01:40:46 +01:00
Melanie ebdbaba615 Merge branch 'ubitwork' into avination 2012-05-15 00:17:52 +02:00
UbitUmarov 1b81ce303e Merge branch 'avination' into ubitwork 2012-05-15 00:04:40 +01:00
UbitUmarov 0fb663272a make llGetCameraPos and llGetCameraRot apply to avatar that granted permission and not owner 2012-05-14 23:42:45 +01:00
Melanie e9e797b681 Fix an omission 2012-05-15 00:15:44 +02:00
Melanie e3c376156c Completely revamp collision handling. Now works as it is supposed to. 2012-05-14 22:45:54 +02:00
Melanie e78043cb70 Check parcel entry permissions when moving objects 2012-05-14 01:32:22 +02:00