| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | | * | | When updating SOG, a physics taint should not override a full update with a ↵ | Dan Lake | 2011-11-10 | 1 | -10/+15 | |
| | | | | | | | | | | | | | | | | | terse update | |||||
| | * | | | Alter commit 3758306 to allow region name to be substituted within a region ↵ | Justin Clark-Casey (justincc) | 2011-11-10 | 1 | -3/+28 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | console prompt This is to allow broader subsitution in the future. Currently, the only substitions are \R (for region name) and \\ (for a single backslash) e.g. "Region (\R) " is the current and continuing default prompt This renames custom_prompt in [Startup] to ConsolePrompt | |||||
| * | | | | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge | Melanie | 2011-11-10 | 1 | -3/+6 | |
| |\ \ \ \ | ||||||
| | * \ \ \ | Merge branch 'master' into bigmerge | Melanie | 2011-11-10 | 1 | -3/+6 | |
| | |\ \ \ \ | | | |_|/ | | |/| | | ||||||
| | | * | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2011-11-10 | 1 | -3/+6 | |
| | | |\ \ \ | | | |/ / | ||||||
| | | | * | | convert tabs from commit 3758306 to spaces | Justin Clark-Casey (justincc) | 2011-11-10 | 1 | -3/+6 | |
| | | | | | | ||||||
| | | * | | | Fix misaligned sit animation on scripted sit caused by the default sit | Melanie | 2011-11-10 | 1 | -2/+6 | |
| | | |/ / | | | | | | | | | | | | | animation being run after the scripted one. | |||||
| * | | | | Implement nudging support for strafing motion | Melanie | 2011-11-10 | 1 | -2/+4 | |
| |/ / / | ||||||
| * | | | Fix misaligned sit animation on scripted sit caused by the default sit | Melanie | 2011-11-10 | 1 | -2/+6 | |
| | | | | | | | | | | | | | animation being run after the scripted one. | |||||
| * | | | Merge branch 'master' into bigmerge | Melanie | 2011-11-10 | 3 | -4/+7 | |
| |\ \ \ | |/ / | ||||||
| | * | | Allow custom setting for the console prompt | GuduleLapointe | 2011-11-10 | 1 | -2/+3 | |
| | | | | | | | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | |||||
| | * | | minor: Correct misleading method doc on SOG.UpdateRootRotation() | Justin Clark-Casey (justincc) | 2011-11-09 | 1 | -1/+1 | |
| | |/ | ||||||
| | * | Correct test failure in sit position check of TestSitAndStandWithNoTarget() | Justin Clark-Casey (justincc) | 2011-11-07 | 1 | -1/+3 | |
| | | | | | | | | | | | | | Curiously, a Vector3.ToString() will not display the last two places of the float. In this case, the failure of the assertion would confusingly report Expected: <0, 0, 0.8454993> But was: <0, 0, 0.8454993> when actual Z figure is 0.845499337 Should fully address http://opensimulator.org/mantis/view.php?id=5779 | |||||
| * | | Fix the ability to move the seated avatar via LSL | Melanie | 2011-11-08 | 1 | -0/+3 | |
| | | | ||||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-07 | 1 | -1/+1 | |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs | |||||
| | * | That such a trivial change can be so difficult to get right. Fix it this time. | Melanie | 2011-11-07 | 1 | -1/+1 | |
| | | | ||||||
| | * | Fix build break | Melanie | 2011-11-07 | 1 | -1/+1 | |
| | | | ||||||
| | * | Fix up failing test to compensate for changed sit target offset | Melanie | 2011-11-06 | 1 | -2/+2 | |
| | | | ||||||
| * | | Fix up failing test to compensate for changed sit target offset | Melanie | 2011-11-06 | 1 | -2/+2 | |
| | | | ||||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-06 | 6 | -11/+15 | |
| |\ \ | |/ | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||||
| | * | Make the AsyncSceneObjectDeleter send a list of kills. This will make large | Melanie | 2011-11-06 | 1 | -1/+7 | |
| | | | | | | | | | | | marquee-selected deletions of single prims or small link sets nearly instantaneous | |||||
| | * | Convert SendKillObject to take a list of uint rather than sending one | Melanie | 2011-11-06 | 8 | -49/+50 | |
| | | | | | | | | | packet per prim. More to come as we change to make use of this. | |||||
| * | | Merge branch 'bigmerge' of ssh://melanie@3dhosting.de/var/git/careminster ↵ | Melanie | 2011-11-06 | 2 | -4/+9 | |
| |\ \ | | | | | | | | | | into bigmerge | |||||
| | * | | Small preformance tweak | Melanie | 2011-11-06 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Remove backup optimization that was causing prim contents to poof | Melanie | 2011-11-05 | 1 | -3/+8 | |
| | | | | ||||||
| * | | | Merge branch 'master' into bigmerge | Melanie | 2011-11-06 | 2 | -2/+9 | |
| |\ \ \ | |/ / |/| / | |/ | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | |||||
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2011-11-06 | 1 | -1/+10 | |
| | |\ | ||||||
| | | * | HUD attachments: Removes some more messages sent to wrong clients. | Snoopy Pfeffer | 2011-11-06 | 1 | -1/+10 | |
| | | | | ||||||
| | * | | Allow HG and other scene presences not linked to a user account to function. | Melanie | 2011-11-06 | 1 | -1/+4 | |
| | |/ | ||||||
| | * | Fix build break | Melanie | 2011-11-05 | 1 | -1/+1 | |
| | | | ||||||
| * | | Break out the parts of ScenePresence that differ from core | Melanie | 2011-11-05 | 1 | -141/+146 | |
| | | | ||||||
| * | | Fix up with core changes | Melanie | 2011-11-05 | 2 | -57/+31 | |
| | | | ||||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-05 | 2 | -6/+3 | |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||||
| | * | Remove spammy autopilot debug | Melanie | 2011-11-05 | 1 | -3/+3 | |
| | | | ||||||
| | * | Remove some left over debug and reverse experimental reordering of ifs | Melanie | 2011-11-05 | 1 | -4/+2 | |
| | | | ||||||
| | * | Remove enableprejump config option and associated code as this is now | Melanie | 2011-11-05 | 1 | -3/+0 | |
| | | | | | | | | | fully functional and cannot be disabled because that would break timings. | |||||
| | * | Porting the ScenePresenceAnimator from Avination. Jump and fall anims now work | Melanie | 2011-11-05 | 2 | -87/+136 | |
| | | | | | | | | | properly. | |||||
| | * | Change puvlic m_ variable to a getter property | Melanie | 2011-11-05 | 1 | -1/+5 | |
| | | | ||||||
| | * | ScenePresence part of the Avination animator fixes. | Melanie | 2011-11-05 | 1 | -3/+58 | |
| | | | ||||||
| | * | Chnaging the sit target adjustment to a more precise approximation of SL. ↵ | Melanie | 2011-11-05 | 1 | -24/+35 | |
| | | | | | | | | | | | | | Some small fixes ported from Avination. Some white space fixes. | |||||
| * | | Whitespace fix from core | Melanie | 2011-11-05 | 1 | -0/+1 | |
| | | | ||||||
| * | | Harmonize with core and remove extraneous comments with no information in them | Melanie | 2011-11-05 | 1 | -105/+39 | |
| | | | ||||||
| * | | Change m_falling public to a getter property. | Melanie | 2011-11-05 | 2 | -2/+6 | |
| | | | ||||||
| * | | Adapt to the core SP rework | Melanie | 2011-11-05 | 2 | -2/+6 | |
| | | | ||||||
| * | | Some more changes to catch up with core | Melanie | 2011-11-05 | 1 | -71/+49 | |
| | | | ||||||
| * | | Remove unused and broken OffsetRotation from ScenePresence | Melanie | 2011-11-05 | 2 | -30/+5 | |
| | | | ||||||
| * | | Some trivial changes to get closer to core | Melanie | 2011-11-05 | 1 | -12/+5 | |
| | | | ||||||
| * | | Change comment formatting to match core for a cleaner diff | Melanie | 2011-11-05 | 1 | -23/+23 | |
| | | | ||||||
| * | | Replace our patched up, broken an rebroken sit code with the code from | Melanie | 2011-11-05 | 1 | -303/+106 | |
| | | | | | | | | | core which has now matured beyond what we had. | |||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-05 | 2 | -8/+7 | |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |