aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'avination' into careminsterMelanie2012-06-072-89/+15
|\
| * Implement playing of the real collision sounds, change scaling for avatarMelanie2012-06-071-133/+57
| * Make not_at_target stop when the target is reached even if the scriptMelanie2012-06-071-1/+2
| * Disable default collision sounds until they can be uploaded, but enable custo...Melanie2012-06-071-55/+56
* | Merge branch 'master' into careminsterMelanie2012-06-072-40/+38
|\ \
| * | Record the fact that child agents can have asset transactions.Justin Clark-Casey (justincc)2012-06-072-23/+18
| * | Don't send kill object messages to clients when a child agent is closed.Justin Clark-Casey (justincc)2012-06-071-18/+21
* | | Remove two causes of recursive locking. Merge artefact cleanup.Melanie2012-06-061-7/+5
* | | Merge branch 'avination' into careminsterMelanie2012-06-063-9/+18
|\ \ \ | | |/ | |/|
| * | fix the real cause of double velocityUbitUmarov2012-06-051-1/+0
| * | Fix land collisions to work like SL.Melanie2012-06-051-6/+16
| * | Actually trigger land collisions in the root even when a child collidesMelanie2012-06-041-1/+1
| * | Fix llAttachToAvatar and "Attach" viewer option to preserve saved attach posi...Melanie2012-06-041-1/+1
* | | Merge branch 'master' into careminsterMelanie2012-06-063-151/+159
|\ \ \ | | |/ | |/|
| * | Scale down per frame MS stats to match scaled simulator FPS stat.Justin Clark-Casey (justincc)2012-06-051-1/+1
| * | Start sending spare frame time MS viewer stat. Make frame time correctly dis...Justin Clark-Casey (justincc)2012-06-052-78/+124
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-06-051-1/+1
| |\ \
| | * | Correct the delegate specification in EventManager.TriggerTerrainTainted. Loo...Robert Adams2012-06-041-1/+1
| * | | Properly show per frame millisecond statistics per frame, not as amount of ti...Justin Clark-Casey (justincc)2012-06-041-22/+41
| |/ /
* | | Merge branch 'avination' into careminsterMelanie2012-06-021-1/+1
|\ \ \ | | |/ | |/|
| * | Fix LSL animation state reporting and animation state transitions on crossingMelanie2012-06-011-1/+1
* | | Merge branch 'master' into careminsterMelanie2012-06-022-33/+14
|\ \ \ | | |/ | |/|
| * | Instead of updating sim stats root agent, child, objects and scripts accounts...Justin Clark-Casey (justincc)2012-06-012-33/+14
* | | Merge branch 'avination' into careminsterMelanie2012-05-312-163/+163
|\ \ \ | | |/ | |/|
| * | Add advanced collision processing into ScenePresenceMelanie2012-05-291-162/+162
| * | Fix collision filteringMelanie2012-05-291-10/+10
* | | Merge branch 'master' into careminsterMelanie2012-05-312-14/+52
|\ \ \ | | |/ | |/|
| * | Add an optional mechanism for physics modules to collect and return arbitrary...Justin Clark-Casey (justincc)2012-05-311-5/+43
| * | Fix collision filtering. The filter should be checked on the receiving part!Melanie2012-05-291-9/+9
* | | Re-add script collisions that were lost in a mergeMelanie2012-05-291-0/+2
* | | Merge branch 'avination'Melanie2012-05-292-178/+98
|\ \ \ | | |/ | |/|
| * | Merge branch 'avination' into ubitworkUbitUmarov2012-05-281-176/+90
| |\ \
| | * | Place the return back into collision sounds.Melanie2012-05-281-0/+4
| | * | Modify SceneManeger to use a DoubleDictionary and work without locks.Melanie2012-05-281-176/+90
| * | | disable collision sounds for nowUbitUmarov2012-05-281-2/+8
| |/ /
* | | Merge branch 'avination' into careminsterMelanie2012-05-274-191/+386
|\ \ \ | |/ /
| * | Merge branch 'ubitwork' into avinationMelanie2012-05-213-174/+384
| |\ \
| | * | missing update script events callUbitUmarov2012-05-201-1/+12
| | * | fix m_sitAvatarHeight to be half size.z, reduced default to a more resonable...UbitUmarov2012-05-191-1/+1
| | * | reduce useless waste of cpu. Make character collision events be done similia...UbitUmarov2012-05-191-1/+3
| | * | a bit faster collision sound type verification plus a few fixes/changesUbitUmarov2012-05-192-53/+100
| | * | temp work: sounds simetric acording to materials, still 'window close' test ...UbitUmarov2012-05-191-30/+98
| | * | modulate collision sound intensity with collision relative velocity for parts...UbitUmarov2012-05-192-46/+89
| | * | modulate collision sounds intensity with relative collision speedUbitUmarov2012-05-192-81/+120
| * | | Fix setting positions of attachments. The recent security fix regardingMelanie2012-05-191-1/+1
| * | | Merge branch 'ubitwork' into avinationMelanie2012-05-171-28/+9
| |\ \ \ | | |/ /
| | * | removed redundant colision sounds. Temporary muted sounds ( returns at top o...UbitUmarov2012-05-171-28/+13
| * | | Temprorarily disable collision sounds until we have some sound bitesMelanie2012-05-171-1/+5
| |/ /
* | | Merge branch 'master' into careminsterMelanie2012-05-276-58/+125
|\ \ \ | | |/ | |/|
| * | If restating a region, clean up the physics scene after the main scene has be...Justin Clark-Casey (justincc)2012-05-261-4/+4
generated by cgit v1.1 at 2024-12-19 13:04:39 +0000