| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into careminster | Melanie | 2013-02-07 | 0 | -0/+0 |
|\ |
|
| * | Rename "Bounciness" to "Restitution" | Melanie | 2013-02-07 | 4 | -9/+9 |
* | | Merge branch 'master' into careminster | Melanie | 2013-02-07 | 2 | -2/+61 |
|\ \
| |/ |
|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-02-07 | 7 | -15/+120 |
| |\ |
|
| * | | Add TestJsonWriteReadNotecard() regression test | Justin Clark-Casey (justincc) | 2013-02-07 | 2 | -2/+45 |
| * | | 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 | 10 | -28/+151 |
|\ \ \
| | |/
| |/| |
|
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Mic Bowman | 2013-02-06 | 6 | -13/+43 |
| |\ \ |
|
| | * \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Dan Lake | 2013-02-06 | 23 | -429/+435 |
| | |\ \
| | | |/ |
|
| | | * | minor: add method doc to DAMap.ValidateKey() | Justin Clark-Casey (justincc) | 2013-02-07 | 1 | -0/+4 |
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Robert Adams | 2013-02-06 | 1 | -1/+2 |
| | | |\ |
|
| | | | * | Add key length validation to DAMap.Add(KeyValuePair<string, OSDMap> kvp) to m... | Justin Clark-Casey (justincc) | 2013-02-07 | 1 | -1/+2 |
| | | * | | 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 | 2 | -2/+16 |
| * | | | Enables script access to the per object dynamic attributes through the JsonStore | Mic Bowman | 2013-02-06 | 5 | -13/+104 |
| | |/
| |/| |
|
| * | | BulletSim: remove an exception which occurs if a physics mesh | Robert Adams | 2013-02-06 | 1 | -2/+4 |
* | | | Merge branch 'master' into careminster | Melanie | 2013-02-07 | 0 | -0/+0 |
|\ \ \
| |/ / |
|
| * | | Fix a bug I brought in by manually editing a diff file. Terrain is if cource ... | Melanie | 2013-02-06 | 1 | -1/+1 |
| * | | Partial port of Avination's support for the new physics parameters. | Melanie | 2013-02-06 | 7 | -21/+264 |
* | | | Merge branch 'master' into careminster | Melanie | 2013-02-06 | 8 | -147/+8 |
|\ \ \
| |/ / |
|
| * | | minor: Add explanation of MaptileStaticUUID setting in Regions.ini.example | Justin Clark-Casey (justincc) | 2013-02-06 | 1 | -0/+4 |
| * | | Remove long unused Scene.DumpAssetsToFile boolean. | Justin Clark-Casey (justincc) | 2013-02-06 | 4 | -9/+3 |
| * | | 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 | 24 | -462/+373 |
|\ \ \
| |/ / |
|
| * | | 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 | 17 | -196/+230 |
| |\ \ |
|
| | * | | BulletSim: make removing zero width triangles from meshes optional | Robert Adams | 2013-02-05 | 4 | -24/+33 |
| | |/ |
|
| | * | BulletSim: remove degenerate triangles from meshes. This fixes the | Robert Adams | 2013-02-05 | 6 | -59/+61 |
| | * | BulletSim: add debugging looking for doorway sculpty problems | Robert Adams | 2013-02-05 | 3 | -4/+33 |
| | * | BulletSim: rework some parameter setting implementation moving functionality ... | Robert Adams | 2013-02-05 | 9 | -158/+152 |
| | * | BulletSim: correct angular vertical attraction to properly correct an upside ... | Robert Adams | 2013-02-05 | 1 | -1/+1 |
| | * | Changed protection of CreateDefaultAppearanceEntries to protected, so extensi... | Diva Canto | 2013-02-05 | 1 | -1/+1 |
| * | | refactor: Move functions that lookup asset ids from task inventory or pass th... | Justin Clark-Casey (justincc) | 2013-02-06 | 2 | -89/+137 |
| |/ |
|
* | | Merge branch 'master' into careminster | Melanie | 2013-02-05 | 0 | -0/+0 |
|\ \
| |/ |
|
| * | * the root prim was being given an OffsetPosition in addition to setting the ... | teravus | 2013-02-05 | 1 | -1/+1 |
* | | Merge branch 'master' into careminster | Melanie | 2013-02-05 | 84 | -85/+630 |
|\ \
| |/ |
|
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2013-02-05 | 83 | -83/+630 |
| |\ |
|
| | * | Fix bug where viewers would not see the "Module command functions not enabled... | Justin Clark-Casey (justincc) | 2013-02-05 | 1 | -2/+62 |
| | * | Merge branch 'dynamic-attributes2' | Justin Clark-Casey (justincc) | 2013-02-05 | 12 | -10/+497 |
| | |\ |
|
| | | * | Remove the accidental PrimShapes column that I added back to the SQLite regio... | Justin Clark-Casey (justincc) | 2013-01-25 | 1 | -2/+1 |
| | | * | Fix tests by adding DynAttrs add column commands to RegionStore.migrations (t... | Justin Clark-Casey (justincc) | 2013-01-25 | 1 | -0/+6 |
| | | * | Added unit tests for Dynamic Attributes | Oren Hurvitz | 2013-01-25 | 2 | -0/+38 |
| | | * | Disabled DAExampleModule | Oren Hurvitz | 2013-01-25 | 1 | -5/+13 |
| | | * | Added DynAttrs to the serialized XML format of prims. When copying prims, use... | Oren Hurvitz | 2013-01-25 | 3 | -2/+40 |
| | | * | Store NULL in the 'DynAttrs' column if the prim doesn't have any dynamic attr... | Oren Hurvitz | 2013-01-25 | 3 | -3/+15 |
| | | * | Stopped storing dynamic attributes in the PrimShape | Oren Hurvitz | 2013-01-25 | 6 | -35/+5 |
| | | * | Changed DAMap to be the container of "data stores", which are OSDMaps. Store ... | Oren Hurvitz | 2013-01-25 | 2 | -32/+97 |