| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 | ||||
| | * | | ScenePresence passes the avatar rotation down to the physics engine. This ↵ | Robert Adams | 2012-12-28 | 1 | -0/+4 |
| | | | | | | | | | | | | | will be a no-op for ODE but enables asymmetrical avatars for BulletSim. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-12-28 | 1 | -3/+8 |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | | Add check to always push terse updates for presences that have new ↵ | Robert Adams | 2012-12-27 | 1 | -3/+8 |
| | | | | | | | | | | | | | velocities of zero. | ||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-12-18 | 1 | -183/+120 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | * TEST * unscripted sit | UbitUmarov | 2012-12-17 | 1 | -174/+48 |
| | | | | |||||
| | * | | right fix this time ?? | UbitUmarov | 2012-12-13 | 1 | -1/+1 |
| | | | | |||||
| | * | | fix the 'fix' | UbitUmarov | 2012-12-13 | 1 | -2/+2 |
| | | | | |||||
| | * | | fix coment out code not in use | UbitUmarov | 2012-12-13 | 1 | -2/+2 |
| | | | | |||||
| | * | | FIX small avatars movement on terrain. (avatar appearance getting even | UbitUmarov | 2012-12-13 | 1 | -4/+36 |
| | | | | | | | | | | | | | more messy) | ||||
| | * | | add some default size setting and checks | UbitUmarov | 2012-12-07 | 1 | -1/+2 |
| | | | | |||||
| | * | | revert the use of avatar skeleton and use avatar size provided by viewers, | UbitUmarov | 2012-12-07 | 1 | -2/+2 |
| | | | | | | | | | | | | | since at least for now seems good enought | ||||
| | * | | create a new ode character also with the new information | UbitUmarov | 2012-12-07 | 1 | -0/+6 |
| | | | | |||||
| | * | | *TEST* Use new avatar size in ubitODE. | UbitUmarov | 2012-12-07 | 1 | -0/+6 |
| | | | | |||||
| | * | | avatar collision plane send to viewer is only relative to feet. change | UbitUmarov | 2012-12-05 | 1 | -4/+11 |
| | | | | | | | | | | | | | avatar collider, just rounding the boxes, etc | ||||
| | * | | *TEST* diferent avatar collider | UbitUmarov | 2012-12-03 | 1 | -2/+13 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-12-16 | 1 | -30/+6 |
| |\ \ \ | |/ / |/| / | |/ | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | ||||
| | * | Simplify sit code a bit by determining correct animation in HandleSit ↵ | Dan Lake | 2012-12-13 | 1 | -30/+6 |
| | | | | | | | | | instead of HandleSitRequest. This eliminates m_nextSitAnimation, an unneeded state-saving variable in ScenePresence | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-11-20 | 1 | -3/+20 |
| |\ \ | |/ | |||||
| | * | Minor formatting for 0962a35d and a few one-line comments as to why that ↵ | Justin Clark-Casey (justincc) | 2012-11-20 | 1 | -8/+7 |
| | | | | | | | | | code is there | ||||
| | * | Fix movetotarget on mega regions. | Iain Oliver | 2012-11-20 | 1 | -3/+21 |
| | | | |||||
| * | | Merge branch 'avination' into careminster | Melanie | 2012-11-17 | 1 | -0/+5 |
| |\ \ | |||||
| | * | | Pipe Throttle Update Event to EventManager, client --> ScenePresence --> ↵ | teravus | 2012-11-04 | 1 | -0/+5 |
| | | | | | | | | | | | | | EventManager, so that modules can know when throttles are updated. The event contains no client specific data to preserve the possibility of 'multiple clients' and you must still call ControllingClient.GetThrottlesPacked(f) to see what the throttles actually are once the event fires. Hook EventManager.OnUpdateThrottle to GetTextureModule. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-11-03 | 1 | -3/+3 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Change to earlier commit for TargetVelocity to support distributed physics. | Dan Lake | 2012-11-02 | 1 | -3/+3 |
| | | | | |||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |