| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | | Merge branch 'master' into careminster | Melanie | 2013-02-07 | 1 | -0/+20 |
|\ \
| |/ |
|
| * | Actually plumb the new values to physics. | Melanie | 2013-02-07 | 1 | -0/+20 |
* | | Merge branch 'master' into careminster | Melanie | 2013-02-07 | 3 | -15/+29 |
|\ \
| |/ |
|
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2013-02-07 | 3 | -15/+29 |
| |\ |
|
| | * | Add TestJsonDestoreStoreNotExists() | Justin Clark-Casey (justincc) | 2013-02-07 | 1 | -0/+14 |
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-02-07 | 20 | -68/+474 |
| | |\ |
|
| | * | | Fix a recent regression in e17392a where JsonSetValue() stopped working (prob... | Justin Clark-Casey (justincc) | 2013-02-07 | 3 | -15/+15 |
| * | | | Add some more code from Avination. This changes physics actor stuff around | Melanie | 2013-02-07 | 3 | -40/+165 |
| | |/
| |/| |
|
| * | | Plumb the path from the client to the extra physics params and back | Melanie | 2013-02-07 | 8 | -6/+119 |
| * | | Send the new physics params to the viewer build dialog | Melanie | 2013-02-07 | 1 | -0/+35 |
| * | | Revert "Add plumbing for physics properties to get to the physics engine." | Melanie | 2013-02-07 | 2 | -55/+6 |
| * | | Add plumbing for physics properties to get to the physics engine. | Robert Adams | 2013-02-07 | 2 | -6/+55 |
* | | | Merge branch 'avination' into careminster | Melanie | 2013-02-07 | 6 | -134/+111 |
|\ \ \ |
|
| * | | | Rename Bounciness to Restitution | Melanie | 2013-02-07 | 5 | -10/+10 |
| * | | | Move SoubleQueu to Util. Change HTTP inv to prioritize COF. Determine COF for SP | Melanie | 2013-02-06 | 4 | -115/+79 |
| * | | | Make scripts shout a error but not stop when button count is overrun on llDialog | Melanie | 2013-02-05 | 1 | -7/+9 |
| * | | | Merge branch 'teravuswork' into avination | Melanie | 2013-01-31 | 1 | -12/+23 |
| |\ \ \ |
|
| | * | | | * This Checks the asset of each wearable asynchronously and repairs if it's r... | teravus | 2013-01-29 | 1 | -12/+23 |
| * | | | | * This adds a bit more to the previous flying roll effect by adding additiona... | teravus | 2013-01-31 | 1 | -10/+50 |
| * | | | | * Adds a satisfying angular roll when an avatar is flying and turning. (Gene... | Melanie | 2013-01-31 | 2 | -2/+84 |
* | | | | | Merge branch 'master' into careminster | Melanie | 2013-02-07 | 5 | -43/+231 |
|\ \ \ \ \
| | |_|/ /
| |/| | | |
|
| * | | | | Change passed PhysicsParameter value from float to the more general string value | Robert Adams | 2013-02-07 | 4 | -43/+57 |
| * | | | | Websocket Echo module should not be on by default. | teravus | 2013-02-07 | 1 | -1/+1 |
| * | | | | * missing example module.. Oops. | teravus | 2013-02-07 | 1 | -0/+174 |
| * | | | | Rename "Bounciness" to "Restitution" | Melanie | 2013-02-07 | 3 | -7/+7 |
* | | | | | Rename Bounciness to Restitution | Melanie | 2013-02-07 | 5 | -10/+10 |
* | | | | | Merge branch 'master' into careminster | Melanie | 2013-02-07 | 1 | -1/+60 |
|\ \ \ \ \
| |/ / / / |
|
| * | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-02-07 | 5 | -14/+97 |
| |\ \ \ \ |
|
| * | | | | | Add TestJsonWriteReadNotecard() regression test | Justin Clark-Casey (justincc) | 2013-02-07 | 1 | -1/+44 |
| * | | | | | Make json store tests operate on a single thread to ensure we don't run into ... | Justin Clark-Casey (justincc) | 2013-02-07 | 1 | -0/+16 |
* | | | | | | Merge branch 'master' into careminster | Melanie | 2013-02-07 | 8 | -26/+122 |
|\ \ \ \ \ \
| | |/ / / /
| |/| | | | |
|
| * | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Mic Bowman | 2013-02-06 | 4 | -11/+22 |
| |\ \ \ \ \
| | |_|_|_|/
| |/| | | | |
|
| | * | | | | Merge branch 'master' of git://opensimulator.org/git/opensim | Dan Lake | 2013-02-06 | 15 | -443/+358 |
| | |\ \ \ \
| | | |/ / / |
|
| | | * | | | BulletSim: set removing zero width triangles in meshes to be enabled by defau... | Robert Adams | 2013-02-06 | 2 | -1/+2 |
| | | * | | | BulletSim: check for completely degenerate meshes (ones with all | Robert Adams | 2013-02-06 | 1 | -9/+19 |
| | * | | | | WebStats will now use actual logfile as specified in OpenSim.exe.config rathe... | Dan Lake | 2013-02-06 | 1 | -1/+1 |
| * | | | | | Enables script access to the per object dynamic attributes through the JsonStore | Mic Bowman | 2013-02-06 | 4 | -13/+96 |
| | |/ / /
| |/| | | |
|
| * | | | | BulletSim: remove an exception which occurs if a physics mesh | Robert Adams | 2013-02-06 | 1 | -2/+4 |
| * | | | | Partial port of Avination's support for the new physics parameters. | Melanie | 2013-02-06 | 4 | -3/+163 |
* | | | | | Merge branch 'master' into careminster | Melanie | 2013-02-06 | 5 | -144/+2 |
|\ \ \ \ \
| |/ / / / |
|
| * | | | | Remove long unused Scene.DumpAssetsToFile boolean. | Justin Clark-Casey (justincc) | 2013-02-06 | 2 | -6/+1 |
| * | | | | Remove very long unused IScriptHost and NullScriptHost | Justin Clark-Casey (justincc) | 2013-02-06 | 3 | -138/+1 |
* | | | | | Merge branch 'master' into careminster | Melanie | 2013-02-06 | 18 | -447/+370 |
|\ \ \ \ \
| |/ / / / |
|
| * | | | | Remove unused ScriptEngineLoader and ScriptEngineInterface in OpenSim.Region.... | Justin Clark-Casey (justincc) | 2013-02-06 | 3 | -168/+0 |
| * | | | | Remove wrong code in ScriptUtils.GetAssetIdFromKeyOrItemName which would retu... | Justin Clark-Casey (justincc) | 2013-02-06 | 1 | -15/+0 |
| * | | | | Allow JsonReadNotecard() to accept the name of the notecard as well as the as... | Justin Clark-Casey (justincc) | 2013-02-06 | 1 | -8/+18 |
| * | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-02-06 | 11 | -181/+227 |
| |\ \ \ \ |
|
| | * | | | | BulletSim: make removing zero width triangles from meshes optional | Robert Adams | 2013-02-05 | 2 | -24/+33 |
| | |/ / / |
|
| | * | | | BulletSim: remove degenerate triangles from meshes. This fixes the | Robert Adams | 2013-02-05 | 5 | -45/+59 |
| | * | | | BulletSim: add debugging looking for doorway sculpty problems | Robert Adams | 2013-02-05 | 3 | -4/+33 |