aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-02-0811-95/+348
|\
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimMic Bowman2013-02-081-32/+57
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-02-083-10/+17
| | |\
| | * | Don't allow exceptions to propogate from FlotsamAssetCache which may occur wh...Justin Clark-Casey (justincc)2013-02-081-32/+57
| * | | Adds size limits to JsonStore. Adds a separate configurationMic Bowman2013-02-082-2/+66
| | |/ | |/|
| * | Fix the return values for JsonDestroyStore, JsonRemoveValue, and JsonSetValue.Mic Bowman2013-02-083-10/+17
| |/
| * If a component of a coalesced object fails to deserialization, do not add a n...Justin Clark-Casey (justincc)2013-02-081-4/+18
| * On IAR loading, if loading of a coaleseced item entirely fails, then continue...Justin Clark-Casey (justincc)2013-02-081-0/+18
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-02-083-35/+105
| |\
| | * BulletSim: Adapt BulletSim to the newer physical properties. ViewerRobert Adams2013-02-072-30/+28
| | * BulletSim: fix exceptions caused by setting physical properties before the pr...Robert Adams2013-02-071-5/+10
| | * BulletSim: add user setting of friction, density and restitution.Robert Adams2013-02-073-27/+94
| * | Refine TestJsonReadNotecard() and use / instead of . to separate paths.Justin Clark-Casey (justincc)2013-02-081-15/+46
| |/
| * Extend TestJsonReadNotecard() for reads to non-root locations and fake stores.Justin Clark-Casey (justincc)2013-02-081-9/+33
* | Merge branch 'master' into careminsterMelanie2013-02-081-10/+98
|\ \ | |/
| * Stop wrongly create a receiving store already populated with "Hello":"World" ...Justin Clark-Casey (justincc)2013-02-081-1/+3
| * Extend TestJsonWriteNotecard() regression test for cases with fake paths and ...Justin Clark-Casey (justincc)2013-02-081-8/+61
| * Extend TestJsonSetValue() regressio ntes tto test against a fake storeJustin Clark-Casey (justincc)2013-02-081-0/+5
| * Extend TestJsonTestPath() regression test with checks against fake values and...Justin Clark-Casey (justincc)2013-02-081-0/+8
| * Add tests for removing fake values/from fake store in TestJsonRemoveValue()Justin Clark-Casey (justincc)2013-02-071-0/+11
| * Add testing for getting non-existing values and values from a non-existing da...Justin Clark-Casey (justincc)2013-02-071-1/+10
* | 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
generated by cgit v1.1 at 2024-12-24 03:30:00 +0000