| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2013-02-08 | 1 | -10/+98 |
| |\ | |||||
| | * | Stop wrongly create a receiving store already populated with "Hello":"World" ↵ | Justin Clark-Casey (justincc) | 2013-02-08 | 1 | -1/+3 |
| | | | | | | | | | in TestJsonReadNotecard() | ||||
| | * | Extend TestJsonWriteNotecard() regression test for cases with fake paths and ↵ | Justin Clark-Casey (justincc) | 2013-02-08 | 1 | -8/+61 |
| | | | | | | | | | | | | | fake stores. Also separates out TestJsonWriteReadNotecard() into separate write and read tests | ||||
| | * | Extend TestJsonSetValue() regressio ntes tto test against a fake store | Justin Clark-Casey (justincc) | 2013-02-08 | 1 | -0/+5 |
| | | | |||||
| | * | Extend TestJsonTestPath() regression test with checks against fake values ↵ | Justin Clark-Casey (justincc) | 2013-02-08 | 1 | -0/+8 |
| | | | | | | | | | and fake stores | ||||
| | * | Add tests for removing fake values/from fake store in TestJsonRemoveValue() | Justin Clark-Casey (justincc) | 2013-02-07 | 1 | -0/+11 |
| | | | | | | | | | Again, need to check if returning true for removing a value that doesn't exist is most appropriate. | ||||
| | * | Add testing for getting non-existing values and values from a non-existing ↵ | Justin Clark-Casey (justincc) | 2013-02-07 | 1 | -1/+10 |
| | | | | | | | | | datastore to TestJsonGetValue() | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-02-07 | 1 | -0/+20 |
| |\ \ | |/ | |||||
| | * | Actually plumb the new values to physics. | Melanie | 2013-02-07 | 1 | -0/+20 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-02-07 | 3 | -15/+29 |
| |\ \ | |/ | |||||
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2013-02-07 | 3 | -15/+29 |
| | |\ | |||||
| | | * | Add TestJsonDestoreStoreNotExists() | Justin Clark-Casey (justincc) | 2013-02-07 | 1 | -0/+14 |
| | | | | | | | | | | | | | | | | This still returns true even if we ask to destroy a store that does not exist. Need to check that this is more appropriate behaviour. | ||||
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-02-07 | 20 | -68/+474 |
| | | |\ | |||||
| | | * | | Fix a recent regression in e17392a where JsonSetValue() stopped working ↵ | Justin Clark-Casey (justincc) | 2013-02-07 | 3 | -15/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (probably other functions as well). Fix is to call through to the no-arg constructor from the string constructor in JsonStore, which I suspect was just forgotten. This was actually picked up by the TestJsonSetValue() regression test failing But this isn't being run on jenkins due to the .net version issue. This commit also puts the full stack trace in logged messages and makes these error level messages instead of info | ||||
| | * | | | Add some more code from Avination. This changes physics actor stuff around | Melanie | 2013-02-07 | 3 | -40/+165 |
| | | |/ | |/| | | | | | | | to work with the new params. Not actually plumbed just yet. | ||||
| | * | | Plumb the path from the client to the extra physics params and back | Melanie | 2013-02-07 | 8 | -6/+119 |
| | | | | |||||
| | * | | Send the new physics params to the viewer build dialog | Melanie | 2013-02-07 | 1 | -0/+35 |
| | | | | |||||
| | * | | Revert "Add plumbing for physics properties to get to the physics engine." | Melanie | 2013-02-07 | 2 | -55/+6 |
| | | | | | | | | | | | | | This reverts commit c658fa1c0dd83f23c66ccfedb12e8ab02ff01d0a. | ||||
| | * | | Add plumbing for physics properties to get to the physics engine. | Robert Adams | 2013-02-07 | 2 | -6/+55 |
| | | | | | | | | | | | | | Addition of entries to PhysicsActor and setting code in SceneObjectPart. | ||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2013-02-07 | 6 | -134/+111 |
| |\ \ \ | |||||
| | * | | | Rename Bounciness to Restitution | Melanie | 2013-02-07 | 5 | -10/+10 |
| | | | | | |||||
| | * | | | Move SoubleQueu to Util. Change HTTP inv to prioritize COF. Determine COF for SP | Melanie | 2013-02-06 | 4 | -115/+79 |
| | | | | | |||||
| | * | | | Make scripts shout a error but not stop when button count is overrun on llDialog | Melanie | 2013-02-05 | 1 | -7/+9 |
| | | | | | |||||
| | * | | | Merge branch 'teravuswork' into avination | Melanie | 2013-01-31 | 1 | -12/+23 |
| | |\ \ \ | |||||
| | | * | | | * This Checks the asset of each wearable asynchronously and repairs if it's ↵ | teravus | 2013-01-29 | 1 | -12/+23 |
| | | | | | | | | | | | | | | | | | | | | | required. | ||||
| | * | | | | * This adds a bit more to the previous flying roll effect by adding ↵ | teravus | 2013-01-31 | 1 | -10/+50 |
| | | | | | | | | | | | | | | | | | | | | | additional roll when pressing page down, and reducing your roll when pressing page up to make it feel more responsive and give the user more visual feedback. | ||||
| | * | | | | * Adds a satisfying angular roll when an avatar is flying and turning. ↵ | Melanie | 2013-01-31 | 2 | -2/+84 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (General, not physics). Makes flying not feel as stiff. Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | ||||
| * | | | | | Merge branch 'master' into careminster | Melanie | 2013-02-07 | 5 | -43/+231 |
| |\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | Conflicts: bin/HttpServer_OpenSim.dll | ||||
| | * | | | | Change passed PhysicsParameter value from float to the more general string value | Robert Adams | 2013-02-07 | 4 | -43/+57 |
| | | | | | | |||||
| | * | | | | Websocket Echo module should not be on by default. | teravus | 2013-02-07 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | * missing example module.. Oops. | teravus | 2013-02-07 | 1 | -0/+174 |
| | | | | | | |||||
| | * | | | | Rename "Bounciness" to "Restitution" | Melanie | 2013-02-07 | 3 | -7/+7 |
| | | | | | | |||||
| * | | | | | Rename Bounciness to Restitution | Melanie | 2013-02-07 | 5 | -10/+10 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into careminster | Melanie | 2013-02-07 | 1 | -1/+60 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-02-07 | 5 | -14/+97 |
| | |\ \ \ \ | |||||
| | * | | | | | Add TestJsonWriteReadNotecard() regression test | Justin Clark-Casey (justincc) | 2013-02-07 | 1 | -1/+44 |
| | | | | | | | |||||
| | * | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | any race related test failures in the future. | ||||
| * | | | | | | Merge branch 'master' into careminster | Melanie | 2013-02-07 | 8 | -26/+122 |
| |\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs | ||||
| | * | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Mic Bowman | 2013-02-06 | 4 | -11/+22 |
| | |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| | | * | | | | Merge branch 'master' of git://opensimulator.org/git/opensim | Dan Lake | 2013-02-06 | 15 | -443/+358 |
| | | |\ \ \ \ | | | |/ / / | |||||
| | | | * | | | BulletSim: set removing zero width triangles in meshes to be enabled by ↵ | Robert Adams | 2013-02-06 | 2 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | default. This should fix the invisible barrier in sculptie doorways bug. | ||||
| | | | * | | | BulletSim: check for completely degenerate meshes (ones with all | Robert Adams | 2013-02-06 | 1 | -9/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | triangles having zero width) and output an error rather than throwing and exception. | ||||
| | | * | | | | WebStats will now use actual logfile as specified in OpenSim.exe.config ↵ | Dan Lake | 2013-02-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | rather than hardcoded ./OpenSim.log. This allows for rotating logs and other file appender types | ||||
| | * | | | | | Enables script access to the per object dynamic attributes through the JsonStore | Mic Bowman | 2013-02-06 | 4 | -13/+96 |
| | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | script functions. Adds JsonAttachObjectStore to associate a store identifier with an object (scripts can only access the store in their host object, this could be extended but isn't necessary for now). Note this opens a method to the DAMap OSDMap. This will be removed later, but greatly simplifies the code for now. The JsonStore and these scripts are disabled by default. | ||||
| | * | | | | BulletSim: remove an exception which occurs if a physics mesh | Robert Adams | 2013-02-06 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | asset is not found. | ||||
| | * | | | | Partial port of Avination's support for the new physics parameters. | Melanie | 2013-02-06 | 4 | -3/+163 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implements the parameters as properties, the serialization and database storage (MySQL only). Implements llSetPrimitiveParams for prim physics shape and the other 4 extra params. Only the prim shape type "None" is currently functional. No support for the Viewer UI (yet), that will be ported in due course. Lots more to port, this is a large-ish changeset. | ||||
| * | | | | | Merge branch 'master' into careminster | Melanie | 2013-02-06 | 5 | -144/+2 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | Remove long unused Scene.DumpAssetsToFile boolean. | Justin Clark-Casey (justincc) | 2013-02-06 | 2 | -6/+1 |
| | | | | | | |||||
| | * | | | | 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 | 18 | -447/+370 |
| |\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs | ||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |