| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge commit 'aa19ccf65c9cd235e0ba941e9832c5240df4412c' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+1 |
| |\ | |||||
| | * | refactor: rename IClientAPI.SendPrimUpdate() to SendEntityUpdate() since it ↵ | Justin Clark-Casey (justincc) | 2011-10-14 | 1 | -1/+1 |
| | | | | | | | | | sends entity updates (including presence ones), not just prims. | ||||
| * | | Merge commit 'f08664f422f984fa57cc0ecb97c04eee3dccd183' into bigmerge | Melanie | 2011-10-25 | 1 | -7/+0 |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2011-10-12 | 1 | -7/+0 |
| | | | |||||
| * | | Fix ground sit autopilot | Melanie | 2011-10-25 | 1 | -8/+16 |
| | | | |||||
| * | | Allow updating the movement animation while flying. This fixes falling, | Melanie | 2011-10-21 | 1 | -20/+6 |
| | | | | | | | | | splatting and ground sit. Walking to a ground sit still doesn't work. | ||||
| * | | Fix up the animator and ScenePresence to like each other again | Melanie | 2011-10-20 | 1 | -0/+17 |
| | | | |||||
| * | | Merge commit 'e3c522e2118108a01d2c6f77c8065224d53d6bb9' into bigmerge | Melanie | 2011-10-12 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | Comment out [SCENE PRESENCE] SendAppearanceToAllOtherAgents: log message | Justin Clark-Casey (justincc) | 2011-10-07 | 1 | -1/+1 |
| | | | | | | | | | As per earlier discussions with dslake | ||||
| * | | Merge commit '4b46b7a5adb1c7449725ed1cf1fa5d7122af10bb' into bigmerge | Melanie | 2011-10-12 | 1 | -47/+47 |
| |\ \ | |/ | |||||
| | * | Fixed line endings from previous commit | Dan Lake | 2011-10-06 | 1 | -47/+47 |
| | | | |||||
| * | | Merge commit '4748c19bdbcdcaf6050e1f04a5f7394a88e0bf3e' into bigmerge | Melanie | 2011-10-12 | 1 | -67/+67 |
| |\ \ | |/ | |||||
| | * | Refactored "known child region" in ScenePresence. There were 4 different | Dan Lake | 2011-10-06 | 1 | -67/+67 |
| | | | | | | | | | | | | | ways to access the list/dictionary of child regions and locking was inconsistent. There are now public properties which enforce locks. Callers are no longer required to create new copies of lists. | ||||
| * | | Merge commit '9a16e76f5151c11fbf76e41b89f8eb03b1731828' into bigmerge | Melanie | 2011-10-12 | 1 | -11/+10 |
| |\ \ | |/ | |||||
| | * | Simplified IsInTransit property on ScenePresence and removed InTransit() ↵ | Dan Lake | 2011-10-06 | 1 | -11/+10 |
| | | | | | | | | | which called IsInTransit=true which called m_inTransit=true. Also removed NotInTransit(). | ||||
| * | | Merge commit '08f264d096e1dca535a64e683fa5ab5918368085' into bigmerge | Melanie | 2011-10-12 | 1 | -3/+0 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2011-10-06 | 1 | -29/+3 |
| | |\ | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| * | \ | Merge commit 'bd9ba904c3e4d9c2c626a7749f19f124b4ddcf15' into bigmerge | Melanie | 2011-10-12 | 1 | -255/+266 |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | | Refactor ScenePresence so gets and sets are through properties. Added ↵ | Dan Lake | 2011-10-06 | 1 | -287/+288 |
| | | | | | | | | | | | | | private sets when needed. Removed redundant code when methods replicated what the set already does | ||||
| * | | | Merge commit 'ca83f99332316fda1c412a5bf2889f9cf5cf3577' into bigmerge | Melanie | 2011-10-12 | 1 | -29/+3 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Instead of adding stat agentMS in all kinds of places, calculate it instead ↵ | Justin Clark-Casey (justincc) | 2011-10-06 | 1 | -29/+3 |
| | |/ | | | | | | | | | | | | | | | in the main Scene.Update() loop, like the other stats Some of the places where agentMS was added were in separate threads launched by the update loop. I don't believe this is correct, since such threads are no longer contributing to frame time. Some of the places were also driven by client input rather than the scene loop. I don't believe it's appropriate to add this kind of stuff to scene loop stats. These changes hopefully have the nice affect of making the broken out frame stats actually add up to the total frame time | ||||
| * | | Merge commit '56dbab35e122e724c9277b05820417a05ad8a1be' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | Remove unimplementated UpdateMovement() methods from SOG, SOP. | Justin Clark-Casey (justincc) | 2011-10-01 | 1 | -1/+1 |
| | | | | | | | | | | | SP still has an implementation but this is now just a public method on SP rather than an abstract one in EntityBase. No point making the code more complex until it actually needs to be, | ||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2011-09-21 | 1 | -1/+10 |
| | |\ | |||||
| * | \ | Merge commit '2c0bb8118db0b91c14783c2e2a401725e88aa650' into bigmerge | Melanie | 2011-10-11 | 1 | -5/+5 |
| |\ \ \ | |/ / | |||||
| | * | | Commented out new debug statements in ScenePresence | Dan Lake | 2011-09-21 | 1 | -5/+5 |
| | | | | |||||
| * | | | Merge commit 'd358125cac4e01194dae4b1f0bc9afc87e463f76' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+10 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Reinstate option to land an npc when it reaches a target. | Justin Clark-Casey (justincc) | 2011-09-22 | 1 | -1/+10 |
| | |/ | | | | | | | This is moved into ScenePresence for now as a general facility | ||||
| * | | Merge commit 'f9438e7147bbb347a45b14126fa7181307f8ef43' into bigmerge | Melanie | 2011-10-11 | 1 | -8/+0 |
| |\ \ | |/ | |||||
| | * | Remove unused and never set SP.PreviousRotation | Justin Clark-Casey (justincc) | 2011-09-21 | 1 | -8/+0 |
| | | | |||||
| | * | get rid of an incredibly noisy logging message from the last commit | Justin Clark-Casey (justincc) | 2011-09-21 | 1 | -1/+1 |
| | | | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-09-21 | 1 | -10/+14 |
| | |\ | |||||
| * | \ | Merge commit '8159fd7110459246ff61a41800899f5d854eceee' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+16 |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | | When calling osNpcMoveTo(), rotate the avatar in the direction of travel. | Justin Clark-Casey (justincc) | 2011-09-21 | 1 | -2/+21 |
| | | | | | | | | | | | | | | | | | | | | | | This stops the npc walking backwards if the target is directly behind. This means that the npc no longer returns to its original rotation once movement has finished. If you want this behaviour, please store and reset the original rotation after movement. This is somewhat to address http://opensimulator.org/mantis/view.php?id=5678 | ||||
| * | | | Merge commit 'fa9291512aabbe72cb6b1b0b7a9af79d9b05d253' into bigmerge | Melanie | 2011-10-11 | 1 | -9/+13 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Make debug statements in ScenePresence consistent and add a few more | Dan Lake | 2011-09-20 | 1 | -10/+14 |
| | |/ | |||||
| * | | Merge commit '385c4a210deb63c25f082ab8a3f0c63c7bff8fb5' into bigmerge | Melanie | 2011-10-11 | 1 | -0/+4 |
| |\ \ | |/ | |||||
| | * | On setting a new avatar appearance, if height hasn't changed then don't set ↵ | Justin Clark-Casey (justincc) | 2011-09-17 | 1 | -0/+4 |
| | | | | | | | | | | | | | that same height in ScenePresence. This prevents unnecessary work in the ODE module, though possibly that should be checking against same size sets itself | ||||
| * | | Merge commit '6f542f73d4aacc0b92c2ebcff84b4ce2c8d9433b' into bigmerge | Melanie | 2011-10-11 | 1 | -0/+10 |
| |\ \ | |/ | |||||
| | * | Stop the avatar stalling on its first boarder cross when using the ODE plugin | Justin Clark-Casey (justincc) | 2011-09-16 | 1 | -0/+10 |
| | | | | | | | | | | | | | When upgrading the previously child agent to a root, the code was setting the Size parameter on the ODECharacter PhysicsActor. This in turn reset Velocity, which cause the border stall. I'm fixing this by commenting out the Velocity = Vector3.Zero lines since they don't appear to play a useful purpose | ||||
| * | | Merge commit 'adfe713b4340771eee15371dd1216527b5662545' into bigmerge | Melanie | 2011-10-11 | 1 | -0/+4 |
| |\ \ | |/ | |||||
| | * | minor: I was wrong about OffsetPosition - sometimes it genuinely does return ↵ | Justin Clark-Casey (justincc) | 2011-09-16 | 1 | -0/+4 |
| | | | | | | | | | | | | | offset position! Add method doc to explain this. | ||||
| * | | Merge commit 'b2356340d22578143af2daab979ea4633faa93dc' into bigmerge | Melanie | 2011-10-11 | 1 | -3/+13 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | Remove setter from SP.OffsetPosition, since all sets should flow through ↵ | Justin Clark-Casey (justincc) | 2011-09-16 | 1 | -3/+14 |
| | | | | | | | | | | | | | SP.AbsolutePosition OffsetPosition is also misnamed - it returns the absolute position and never contains an offset. | ||||
| * | | Fixed a movement regression - Kitto's jump code is no longer needed (plus ↵ | Tom | 2011-09-14 | 1 | -37/+9 |
| | | | | | | | | | it's an eyesore) | ||||
| * | | Bring us up to date. | Tom | 2011-09-14 | 1 | -82/+51 |
| |\ \ | |/ | |||||
| | * | Don't try and delete attachments for child agent close | Justin Clark-Casey (justincc) | 2011-09-13 | 1 | -1/+2 |
| | | | |||||
| | * | eliminate redundant SP.m_regionInfo since it always has the scene. | Justin Clark-Casey (justincc) | 2011-09-12 | 1 | -8/+6 |
| | | | | | | | | | We were already referencing through the scene in some places. | ||||
| | * | remove the unused SP.initializeScenePresence() | Justin Clark-Casey (justincc) | 2011-09-12 | 1 | -23/+2 |
| | | | |||||
| | * | stop the redundant passing in of RegionInfo to SceneGraph, since the Scene ↵ | Justin Clark-Casey (justincc) | 2011-09-12 | 1 | -4/+4 |
| | | | | | | | | | is always passed in at the same time. | ||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |