aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-05-317-69/+450
|\
| * Add an optional mechanism for physics modules to collect and return arbitrary...Justin Clark-Casey (justincc)2012-05-315-60/+252
| * Add console command "teleport user" to allow teleport from the region consoleJustin Clark-Casey (justincc)2012-05-291-0/+189
| * Fix collision filtering. The filter should be checked on the receiving part!Melanie2012-05-291-9/+9
* | Merge branch 'master' into careminsterMelanie2012-05-293-238/+332
|\ \ | |/
| * refactor: factor out entity transfer state machine into a separate class to m...Justin Clark-Casey (justincc)2012-05-283-239/+330
| * If handling the failure of teleport, move agent state to CleaningUp when we s...Justin Clark-Casey (justincc)2012-05-281-3/+6
* | Re-add script collisions that were lost in a mergeMelanie2012-05-291-0/+2
* | Merge branch 'avination'Melanie2012-05-297-252/+245
|\ \
| * | fix avatars collisions on sim crossings and other few cases where freemove()...UbitUmarov2012-05-281-2/+1
| * | a bit cleaner code (?) on sculpts/meshs meshing checkingUbitUmarov2012-05-281-7/+6
| * | let meshs work indenpendently of mesh_sculpted_prim config optionUbitUmarov2012-05-281-29/+25
| * | Merge branch 'avination' into ubitworkUbitUmarov2012-05-282-180/+103
| |\ \
| | * | Place the return back into collision sounds.Melanie2012-05-281-0/+4
| | * | If a region is not found on a simulator, make the health query returnMelanie2012-05-281-4/+13
| | * | Merge branch 'ubitwork' into avinationMelanie2012-05-284-38/+110
| | |\ \
| | * | | Modify SceneManeger to use a DoubleDictionary and work without locks.Melanie2012-05-281-176/+90
| * | | | disable collision sounds for nowUbitUmarov2012-05-281-2/+8
| * | | | revert making sculpts phanton if sculpt meshing option is offUbitUmarov2012-05-281-2/+0
| | |/ / | |/| |
| * | | Let OOB information usable outside ubitodeUbitUmarov2012-05-273-29/+33
| * | | also don't collide sculps or meshs if meshing is OFFUbitUmarov2012-05-211-0/+2
| * | | Merge branch 'avination' into ubitworkUbitUmarov2012-05-212-2/+2
| |\ \ \ | | |/ /
| * | | try to let avas climb higher steps. Will only work in some cases, may have b...UbitUmarov2012-05-212-9/+75
* | | | Merge branch 'avination' into careminsterMelanie2012-05-278-345/+564
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'ubitwork' into avinationMelanie2012-05-217-328/+562
| |\ \ \ | | |/ /
| | * | missing update script events callUbitUmarov2012-05-201-1/+12
| | * | minor changesUbitUmarov2012-05-203-32/+24
| | * | 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-194-126/+148
| | * | 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 character IsPhysicalUbitUmarov2012-05-191-1/+1
| | * | add colliders relative velocity projected in collision direction to collision...UbitUmarov2012-05-193-1/+13
| * | | 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-2753-939/+2335
|\ \ \ | | |/ | |/|
| * | minor: code formatting from 0b72f773Justin Clark-Casey (justincc)2012-05-261-12/+11
| * | Mantis 6025 llRequestPermissions auto grant for NPCs.Talun2012-05-261-1/+23
| * | If restating a region, clean up the physics scene after the main scene has be...Justin Clark-Casey (justincc)2012-05-261-4/+4
| * | One can now get hyoergrid region co-ordinates with llRequestSimulatorDataBlake.Bourque2012-05-261-5/+21
| * | Use GetInventoryItem() in LSL_Api.InventoryKey(string name, int type).Justin Clark-Casey (justincc)2012-05-261-17/+7
| * | Use SceneObjectPartInventory.GetInventoryItem() in OSSL.AvatarStopAnimation i...Justin Clark-Casey (justincc)2012-05-261-14/+12
| * | refactor: replace LSL_Api.InventoryKey(string) largely with SceneObjectPartIn...Justin Clark-Casey (justincc)2012-05-263-45/+42
| * | Mantis 6028 osAvatarStopAnimation not stopping animations via UUIDTalun2012-05-251-7/+11
| * | Resolve some mono compiler warnings.Justin Clark-Casey (justincc)2012-05-259-26/+33
| * | on agent cross, remove from physics scene after its been placed in transit, n...Justin Clark-Casey (justincc)2012-05-251-3/+7