aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-06-046-43/+96
|\
| * fix addforce/impulse.UbitUmarov2012-06-041-3/+3
| * When regions are set to shut down the instance, always send notifications toMelanie2012-06-031-6/+30
| * Fix LSL animation state reporting and animation state transitions on crossingMelanie2012-06-012-8/+34
| * Fix impersonation, it got broken in a mergeMelanie2012-06-011-7/+10
| * Remove the kill record. Core has removed it long ago and it really does more ...Melanie2012-06-011-19/+19
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-05-304-46/+72
|\ \ | |/
| * ubitode prim: if makebody() is called already having a body, do a full destru...UbitUmarov2012-05-301-3/+4
| * Guard setting the building flagMelanie2012-05-301-0/+4
| * Whitespace fixMelanie2012-05-301-1/+1
| * Prevent multiple requests to go physical from reaching the physics pluginMelanie2012-05-301-0/+4
| * Fix the log standing attach-from-world bug.Melanie2012-05-302-42/+59
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-05-293-172/+173
|\ \ | |/
| * fix physics not reporting collisions only with terrainUbitUmarov2012-05-291-0/+1
| * Add advanced collision processing into ScenePresenceMelanie2012-05-291-162/+162
| * Fix collision filteringMelanie2012-05-291-10/+10
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-05-282-32/+26
|\ \ | |/
| * 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 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-05-287-211/+144
|\ \ | |/
| * 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
| |\ \ | | |/
| | * Merge branch 'ubitwork' into avinationMelanie2012-05-217-328/+562
| | |\
| | * | Fix setting positions of attachments. The recent security fix regardingMelanie2012-05-191-1/+1
| | * | Merge branch 'ubitwork' into avinationMelanie2012-05-171-28/+9
| | |\ \
| | * | | Temprorarily disable collision sounds until we have some sound bitesMelanie2012-05-171-1/+5
* | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-05-214-42/+111
|\ \ \ \ \ | |/ / / /
| * | | | try to let avas climb higher steps. Will only work in some cases, may have b...UbitUmarov2012-05-212-9/+75
| | |_|/ | |/| |
| * | | missing update script events callUbitUmarov2012-05-201-1/+12
| * | | minor changesUbitUmarov2012-05-203-32/+24
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-05-191-1/+1
|\ \ \ \ | |/ / /
| * | | fix m_sitAvatarHeight to be half size.z, reduced default to a more resonable...UbitUmarov2012-05-191-1/+1
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-05-194-126/+148
|\ \ \ \ | |/ / /
| * | | reduce useless waste of cpu. Make character collision events be done similia...UbitUmarov2012-05-194-126/+148
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-05-192-53/+100
|\ \ \ \ | |/ / /
| * | | a bit faster collision sound type verification plus a few fixes/changesUbitUmarov2012-05-192-53/+100
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-05-191-30/+98
|\ \ \ \ | |/ / /
| * | | temp work: sounds simetric acording to materials, still 'window close' test ...UbitUmarov2012-05-191-30/+98
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-05-192-46/+89
|\ \ \ \ | |/ / /
| * | | modulate collision sound intensity with collision relative velocity for parts...UbitUmarov2012-05-192-46/+89
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-05-193-82/+121
|\ \ \ \ | |/ / /