Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into httptests | UbitUmarov | 2017-10-26 | 4 | -53/+72 |
|\ | |||||
| * | Fixed typo in a comment. | Kevin Cozens | 2017-10-26 | 1 | -1/+1 |
| | | |||||
| * | Added missing Allow line for osGetSimulatorMemoryKB. | Kevin Cozens | 2017-10-26 | 1 | -0/+1 |
| | | |||||
| * | Sorted the groups of Allow statements by alphabetical order. | Kevin Cozens | 2017-10-26 | 1 | -10/+10 |
| | | |||||
| * | Corrected name of function in call to CheckThreatLevel. | Kevin Cozens | 2017-10-26 | 1 | -1/+1 |
| | | |||||
| * | Whitespace cleanup. | Kevin Cozens | 2017-10-26 | 1 | -19/+19 |
| | | |||||
| * | mantis 8253: try to recover information about takecontrols pass=false ↵ | UbitUmarov | 2017-10-25 | 1 | -22/+40 |
| | | | | | | | | controls on crossings, also tell viewers about them. this may still not be correct. Use of multiple TakeControls on same avatar can still give unpredictable results (also on normal operation). In same cases last executed my override previus or not. Also change agent updates wait code | ||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2017-10-15 | 3 | -1/+23 |
|\ \ | |/ | |||||
| * | add osGetSimulatorMemoryKB(). This allows work around the fact ↵ | UbitUmarov | 2017-10-15 | 3 | -1/+23 |
| | | | | | | | | osGetSimulatorMemory() reports at most 2GB. This one limit is now 2TB, should ne enought for a while | ||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2017-10-13 | 4 | -16/+31 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of git://opensimulator.org/git/opensim (Ubit beat | Robert Adams | 2017-10-13 | 1 | -4/+7 |
| |\ | | | | | | | | | | me to the repository). | ||||
| | * | mantis 8249: give better data to llDetectedGrab | UbitUmarov | 2017-10-13 | 1 | -4/+7 |
| | | | |||||
| * | | BulletSim: Add parameter "[BulletSim]AvatarWalkVelocityFactor=1.0" to | Robert Adams | 2017-10-13 | 2 | -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 code | UbitUmarov | 2017-10-06 | 1 | -1/+1 |
| | | |||||
| * | mantis 8246: don't allow 'delete object name' to delete attachments, but ↵ | UbitUmarov | 2017-10-06 | 1 | -9/+12 |
| | | | | | | | | allow delete object id, with confirmation | ||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2017-10-01 | 4 | -0/+6 |
|\ \ | |/ | |||||
| * | bug fix: add missing stub for osSetInertia | UbitUmarov | 2017-10-01 | 2 | -0/+6 |
| | | |||||
| * | BulletSim: update MacOS version of libBulletSim to latest version. | Robert Adams | 2017-09-20 | 2 | -0/+0 |
| | | | | | | | | | | See Mantis 8232. Thanks Gavin Hird. | ||||
* | | replace libomv saving a few op on vector * quaternion | UbitUmarov | 2017-09-17 | 1 | -0/+0 |
| | | |||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2017-09-16 | 2 | -2/+2 |
|\ \ | |/ | |||||
| * | bug fix: Of course i had to pick a wrong number for profileBegin | UbitUmarov | 2017-09-16 | 2 | -2/+2 |
| | | |||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2017-09-16 | 3 | -9/+21 |
|\ \ | |/ | |||||
| * | double request.ReadWriteTimeout | UbitUmarov | 2017-09-16 | 1 | -2/+2 |
| | | |||||
| * | bug fix. Increase the values of profileHollow and profileBegin used to match ↵ | UbitUmarov | 2017-09-16 | 2 | -7/+19 |
| | | | | | | | | 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 stats | UbitUmarov | 2017-09-08 | 1 | -13/+14 |
| | | |||||
* | | ubOde: hashSpaces aren't that nice | UbitUmarov | 2017-09-08 | 3 | -188/+107 |
| | | |||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2017-09-05 | 16 | -86/+414 |
|\ \ | |/ | |||||
| * | BulletSim: Merge branch 'BulletSim2017' | Robert Adams | 2017-09-05 | 16 | -86/+414 |
| |\ | | | | | | | | | | Adds raycast using Bullet physics engine. | ||||
| | * | BulletSim: add raycast filtering | Robert Adams | 2017-09-05 | 1 | -3/+35 |
| | | | |||||
| | * | BulletSim: first version of raycast. Only single contact point and no | Robert Adams | 2017-09-03 | 8 | -128/+137 |
| | | | | | | | | | | | | filtering. | ||||
| | * | BulletSim; Update BulletSim.dll's and so's for raycast. | Robert Adams | 2017-09-03 | 4 | -0/+0 |
| | | | |||||
| | * | BulletSim: modify taint processing which use locks. | Robert Adams | 2017-09-02 | 5 | -27/+62 |
| | |\ | | | | | | | | | | | | | (Merge branch 'bullettaint' into bulletcast) | ||||
| | | * | BulletSim: add clock and change logic for taint processing a little | Robert Adams | 2017-08-28 | 5 | -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 to | Robert Adams | 2017-09-02 | 8 | -0/+252 |
| | | | | | | | | | | | | | | | | work. | ||||
* | | | | Merge branch 'master' into httptests | UbitUmarov | 2017-09-04 | 2 | -5/+5 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fixed typos in comments in osslEnable.ini | Kevin Cozens | 2017-09-04 | 1 | -2/+2 |
| | | | | |||||
| * | | | Fixed typo in function name HaveNotifiedLogOfScriptStopMistmatch. | Kevin Cozens | 2017-09-04 | 1 | -3/+3 |
| |/ / | |||||
* | | | fix our name is OpenSimulator not OpenSim | UbitUmarov | 2017-08-31 | 3 | -2/+2 |
| | | | |||||
* | | | improve Prefer32bit configuration option | UbitUmarov | 2017-08-31 | 5 | -3/+24 |
| | | | |||||
* | | | .net4.5, take2; vs2010 does not do it, try to make mono5.x msbuild more happy | UbitUmarov | 2017-08-31 | 3 | -95/+94 |
| | | | |||||
* | | | test: .net framework4.5 | UbitUmarov | 2017-08-31 | 1 | -2/+27 |
| | | | |||||
* | | | CSharp targets name still wrong | UbitUmarov | 2017-08-31 | 2 | -1/+1 |
| | | | |||||
* | | | fix a whitecode bug, add missing files | UbitUmarov | 2017-08-31 | 7 | -1/+429 |
| | | | |||||
* | | | fix a prebuild VS targets assembly name | UbitUmarov | 2017-08-31 | 3 | -1/+131 |
| | | | |||||
* | | | make option Prefer32bit default to false. Thanks Freaky Tech | UbitUmarov | 2017-08-30 | 3 | -2/+7 |
| | | | |||||
* | | | update Prebuild with WhiteCore version | UbitUmarov | 2017-08-30 | 54 | -8761/+8863 |
| | | | |||||
* | | | Merge branch 'master' into httptests | UbitUmarov | 2017-08-29 | 1 | -10/+14 |
|\ \ \ | |/ / | |||||
| * | | fix cache.cs (used on parcels info) | UbitUmarov | 2017-08-29 | 1 | -10/+14 |
| | | | |||||
* | | | update httpserver | UbitUmarov | 2017-08-28 | 2 | -0/+0 |
| | | | |||||
* | | | fix some nunit tests | UbitUmarov | 2017-08-28 | 2 | -4/+9 |
| | | |