aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into httptestsUbitUmarov2017-10-134-16/+31
|\
| * Merge branch 'master' of git://opensimulator.org/git/opensim (Ubit beatRobert Adams2017-10-131-4/+7
| |\ | | | | | | | | | me to the repository).
| | * mantis 8249: give better data to llDetectedGrabUbitUmarov2017-10-131-4/+7
| | |
| * | BulletSim: Add parameter "[BulletSim]AvatarWalkVelocityFactor=1.0" toRobert Adams2017-10-132-4/+13
| |/ | | | | | | | | | | | | | | | | | | adjust the walking speed passed from the simulator. Default is 1.0f so there should be no change for regions who do not change the factor. The adjustment for walking speed and AlwaysRun speed should be in the simulator and not the physics engines (who all assume TargetVelocity.set is only used for avatar walking/running) but that would require tweaking all the phyiscs engines.
| * remove a dead line of codeUbitUmarov2017-10-061-1/+1
| |
| * mantis 8246: don't allow 'delete object name' to delete attachments, but ↵UbitUmarov2017-10-061-9/+12
| | | | | | | | allow delete object id, with confirmation
* | Merge branch 'master' into httptestsUbitUmarov2017-10-012-0/+6
|\ \ | |/
| * bug fix: add missing stub for osSetInertiaUbitUmarov2017-10-012-0/+6
| |
* | Merge branch 'master' into httptestsUbitUmarov2017-09-161-1/+1
|\ \ | |/
| * bug fix: Of course i had to pick a wrong number for profileBeginUbitUmarov2017-09-161-1/+1
| |
* | Merge branch 'master' into httptestsUbitUmarov2017-09-161-3/+15
|\ \ | |/
| * bug fix. Increase the values of profileHollow and profileBegin used to match ↵UbitUmarov2017-09-161-3/+15
| | | | | | | | pbs number of faces and the Mesh number of faces. The small values i used before seem to be randomly lost.
* | ubOde: comment out some debug statsUbitUmarov2017-09-081-13/+14
| |
* | ubOde: hashSpaces aren't that niceUbitUmarov2017-09-083-188/+107
| |
* | Merge branch 'master' into httptestsUbitUmarov2017-09-0512-86/+414
|\ \ | |/
| * BulletSim: Merge branch 'BulletSim2017'Robert Adams2017-09-0512-86/+414
| |\ | | | | | | | | | Adds raycast using Bullet physics engine.
| | * BulletSim: add raycast filteringRobert Adams2017-09-051-3/+35
| | |
| | * BulletSim: first version of raycast. Only single contact point and noRobert Adams2017-09-038-128/+137
| | | | | | | | | | | | filtering.
| | * BulletSim: modify taint processing which use locks.Robert Adams2017-09-025-27/+62
| | |\ | | | | | | | | | | | | (Merge branch 'bullettaint' into bulletcast)
| | | * BulletSim: add clock and change logic for taint processing a littleRobert Adams2017-08-285-27/+62
| | | | | | | | | | | | | | | | | | | | so taints check if they are not in simulation time and execute immediately if not.
| | * | BulletSim: most of the plumbing for raycast. Needs new BulletSim.dll toRobert Adams2017-09-028-0/+252
| | | | | | | | | | | | | | | | work.
* | | | Merge branch 'master' into httptestsUbitUmarov2017-09-041-3/+3
|\ \ \ \ | |/ / /
| * | | Fixed typo in function name HaveNotifiedLogOfScriptStopMistmatch.Kevin Cozens2017-09-041-3/+3
| |/ /
* | | fix some nunit testsUbitUmarov2017-08-281-2/+6
| | |
* | | Merge branch 'master' into httptestsUbitUmarov2017-08-252-50/+53
|\ \ \ | |/ /
| * | in some cases ll TPVs can only see avatar rotations around Z or camera ↵UbitUmarov2017-08-251-0/+13
| | | | | | | | | | | | misbehaves
| * | change camera view constraint. we need to do it a lot more :(UbitUmarov2017-08-251-50/+40
| |/
* | Merge branch 'master' into httptestsUbitUmarov2017-08-245-9/+33
|\ \ | |/
| * frozen avatars should not do local teleports. Possible none should not be ↵UbitUmarov2017-08-241-3/+13
| | | | | | | | allowed, but that may be abusive
| * change a few more parcel eject code pathsUbitUmarov2017-08-243-3/+3
| |
| * add missing file. Also in last commit comment the flag was relative to ↵UbitUmarov2017-08-241-2/+16
| | | | | | | | (un)freeze no t(un)eject
| * (un)eject flag is only lowest bit, only protect active gods from freeze; do ↵UbitUmarov2017-08-241-3/+3
| | | | | | | | not check landing point (telehubs) on eject.
* | Merge branch 'master' into httptestsUbitUmarov2017-08-221-0/+3
|\ \ | |/
| * mantis 8233: media changes flag object updated in region dbUbitUmarov2017-08-221-0/+3
| |
* | ubOde move static/dynamic friction to unmanaged code. Note this now ↵UbitUmarov2017-08-211-13/+14
| | | | | | | | requeries ode version OS0.13.3 currently at opensim-libs repo trunk/unmanaged/ODE-OpenSim-Test
* | Merge branch 'master' into httptestsUbitUmarov2017-08-192-58/+74
|\ \ | |/
| * change SOP updates throttles again. Small values of omega on ↵UbitUmarov2017-08-192-58/+74
| | | | | | | | llSetTargetOmega where skiped
* | Merge branch 'master' into httptestsUbitUmarov2017-08-171-14/+9
|\ \ | |/
| * fix llRot2Axis(ZERO_ROTATION) and non normalized inputs, same for llRot2Angle()UbitUmarov2017-08-161-14/+9
| |
* | Merge branch 'master' into httptestsUbitUmarov2017-08-1618-470/+691
|\ \ | |/
| * Merge branch 'master' into BulletSim2017Robert Adams2017-08-151-12/+20
| |\
| | * Refactor archive loading to optionally start script engine after loading.Robert Adams2017-08-141-12/+20
| | |
| * | BulletSim: remove chatty debug message.Robert Adams2017-08-141-2/+2
| | |
| * | BUlletSim: return better terrain height inRobert Adams2017-08-141-4/+20
| |/ | | | | | | | | | | | | | | BSTerrainHeightMap.GetTerrainHeightAtXYZ(). Partial fix for Mantis 8011. Problem is that computed terrain height is different than mesh height in the physics engine. For small shapes, they would have their position corrected to above terrain so they would never collide.
| * jenkins tests still don't set scene.IsRunningUbitUmarov2017-08-131-2/+2
| |
| * change locking on sop updatesUbitUmarov2017-08-132-169/+186
| |
| * add a few locksUbitUmarov2017-08-031-8/+16
| |
| * Oops fix also default UseMeshiesPhysicsMesh also on ubOdeUbitUmarov2017-08-021-1/+1
| |
| * Corrected index number in ErrorFormat based Exception messageKevin Cozens2017-07-301-1/+1
| |
| * fix typoUbitUmarov2017-07-281-3/+3
| |