aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
...
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimMic Bowman2013-02-0826-279/+697
|\
| * Fixed ReadSculptData(): the check whether there are enough bytes to read was ...Oren Hurvitz2013-02-091-5/+6
| * Fixed check for 0 results in GetUserAccounts()Oren Hurvitz2013-02-091-1/+1
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-02-0920-259/+716
| |\
| | * BulletSim: add parameter to set global contact breaking threshold. Update DLL...Robert Adams2013-02-086-0/+7
| | * BulletSim: Change BSCharacter to use new base Density and FrictionRobert Adams2013-02-082-16/+12
| | * BulletSim: fix avatar bobbing or jiggling while stationary flying.Robert Adams2013-02-086-19/+34
| | * BulletSim: add initial instance of the ExtendedPhysics region module which ad...Robert Adams2013-02-081-0/+163
| | * BulletSim: include the linkage to the layered prim implementation. Separate l...Robert Adams2013-02-088-225/+109
| | * BulletSim: reclass BSPrim into layers so linkset and physical world displacem...Robert Adams2013-02-082-0/+297
| * | Change TestDestroyStore() and TestJsonRemoveValue() to reflect the fact that ...Justin Clark-Casey (justincc)2013-02-091-5/+2
| * | Added physics parameters support to MSSQL and SQLite (not tested)Oren Hurvitz2013-02-096-13/+71
* | | Make JsonStore path parsing more robust. Should fix theMic Bowman2013-02-082-21/+59
| |/ |/|
* | Broaden the internal OSD type checks to parse JSON that hasMic Bowman2013-02-081-2/+29
* | 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-083-2/+70
| |/ |/|
* | 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
* 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
* Actually plumb the new values to physics.Melanie2013-02-071-0/+20
* 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
| | |\ \ | | | |/ | | |/|