aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-02-071-0/+20
|\
| * Actually plumb the new values to physics.Melanie2013-02-071-0/+20
* | Merge branch 'master' into careminsterMelanie2013-02-073-15/+29
|\ \ | |/
| * 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-0720-68/+474
| | |\
| | * | 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-078-6/+119
| * | 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
* | | Merge branch 'avination' into careminsterMelanie2013-02-076-134/+111
|\ \ \
| * | | Rename Bounciness to RestitutionMelanie2013-02-075-10/+10
| * | | Move SoubleQueu to Util. Change HTTP inv to prioritize COF. Determine COF for SPMelanie2013-02-064-115/+79
| * | | Make scripts shout a error but not stop when button count is overrun on llDialogMelanie2013-02-051-7/+9
| * | | Merge branch 'teravuswork' into avinationMelanie2013-01-311-12/+23
| |\ \ \
| | * | | * This Checks the asset of each wearable asynchronously and repairs if it's r...teravus2013-01-291-12/+23
| * | | | * This adds a bit more to the previous flying roll effect by adding additiona...teravus2013-01-311-10/+50
| * | | | * Adds a satisfying angular roll when an avatar is flying and turning. (Gene...Melanie2013-01-312-2/+84
* | | | | Merge branch 'master' into careminsterMelanie2013-02-075-43/+231
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | 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
| * | | | Rename "Bounciness" to "Restitution"Melanie2013-02-073-7/+7
* | | | | Rename Bounciness to RestitutionMelanie2013-02-075-10/+10
* | | | | Merge branch 'master' into careminsterMelanie2013-02-071-1/+60
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-02-075-14/+97
| |\ \ \ \
| * | | | | Add TestJsonWriteReadNotecard() regression testJustin Clark-Casey (justincc)2013-02-071-1/+44
| * | | | | 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
* | | | | | Merge branch 'master' into careminsterMelanie2013-02-078-26/+122
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimMic Bowman2013-02-064-11/+22
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2013-02-0615-443/+358
| | |\ \ \ \ | | | |/ / /
| | | * | | 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
| | * | | | WebStats will now use actual logfile as specified in OpenSim.exe.config rathe...Dan Lake2013-02-061-1/+1
| * | | | | Enables script access to the per object dynamic attributes through the JsonStoreMic Bowman2013-02-064-13/+96
| | |/ / / | |/| | |
| * | | | BulletSim: remove an exception which occurs if a physics meshRobert Adams2013-02-061-2/+4
| * | | | Partial port of Avination's support for the new physics parameters.Melanie2013-02-064-3/+163
* | | | | Merge branch 'master' into careminsterMelanie2013-02-065-144/+2
|\ \ \ \ \ | |/ / / /
| * | | | Remove long unused Scene.DumpAssetsToFile boolean.Justin Clark-Casey (justincc)2013-02-062-6/+1
| * | | | Remove very long unused IScriptHost and NullScriptHostJustin Clark-Casey (justincc)2013-02-063-138/+1
* | | | | Merge branch 'master' into careminsterMelanie2013-02-0618-447/+370
|\ \ \ \ \ | |/ / / /
| * | | | 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-0611-181/+227
| |\ \ \ \
| | * | | | BulletSim: make removing zero width triangles from meshes optionalRobert Adams2013-02-052-24/+33
| | |/ / /
| | * | | BulletSim: remove degenerate triangles from meshes. This fixes theRobert Adams2013-02-055-45/+59
| | * | | BulletSim: add debugging looking for doorway sculpty problemsRobert Adams2013-02-053-4/+33
generated by cgit v1.1 at 2024-10-25 18:37:59 +0000