aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
...
* Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-02-073-15/+29
|\
| * Add TestJsonDestoreStoreNotExists()Justin Clark-Casey (justincc)2013-02-071-0/+14
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-02-0734-2976/+4555
| |\
| * | Fix a recent regression in e17392a where JsonSetValue() stopped working (prob...Justin Clark-Casey (justincc)2013-02-073-15/+15
* | | Add some more code from Avination. This changes physics actor stuff aroundMelanie2013-02-073-40/+165
| |/ |/|
* | Plumb the path from the client to the extra physics params and backMelanie2013-02-0710-7/+127
* | Send the new physics params to the viewer build dialogMelanie2013-02-071-0/+35
* | Revert "Add plumbing for physics properties to get to the physics engine."Melanie2013-02-072-55/+6
* | Add plumbing for physics properties to get to the physics engine.Robert Adams2013-02-072-6/+55
* | Change passed PhysicsParameter value from float to the more general string valueRobert Adams2013-02-074-43/+57
* | Websocket Echo module should not be on by default.teravus2013-02-071-1/+1
* | * missing example module.. Oops.teravus2013-02-071-0/+174
* | * Adds Websocket support to baseHttpServer and IHttpServer.cs . This allows...teravus2013-02-07128-1214/+1475
|\ \
| * | Rename "Bounciness" to "Restitution"Melanie2013-02-074-9/+9
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-02-077-15/+120
| |\ \
| | * \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimMic Bowman2013-02-066-13/+43
| | |\ \ | | | |/ | | |/|
| | | * Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2013-02-0623-429/+435
| | | |\
| | | * | WebStats will now use actual logfile as specified in OpenSim.exe.config rathe...Dan Lake2013-02-062-2/+16
| | * | | Enables script access to the per object dynamic attributes through the JsonStoreMic Bowman2013-02-065-13/+104
| * | | | Add TestJsonWriteReadNotecard() regression testJustin Clark-Casey (justincc)2013-02-072-2/+45
| * | | | Make json store tests operate on a single thread to ensure we don't run into ...Justin Clark-Casey (justincc)2013-02-071-0/+16
| | |_|/ | |/| |
| * | | minor: add method doc to DAMap.ValidateKey()Justin Clark-Casey (justincc)2013-02-071-0/+4
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimRobert Adams2013-02-061-1/+2
| |\ \ \
| | * | | Add key length validation to DAMap.Add(KeyValuePair<string, OSDMap> kvp) to m...Justin Clark-Casey (justincc)2013-02-071-1/+2
| * | | | BulletSim: set removing zero width triangles in meshes to be enabled by defau...Robert Adams2013-02-062-1/+2
| |/ / /
| * | | BulletSim: check for completely degenerate meshes (ones with allRobert Adams2013-02-061-9/+19
| |/ /
| * | BulletSim: remove an exception which occurs if a physics meshRobert Adams2013-02-061-2/+4
| * | Fix a bug I brought in by manually editing a diff file. Terrain is if cource ...Melanie2013-02-061-1/+1
| * | Partial port of Avination's support for the new physics parameters.Melanie2013-02-067-21/+264
| * | minor: Add explanation of MaptileStaticUUID setting in Regions.ini.exampleJustin Clark-Casey (justincc)2013-02-061-0/+4
| * | Remove long unused Scene.DumpAssetsToFile boolean.Justin Clark-Casey (justincc)2013-02-064-9/+3
| * | Remove very long unused IScriptHost and NullScriptHostJustin Clark-Casey (justincc)2013-02-063-138/+1
| * | Remove unused ScriptEngineLoader and ScriptEngineInterface in OpenSim.Region....Justin Clark-Casey (justincc)2013-02-063-168/+0
| * | Remove wrong code in ScriptUtils.GetAssetIdFromKeyOrItemName which would retu...Justin Clark-Casey (justincc)2013-02-061-15/+0
| * | Allow JsonReadNotecard() to accept the name of the notecard as well as the as...Justin Clark-Casey (justincc)2013-02-061-8/+18
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-02-0617-196/+230
| |\ \
| | * | BulletSim: make removing zero width triangles from meshes optionalRobert Adams2013-02-054-24/+33
| | |/
| | * BulletSim: remove degenerate triangles from meshes. This fixes theRobert Adams2013-02-056-59/+61
| | * BulletSim: add debugging looking for doorway sculpty problemsRobert Adams2013-02-053-4/+33
| | * BulletSim: rework some parameter setting implementation moving functionality ...Robert Adams2013-02-059-158/+152
| | * BulletSim: correct angular vertical attraction to properly correct an upside ...Robert Adams2013-02-051-1/+1
| | * Changed protection of CreateDefaultAppearanceEntries to protected, so extensi...Diva Canto2013-02-051-1/+1
| * | refactor: Move functions that lookup asset ids from task inventory or pass th...Justin Clark-Casey (justincc)2013-02-062-89/+137
| |/
| * * the root prim was being given an OffsetPosition in addition to setting the ...teravus2013-02-051-1/+1
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-02-0583-83/+630
| |\
| | * Fix bug where viewers would not see the "Module command functions not enabled...Justin Clark-Casey (justincc)2013-02-051-2/+62
| | * Merge branch 'dynamic-attributes2'Justin Clark-Casey (justincc)2013-02-0512-10/+497
| | |\
| | | * Remove the accidental PrimShapes column that I added back to the SQLite regio...Justin Clark-Casey (justincc)2013-01-251-2/+1
| | | * Fix tests by adding DynAttrs add column commands to RegionStore.migrations (t...Justin Clark-Casey (justincc)2013-01-251-0/+6
| | | * Added unit tests for Dynamic AttributesOren Hurvitz2013-01-252-0/+38