| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2013-03-14 | 1 | -3/+34 |
| |\ | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs | ||||
| | * | Make llGetObjectDetails() return the correct world rotation for a sitting avatar | Justin Clark-Casey (justincc) | 2013-03-14 | 1 | -5/+35 |
| | | | | | | | | | | | | | This addresses http://opensimulator.org/mantis/view.php?id=6567 This creates a ScenePresence.GetWorldRotation() with the same semantics as SOP.GetWorldRotation() SP.Rotation can't be used since it's relative to the sat upon prim if the avatar is sitting. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-03-08 | 1 | -18/+19 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | ||||
| | * | Add regression test for presence crossing between regions on the same simulator. | Justin Clark-Casey (justincc) | 2013-03-06 | 1 | -18/+19 |
| | | | | | | | | | Unlike a much earlier commented out version of this test, this is done in synchronous mode. | ||||
| * | | 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 | 1 | -1/+5 |
| |\ \ | |/ | |||||
| | * | * Fix walking to <NaN, NaN, NaN> via autopilot. | teravus | 2013-02-16 | 1 | -1/+5 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-02-10 | 1 | -0/+11 |
| |\ \ | |/ | |||||
| | * | 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 | 1 | -1/+10 |
| | | | | | | | | | 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 'avination' into careminster | Melanie | 2013-02-07 | 1 | -0/+2 |
| |\ \ | |||||
| | * | | Move SoubleQueu to Util. Change HTTP inv to prioritize COF. Determine COF for SP | Melanie | 2013-02-06 | 1 | -0/+2 |
| | | | | |||||
| | * | | * 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 | ||||
| | * | | revert the test, sending again appearance to self in | UbitUmarov | 2013-01-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | ValidateAndSendAppearanceAndAgentData() | ||||
| | * | | *TEST TEST TEST* don't send AvatarAppearance to self | UbitUmarov | 2013-01-17 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-02-04 | 1 | -2/+3 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Sit and Spin reduction. If sitting, slam avatar angular velocity to zero. | teravus | 2013-02-01 | 1 | -2/+3 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-01-31 | 1 | -0/+121 |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | ||||
| | * | | * This adds a bit more to the previous flying roll effect by adding ↵ | teravus | 2013-01-30 | 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. ↵ | teravus | 2013-01-30 | 1 | -0/+81 |
| | | | | | | | | | | | | | (General, not physics). Makes flying not feel as stiff. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-01-23 | 1 | -2/+1 |
| |\ \ \ | |/ / | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/BulletSNPlugin/BSShapeCollection.cs | ||||
| | * | | Check the existing ScenePresence.ParentPart to make sure we're not trying to ↵ | Justin Clark-Casey (justincc) | 2013-01-19 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | | | sit on a prim we're already sat upon, rather than looking up the part from scratch. An adaptation of commit 055b8a2 Having both ParentID and ParentPart references now is redundant. ParentID should probably be eliminated. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-01-19 | 1 | -1/+1 |
| |\ \ \ | |/ / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs | ||||
| | * | | Restore previous client AO behaviour by not allowing them to remove the ↵ | Justin Clark-Casey (justincc) | 2013-01-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | default animation but continue to allow scripts to do so. This keeps the fix from http://opensimulator.org/mantis/view.php?id=6327 and fixes the behaviour regression in http://opensimulator.org/mantis/view.php?id=6483 Animations may still exhibit different behaviour if both scripts and clients are adjusting animations. A change in the behaviour of client AO to not remove all animations may be a better long term approach. | ||||
| * | | | Merge commit 'f54b398540698e6e09022fe77b6405624b532f5c' into careminster | Melanie | 2013-01-16 | 1 | -0/+4 |
| |\ \ \ | |/ / | |||||
| | * | | move resit fix to ScenePresence.cs and allow for requesting sit on objects ↵ | dahlia | 2013-01-14 | 1 | -0/+4 |
| | | | | | | | | | | | | | other than the object currently sat on | ||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2013-01-10 | 1 | -58/+70 |
| |\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | | Remove now superfluous update of m_lastSize | Melanie | 2013-01-08 | 1 | -3/+0 |
| | | | | |||||
| | * | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | Melanie | 2013-01-08 | 1 | -0/+2 |
| | |\ \ | |||||
| | | * | | also update m_lastSize in SendAvatarDataToAllAgents so more paths update | UbitUmarov | 2013-01-08 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | it | ||||
| | | * | | Revert "Remove sending AvatarData because this also happens on login, where ↵ | Melanie | 2013-01-08 | 1 | -1/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | it chokes" This reverts commit d1fa650c3f16ee74cd39d9258c5ef7aa4869ca03. | ||||
| | | * | | Merge branch 'ubitwork' into avination | Melanie | 2013-01-08 | 1 | -45/+61 |
| | | |\ \ | |||||
| | | * | | | Remove sending AvatarData because this also happens on login, where it chokes | Melanie | 2013-01-08 | 1 | -9/+1 |
| | | | | | | | | | | | | | | | | | | | | | Firestorm, Singularity and other viewers with the new appearance pipeline. | ||||
| | * | | | | Prevent avatar data from being sent during login when it's not valid and | Melanie | 2013-01-08 | 1 | -2/+5 |
| | | |/ / | |/| | | | | | | | | | | crashes login on some viewers. | ||||
| | * | | | put back position and rot change check before sending releasing plane constrain | UbitUmarov | 2013-01-08 | 1 | -4/+7 |
| | | | | | |||||
| | * | | | reduce sampling of camera raycasts to previus value | UbitUmarov | 2013-01-08 | 1 | -23/+26 |
| | | | | | |||||
| | * | | | * DAnger, TEST * change camera plane collision detection. Still bounces on | UbitUmarov | 2013-01-08 | 1 | -49/+59 |
| | |/ / | | | | | | | | | | * prim edges due to camera lag | ||||
| | * | | in raycast for camera exclude self detection | UbitUmarov | 2013-01-07 | 1 | -3/+2 |
| | | | | |||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2013-01-06 | 1 | -51/+111 |
| |\ \ \ | |/ / | |||||
| | * | | check land permitions on sit target for unscripted sits | UbitUmarov | 2013-01-03 | 1 | -0/+17 |
| | | | | |||||
| | * | | make ResetMoveToTarget cancel any 'force' waiting to be applied to avatar | UbitUmarov | 2013-01-03 | 1 | -7/+2 |
| | | | | | | | | | | | | | ( by the odd use of Velocity) | ||||
| | * | | cancel MoveToTarget (viewer 'go here") on sits | UbitUmarov | 2013-01-03 | 1 | -2/+22 |
| | | | | |||||
| | * | | *TEST* avatar unscripted sit. Some guessing/automation | UbitUmarov | 2013-01-02 | 1 | -2/+4 |
| | | | | |||||
| | * | | Merge branch 'ubitwork' into avination | Melanie | 2012-12-22 | 1 | -47/+46 |
| | |\ \ | |||||
| | | * | | some clean up/fix | UbitUmarov | 2012-12-17 | 1 | -47/+46 |
| | | | | | |||||
| | * | | | * Partial Commit for Avatar Appearance to include the functionality of ↵ | teravus | 2012-12-21 | 1 | -10/+17 |
| | | | | | | | | | | | | | | | | | Cached Bakes. | ||||
| | * | | | * Send an Unsolicited AgentDataUpdate packet upon Root Agent Status to ↵ | teravus | 2012-12-19 | 1 | -0/+20 |
| | |/ / | | | | | | | | | | synchronize with Agni. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-12-30 | 1 | -2/+2 |
| |\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |