| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into careminster | Melanie | 2013-02-12 | 1 | -0/+0 |
|\ |
|
| * | Replaced Ionic.Zip.dll with a new one that fixes a bug in it. DotNetZip (from... | Diva Canto | 2013-02-12 | 1 | -0/+0 |
* | | Merge branch 'master' into careminster | Melanie | 2013-02-10 | 4 | -0/+0 |
|\ \
| |/ |
|
| * | BulletSim: add parameter to set global contact breaking threshold. Update DLL... | Robert Adams | 2013-02-08 | 4 | -0/+0 |
* | | Merge branch 'master' into careminster | Melanie | 2013-02-08 | 2 | -0/+4 |
|\ \
| |/ |
|
| * | Adds size limits to JsonStore. Adds a separate configuration | Mic Bowman | 2013-02-08 | 1 | -0/+4 |
* | | Merge branch 'master' into careminster | Melanie | 2013-02-07 | 2 | -2901/+2901 |
|\ \
| |/ |
|
| * | * Adds Websocket support to baseHttpServer and IHttpServer.cs . This allows... | teravus | 2013-02-07 | 6 | -29/+6 |
| |\ |
|
| * | | This is the final commit that enables the Websocket handler | teravus | 2013-02-07 | 2 | -0/+0 |
| * | | We're not really done here.. but we're getting there. Socket Read is work... | teravus | 2013-02-05 | 3 | -2901/+2901 |
* | | | Merge branch 'master' into careminster | Melanie | 2013-02-06 | 1 | -0/+4 |
|\ \ \
| | |/
| |/| |
|
| * | | minor: Add explanation of MaptileStaticUUID setting in Regions.ini.example | Justin Clark-Casey (justincc) | 2013-02-06 | 1 | -0/+4 |
* | | | Merge branch 'master' into careminster | Melanie | 2013-02-06 | 5 | -14/+2 |
|\ \ \
| |/ / |
|
| * | | BulletSim: make removing zero width triangles from meshes optional | Robert Adams | 2013-02-05 | 2 | -0/+0 |
| * | | BulletSim: remove degenerate triangles from meshes. This fixes the | Robert Adams | 2013-02-05 | 1 | -14/+2 |
| * | | BulletSim: rework some parameter setting implementation moving functionality ... | Robert Adams | 2013-02-05 | 4 | -0/+0 |
* | | | Merge branch 'master' into careminster | Melanie | 2013-02-04 | 2 | -4/+4 |
|\ \ \
| |/ / |
|
| * | | Remove [XMLRPC] section I added by accident to the top of OpenSimDefaults.ini... | Justin Clark-Casey (justincc) | 2013-02-04 | 1 | -15/+0 |
| |/ |
|
| * | Stop exceptions being thrown if GenerateMapTiles = false but no static map ti... | Justin Clark-Casey (justincc) | 2013-02-02 | 2 | -3/+18 |
* | | Merge branch 'master' into careminster | Melanie | 2013-01-31 | 1 | -0/+1 |
|\ \
| |/ |
|
| * | Add config option to Regions.ini for new maptile feature | BlueWall | 2013-01-30 | 1 | -0/+1 |
* | | Merge branch 'master' into careminster | Melanie | 2013-01-31 | 4 | -0/+0 |
|\ \
| |/ |
|
| * | BulletSim: do not zero an avatar's standing velocity if it is standing | Robert Adams | 2013-01-28 | 4 | -0/+0 |
| * | BulletSim: update Bullet with profiling disabled. This seems to fix the memor... | Robert Adams | 2013-01-28 | 4 | -0/+0 |
* | | Merge branch 'master' into careminster | Melanie | 2013-01-25 | 5 | -1/+377 |
|\ \
| |/ |
|
| * | Add JSONification of WebStats module. Adds a '?json' query parameter | Robert Adams | 2013-01-24 | 3 | -1/+377 |
| * | * Repairs the Object updates, Collision updates, and Child Prim methods makin... | teravus | 2013-01-24 | 2 | -0/+0 |
* | | Merge branch 'master' into careminster | Melanie | 2013-01-24 | 4 | -0/+0 |
|\ \
| |/ |
|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Robert Adams | 2013-01-23 | 2 | -13/+31 |
| |\ |
|
| * | | BulletSim: pass up and report the real collision penetration. | Robert Adams | 2013-01-23 | 4 | -0/+0 |
* | | | Merge branch 'master' into careminster | Melanie | 2013-01-24 | 2 | -13/+31 |
|\ \ \
| | |/
| |/| |
|
| * | | Merge branch 'master' into cooptermination | Justin Clark-Casey (justincc) | 2013-01-24 | 3 | -0/+25 |
| |\ \
| | |/ |
|
| * | | Add information on ScriptStopStrategy to [XEngine] in OpenSimDefaults.ini and... | Justin Clark-Casey (justincc) | 2013-01-23 | 2 | -13/+31 |
* | | | Merge branch 'master' into careminster | Melanie | 2013-01-23 | 3 | -0/+25 |
|\ \ \
| | |/
| |/| |
|
| * | | This updates prebuild to remove BulletSimN, implements the BulletSim API in B... | teravus | 2013-01-20 | 3 | -0/+14 |
| * | | IRCBridgeModule: optional agent-alertbox for IRC enabled Regions look in Open... | PixelTomsen | 2013-01-19 | 1 | -0/+11 |
| |/ |
|
* | | Merge commit 'f54b398540698e6e09022fe77b6405624b532f5c' into careminster | Melanie | 2013-01-16 | 1 | -8/+0 |
|\ \
| |/ |
|
| * | BulletSim: by default, turn on continuious collision detection (CCD) | Robert Adams | 2013-01-15 | 1 | -8/+0 |
* | | Merge commit '8bf0a9f85dda4b1831630b65620d5c6868196c11' into careminster | Melanie | 2013-01-16 | 4 | -0/+0 |
|\ \
| |/ |
|
| * | BulletSim: move center of gravity of linkset to its geometric center. | Robert Adams | 2013-01-11 | 4 | -0/+0 |
* | | Merge branch 'master' into careminster | Melanie | 2013-01-10 | 4 | -0/+0 |
|\ \
| |/ |
|
| * | BulletSim: update DLLs and SOs with better debugging output. | Robert Adams | 2013-01-06 | 4 | -0/+0 |
* | | Merge branch 'master' into careminster | Melanie | 2013-01-06 | 4 | -0/+0 |
|\ \
| |/ |
|
| * | BulletSim: add ResetBroadphasePool and ResetConstraintSolver diagnostic | Robert Adams | 2013-01-04 | 4 | -0/+0 |
* | | Merge branch 'master' into careminster | Melanie | 2013-01-02 | 5 | -2/+3 |
|\ \
| |/ |
|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-01-01 | 4 | -0/+0 |
| |\ |
|
| | * | BulletSim: eliminate the use of the unmanaged HeightMapInfo structure. | Robert Adams | 2012-12-31 | 4 | -0/+0 |
| | * | BulletSim: complete movement of BulletSimAPI functions to BSAPITemplate. | Robert Adams | 2012-12-31 | 4 | -0/+0 |
| * | | Clarify that AllowLightShareFunctions setting is false, which is the default ... | Justin Clark-Casey (justincc) | 2013-01-01 | 1 | -2/+3 |
| |/ |
|
* | | Merge branch 'master' into careminster | Melanie | 2012-12-30 | 1 | -2/+2 |
|\ \
| |/ |
|