aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into bigmergeMelanie2011-11-053-10/+3
|\ | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Remove spammy autopilot debugMelanie2011-11-051-3/+3
| |
| * Remove some left over debug and reverse experimental reordering of ifsMelanie2011-11-051-4/+2
| |
| * Remove enableprejump config option and associated code as this is nowMelanie2011-11-052-7/+0
| | | | | | | | fully functional and cannot be disabled because that would break timings.
| * Porting the ScenePresenceAnimator from Avination. Jump and fall anims now workMelanie2011-11-052-87/+136
| | | | | | | | properly.
| * Change puvlic m_ variable to a getter propertyMelanie2011-11-051-1/+5
| |
| * ScenePresence part of the Avination animator fixes.Melanie2011-11-051-3/+58
| |
| * Chnaging the sit target adjustment to a more precise approximation of SL. ↵Melanie2011-11-051-24/+35
| | | | | | | | | | | | Some small fixes ported from Avination. Some white space fixes.
* | Whitespace fix from coreMelanie2011-11-051-0/+1
| |
* | Harmonize with core and remove extraneous comments with no information in themMelanie2011-11-051-105/+39
| |
* | Change m_falling public to a getter property.Melanie2011-11-052-2/+6
| |
* | Adapt to the core SP reworkMelanie2011-11-052-2/+6
| |
* | Some more changes to catch up with coreMelanie2011-11-051-71/+49
| |
* | Remove unused and broken OffsetRotation from ScenePresenceMelanie2011-11-052-30/+5
| |
* | Some trivial changes to get closer to coreMelanie2011-11-051-12/+5
| |
* | Change comment formatting to match core for a cleaner diffMelanie2011-11-051-23/+23
| |
* | Replace our patched up, broken an rebroken sit code with the code fromMelanie2011-11-051-303/+106
| | | | | | | | core which has now matured beyond what we had.
* | Merge branch 'master' into bigmergeMelanie2011-11-055-32/+25
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * add myself to the contributors.txtnebadon2011-11-051-0/+1
| |
| * Fix avatar height, removes the hip offset hacknebadon2011-11-052-27/+12
| | | | | | | | Author: Mana Janus <mana@mjm-labs.com>
| * Multiple lines in welcome message use '\n' in the welcome message tonebadon2011-11-051-0/+3
| | | | | | | | start a new line.
| * add Mana Janus and SpotOn3D to contributors.txt last patch was courtesynebadon2011-11-051-0/+2
| | | | | | | | of Mana Janus I failed to mention that, sorry!
| * Don't rotate child prims, if only the root prim is rotated.nebadon2011-11-051-2/+2
| |
| * refactor: In sit code, compare against Vector3.Zero and Quaternion.Identity ↵Justin Clark-Casey (justincc)2011-11-051-12/+12
| | | | | | | | instead of individual components of a vector/quat
* | Merge branch 'master' into bigmergeMelanie2011-11-056-8/+55
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-11-052-36/+12
| |\
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2011-11-052-1/+4
| | |\
| * | | Fix NPC sitting for prims without a sit target.Justin Clark-Casey (justincc)2011-11-054-14/+61
| | |/ | |/| | | | | | | | | | | | | | | | | | | This is to partially address http://opensimulator.org/mantis/view.php?id=5769 We don't need to call SP.HandleAgentSit() again if we are within 10m since the autopilot won't trigger. By calling it twice, the position of the sitting NPC was wrongly adjusted, ending up near <0,0,0>. However, this change does mean that NPCs further than 10m away will not attempt to autopilot to the prim, though this code was broken anyway (is actually a different mechanism to normal NPC movmeent). Hopefully this can be addressed soon.
| * | Add comment for experimental effect of removing the Thread.Sleep(20) in ↵Justin Clark-Casey (justincc)2011-11-042-1/+4
| | | | | | | | | | | | ODEPrim.changevelocity()
* | | Merge branch 'master' into bigmergeMelanie2011-11-050-0/+0
|\ \ \ | | |/ | |/|
| * | Replacing te linking code with the code from Avination. Link sets prims are nowMelanie2011-11-052-36/+12
| |/ | | | | | | numbered properly even when sets are linked to sets.
* | Merge branch 'master' into bigmergeMelanie2011-11-042-4/+28
|\ \ | |/
| * On standup, trigger the changed link script event after the avatar has been ↵Justin Clark-Casey (justincc)2011-11-041-2/+3
| | | | | | | | | | | | | | | | fully changed. This was meant to help with the script in http://opensimulator.org/mantis/view.php?id=5772 but it doesn't work. Probably the event is fired before the physics actor has been set up again for the stood avatar. Fixing that would be much more complicated, but processing the event last of all seems like a good idea in any case.
| * Stop llPushObject() from causing problems by adding force via a taint rather ↵Justin Clark-Casey (justincc)2011-11-041-2/+25
| | | | | | | | | | | | | | than directly. This isn't a perfect solution since there can be a race between the taint processing and taint setting, as force needs to be reset after processing. Needs careful locking in the future.
* | Merge branch 'master' into bigmergeMelanie2011-11-0427-238/+429
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/LightShare/LightShareModule.cs OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
| * Rename ForEachAvatar back to ForEachScenePresence. The other changesDan Lake2011-11-0316-35/+35
| | | | | | | | | | | | from previous commit which sort out which iterator is used are left intact. A discussion is needed as to what constitutes an avatar vs a ScenePresence.
| * Renamed ForEachRootScenePresence to ForEachAvatar. Cleaned up calls toDan Lake2011-11-0323-154/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | the 3 iteration functions so more of them are using the correct iteration for the action they are performing. The 3 iterators that seem to fit all actions within OpenSim at this time are: ForEachAvatar: Perform an action on all avatars (root presences) ForEachClient: Perform an action on all clients (root or child clients) ForEachRootClient: Perform an action on all clients that have an avatar There are still a dozen places or so calling the old ForEachScenePresence that will take a little more refactoring to eliminate.
| * remove the pointless check of the face texture struct against null in ↵Justin Clark-Casey (justincc)2011-11-031-3/+1
| | | | | | | | Bot.Objects_NewPrim()
| * actually remove the sleep from PhysicsBehaviour that I shifted to Bot a ↵Justin Clark-Casey (justincc)2011-11-031-2/+0
| | | | | | | | couple of commits ago
| * Rename PhysicsBot => Bot since it doesn't just exercise physics anymoreJustin Clark-Casey (justincc)2011-11-035-12/+12
| |
| * Move one of the old physics sleeps out into the main bot loop, so leaving ↵Justin Clark-Casey (justincc)2011-11-031-0/+2
| | | | | | | | out PhysicsBehaviour doesn't result in continuous other behaviours
| * Add click/grab behaviour to pCampbot, which gets bots to randomly click things.Justin Clark-Casey (justincc)2011-11-036-8/+106
| | | | | | | | | | | | | | This can be specified on pCampbot.exe by using g in the list of behaviours for the new -behaviours,-b switch e.g. -b p,g to get both existing physics and grabbing behaviours. grabbing is primitive, it attempts grabs on random prims whether they're actually signalled as clickable or not. behaviour is currently primitive overall, behaviours are just executed in a list
| * Move PhysicsBehaviour into a spearate behaviours folderJustin Clark-Casey (justincc)2011-11-033-3/+2
| |
| * Separate out physics testing actions into a separate PhysicsBehaviour classJustin Clark-Casey (justincc)2011-11-035-95/+221
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-11-0316-116/+115
| |\
| | * Drop the CopyTo parameter from Int32.MaxValue to 4096. This is a buffer sizeMic Bowman2011-11-021-1/+1
| | | | | | | | | | | | | | | not a target size. Mono 2.10 appears to try to allocate the full buffer which immediately crashes. Tested on mono 2.6.7 and 2.10.5
| * | Change default say distance to 20m from 30m, the same as on the big grid. ↵Justin Clark-Casey (justincc)2011-11-024-6/+6
| | | | | | | | | | | | | | | | | | This is to improve the migration of scripts that expect a 20m say distance. If you want to keep a 30m say distance then please set this as the say_distance parameter in the [Chat] section of OpenSim.ini.
* | | Merge branch 'master' into bigmergeMelanie2011-11-031-1/+1
|\ \ \ | | |/ | |/|
| * | Revert "fix CopyTo call that was breaking under mono 2.10"Melanie2011-11-031-1/+1
| | | | | | | | | | | | This reverts commit d30971fdc243886b8fc614c7f869530db87e10f2.
* | | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmergeMelanie2011-11-0216-114/+121
|\ \ \
generated by cgit v1.1 at 2024-11-16 18:27:26 +0000