aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-02-104-0/+0
|\
| * BulletSim: add parameter to set global contact breaking threshold. Update DLL...Robert Adams2013-02-084-0/+0
* | Merge branch 'master' into careminsterMelanie2013-02-082-0/+4
|\ \ | |/
| * Adds size limits to JsonStore. Adds a separate configurationMic Bowman2013-02-081-0/+4
* | Merge branch 'master' into careminsterMelanie2013-02-072-2901/+2901
|\ \ | |/
| * * Adds Websocket support to baseHttpServer and IHttpServer.cs . This allows...teravus2013-02-076-29/+6
| |\
| * | This is the final commit that enables the Websocket handlerteravus2013-02-072-0/+0
| * | We're not really done here.. but we're getting there. Socket Read is work...teravus2013-02-053-2901/+2901
* | | Merge branch 'master' into careminsterMelanie2013-02-061-0/+4
|\ \ \ | | |/ | |/|
| * | minor: Add explanation of MaptileStaticUUID setting in Regions.ini.exampleJustin Clark-Casey (justincc)2013-02-061-0/+4
* | | Merge branch 'master' into careminsterMelanie2013-02-065-14/+2
|\ \ \ | |/ /
| * | BulletSim: make removing zero width triangles from meshes optionalRobert Adams2013-02-052-0/+0
| * | BulletSim: remove degenerate triangles from meshes. This fixes theRobert Adams2013-02-051-14/+2
| * | BulletSim: rework some parameter setting implementation moving functionality ...Robert Adams2013-02-054-0/+0
* | | Merge branch 'master' into careminsterMelanie2013-02-042-4/+4
|\ \ \ | |/ /
| * | Remove [XMLRPC] section I added by accident to the top of OpenSimDefaults.ini...Justin Clark-Casey (justincc)2013-02-041-15/+0
| |/
| * Stop exceptions being thrown if GenerateMapTiles = false but no static map ti...Justin Clark-Casey (justincc)2013-02-022-3/+18
* | Merge branch 'master' into careminsterMelanie2013-01-311-0/+1
|\ \ | |/
| * Add config option to Regions.ini for new maptile featureBlueWall2013-01-301-0/+1
* | Merge branch 'master' into careminsterMelanie2013-01-314-0/+0
|\ \ | |/
| * BulletSim: do not zero an avatar's standing velocity if it is standingRobert Adams2013-01-284-0/+0
| * BulletSim: update Bullet with profiling disabled. This seems to fix the memor...Robert Adams2013-01-284-0/+0
* | Merge branch 'master' into careminsterMelanie2013-01-255-1/+377
|\ \ | |/
| * Add JSONification of WebStats module. Adds a '?json' query parameterRobert Adams2013-01-243-1/+377
| * * Repairs the Object updates, Collision updates, and Child Prim methods makin...teravus2013-01-242-0/+0
* | Merge branch 'master' into careminsterMelanie2013-01-244-0/+0
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimRobert Adams2013-01-232-13/+31
| |\
| * | BulletSim: pass up and report the real collision penetration.Robert Adams2013-01-234-0/+0
* | | Merge branch 'master' into careminsterMelanie2013-01-242-13/+31
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' into coopterminationJustin Clark-Casey (justincc)2013-01-243-0/+25
| |\ \ | | |/
| * | Add information on ScriptStopStrategy to [XEngine] in OpenSimDefaults.ini and...Justin Clark-Casey (justincc)2013-01-232-13/+31
* | | Merge branch 'master' into careminsterMelanie2013-01-233-0/+25
|\ \ \ | | |/ | |/|
| * | This updates prebuild to remove BulletSimN, implements the BulletSim API in B...teravus2013-01-203-0/+14
| * | IRCBridgeModule: optional agent-alertbox for IRC enabled Regions look in Open...PixelTomsen2013-01-191-0/+11
| |/
* | Merge commit 'f54b398540698e6e09022fe77b6405624b532f5c' into careminsterMelanie2013-01-161-8/+0
|\ \ | |/
| * BulletSim: by default, turn on continuious collision detection (CCD)Robert Adams2013-01-151-8/+0
* | Merge commit '8bf0a9f85dda4b1831630b65620d5c6868196c11' into careminsterMelanie2013-01-164-0/+0
|\ \ | |/
| * BulletSim: move center of gravity of linkset to its geometric center.Robert Adams2013-01-114-0/+0
* | Merge branch 'master' into careminsterMelanie2013-01-104-0/+0
|\ \ | |/
| * BulletSim: update DLLs and SOs with better debugging output.Robert Adams2013-01-064-0/+0
* | Merge branch 'master' into careminsterMelanie2013-01-064-0/+0
|\ \ | |/
| * BulletSim: add ResetBroadphasePool and ResetConstraintSolver diagnosticRobert Adams2013-01-044-0/+0
* | Merge branch 'master' into careminsterMelanie2013-01-025-2/+3
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-01-014-0/+0
| |\
| | * BulletSim: eliminate the use of the unmanaged HeightMapInfo structure.Robert Adams2012-12-314-0/+0
| | * BulletSim: complete movement of BulletSimAPI functions to BSAPITemplate.Robert Adams2012-12-314-0/+0
| * | Clarify that AllowLightShareFunctions setting is false, which is the default ...Justin Clark-Casey (justincc)2013-01-011-2/+3
| |/
* | Merge branch 'master' into careminsterMelanie2012-12-301-2/+2
|\ \ | |/
| * BulletSim: update values in OpenSimDefaults.ini to reflect the values really ...Robert Adams2012-12-281-2/+2
* | Merge branch 'master' into careminsterMelanie2012-12-263-2/+3
|\ \ | |/