| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2013-02-28 | 2 | -18/+13 |
| |\ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneManager.cs | ||||
| | * | Add regression tests for llGetNotecardLine() | Justin Clark-Casey (justincc) | 2013-02-28 | 1 | -2/+2 |
| | | | |||||
| | * | Get "show modules" console command to obey selected command line region/s | Justin Clark-Casey (justincc) | 2013-02-27 | 1 | -16/+11 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-02-27 | 1 | -0/+11 |
| |\ \ | |/ | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | ||||
| | * | Add regression test for llRequestUrl() | Justin Clark-Casey (justincc) | 2013-02-26 | 1 | -0/+11 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-02-26 | 1 | -2/+9 |
| |\ \ | |/ | |||||
| | * | Move map related settings from [Startup] to a new [Map] section in OpenSim.ini | Justin Clark-Casey (justincc) | 2013-02-25 | 1 | -2/+9 |
| | | | | | | | | | | | | | | | Existing map settings in [Startup] will continue to work, and if present will override anything in [Map] However, the proper place for such settings would now be [Map] This is to reduce the use of [Startup] as a bag for non-generic settings which should really go in sections, in common with other settings. This commit also extends Diva's previous work to allow a default setting to be given when looking at multiple sections for settings. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-02-23 | 1 | -0/+6 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | ||||
| | * | minor: Add doc to ScenePresence.IsInTransit to make it clear that this is ↵ | Justin Clark-Casey (justincc) | 2013-02-22 | 1 | -0/+6 |
| | | | | | | | | | set only for region crossing and not teleport, etc. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-02-22 | 3 | -3/+6 |
| |\ \ | |/ | |||||
| | * | Fix the JsonStore path set problem justincc found earlier today and | Mic Bowman | 2013-02-19 | 1 | -1/+0 |
| | | | | | | | | | remove the deprecated TestPath functions. | ||||
| | * | Deleted all AssemblyFileVersion directives | Diva Canto | 2013-02-19 | 1 | -1/+1 |
| | | | |||||
| | * | * Fix walking to <NaN, NaN, NaN> via autopilot. | teravus | 2013-02-16 | 1 | -1/+5 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-02-16 | 3 | -5/+5 |
| |\ \ | |/ | |||||
| | * | Add regression test TestSaveNonRootFolderToIar | Justin Clark-Casey (justincc) | 2013-02-16 | 3 | -5/+5 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-02-15 | 3 | -3/+62 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | ||||
| | * | Rename new JsonScript functions JsonPathType() -> JsonGetPathType() and ↵ | Justin Clark-Casey (justincc) | 2013-02-14 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | JsonArrayLength() -> JsonGetArrayLength() This is for consistentency with the verb:noun naming approach existing json script functions and other script functions. Corresponding c# methods also changed since verb:noun is also the .net c# method naming guideline (as used by OpenSimulator) and for consistency with script functions. As agreed with cmickeyb | ||||
| | * | Add EventManager events triggered when a SOP is added or removed | Robert Adams | 2013-02-14 | 2 | -0/+57 |
| | | | | | | | | | from the physical scene. Invocations added in SceneObjectPart. | ||||
| | * | Add an event and some logic to allow customizing Simulator Features by avatar | Melanie | 2013-02-14 | 1 | -1/+5 |
| | | | |||||
| * | | Merge branch 'avination' into careminster | Melanie | 2013-02-14 | 1 | -1/+5 |
| |\ \ | |||||
| | * | | Add an event and some logic to allow customizing Simulator Features by avatar | Melanie | 2013-02-14 | 1 | -1/+5 |
| | | | | |||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2013-02-14 | 1 | -20/+75 |
| |\ \ \ | |/ / | |||||
| | * | | Revert "Make keyframes use the sim's frame timer" | Melanie | 2013-02-12 | 1 | -8/+15 |
| | | | | | | | | | | | | | This reverts commit e85a6237bfc0f00de4a183e29e515fa5baf1aa7f. | ||||
| | * | | Revert "Push updates from keyframe directly to the front of the output queue ↵ | Melanie | 2013-02-12 | 3 | -24/+9 |
| | | | | | | | | | | | | | | | | | | | rather" This reverts commit 04235e58e87ae42617111cad2884e42785914d4e. | ||||
| | * | | Push updates from keyframe directly to the front of the output queue rather | Melanie | 2013-02-12 | 3 | -9/+24 |
| | | | | | | | | | | | | | than through the update system. | ||||
| | * | | Make keyframes use the sim's frame timer | Melanie | 2013-02-11 | 1 | -15/+8 |
| | | | | |||||
| | * | | Refactor KeyframeMotion to use one timer class per scene | Melanie | 2013-02-11 | 1 | -20/+75 |
| | | | | |||||
| | * | | Actually plumb the new values to physics. | Melanie | 2013-02-07 | 1 | -0/+20 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-02-14 | 1 | -0/+15 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Adds a couple requested functions to the JsonStore script | Mic Bowman | 2013-02-13 | 1 | -0/+15 |
| | | | | | | | | | | | | | | | | | | | interface. JsonPathType returns the type of node pointed to by the path and deprecates the functionality of both JsonTestPath functions. JsonArrayLength returns the length of an array node. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-02-10 | 2 | -2/+18 |
| |\ \ \ | |/ / | |||||
| | * | | Fix code to check for no spawn points. Possibly a merge artefact? | Melanie | 2013-02-10 | 1 | -2/+4 |
| | | | | |||||
| | * | | Fix teleport/telehub issue: | BlueWall | 2013-02-10 | 2 | -3/+17 |
| | | | | | | | | | | | | | Fix bug that allowed only login access to regions with mis-configured telehubs. Administrators now have teleport access when there exists a mis-configured telehub in the region. Estate owners are now placed at region center in the absence of spawnpoints instead of being denied access. Grid Gods are unrestricted. All others are denied access to the region until spawnpoints are assigned to the telehub object. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-02-08 | 1 | -4/+18 |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | ||||
| | * | | If a component of a coalesced object fails to deserialization, do not add a ↵ | Justin Clark-Casey (justincc) | 2013-02-08 | 1 | -4/+18 |
| | | | | | | | | | | | | | | | | | | | | | | null where the object should be. This prevents a later load IAR failure. This code is currently only used by IAR loading. | ||||
| * | | | 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 |
| | | | | |||||
| | * | | Add some more code from Avination. This changes physics actor stuff around | Melanie | 2013-02-07 | 1 | -37/+152 |
| | | | | | | | | | | | | | 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 | 3 | -2/+26 |
| | | | | |||||
| | * | | Revert "Add plumbing for physics properties to get to the physics engine." | Melanie | 2013-02-07 | 1 | -50/+6 |
| | | | | | | | | | | | | | This reverts commit c658fa1c0dd83f23c66ccfedb12e8ab02ff01d0a. | ||||
| | * | | Add plumbing for physics properties to get to the physics engine. | Robert Adams | 2013-02-07 | 1 | -6/+50 |
| | | | | | | | | | | | | | Addition of entries to PhysicsActor and setting code in SceneObjectPart. | ||||
| | * | | Rename "Bounciness" to "Restitution" | Melanie | 2013-02-07 | 2 | -6/+6 |
| | | | | |||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2013-02-07 | 2 | -0/+9 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Rename Bounciness to Restitution | Melanie | 2013-02-07 | 2 | -6/+6 |
| | | | | |||||
| | * | | Move SoubleQueu to Util. Change HTTP inv to prioritize COF. Determine COF for SP | Melanie | 2013-02-06 | 2 | -0/+9 |
| | | | | |||||
| | * | | * 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 | 1 | -0/+81 |
| | | | | | | | | | | | | | | | | | | | | | | | | | (General, not physics). Makes flying not feel as stiff. Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | ||||
| * | | | Rename Bounciness to Restitution | Melanie | 2013-02-07 | 2 | -6/+6 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-02-07 | 1 | -0/+1 |
| |\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs | ||||
| | * | | Enables script access to the per object dynamic attributes through the JsonStore | Mic Bowman | 2013-02-06 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |