aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Animation (follow)
Commit message (Collapse)AuthorAgeFilesLines
* bug fix: leave jumping state only to landing, without fallback intoUbitUmarov2014-10-041-12/+12
| | | | onsurface, etc
* clean up coments, use a even faster XY move request detectionUbitUmarov2014-10-011-65/+19
|
* removed useless unreal inworld movement vector estimation. Do animation ↵UbitUmarov2014-10-011-70/+97
| | | | | | state using movement control flags only, on avatar frame of reference. This will hold valid until the up direction is allowed to be diferent from the world one.
* keep same animation if in transitUbitUmarov2014-09-301-0/+3
|
* change avatar physics and motion control. Still not that good :(UbitUmarov2014-09-291-48/+99
|
* handle AO sit ground caseUbitUmarov2014-09-101-2/+27
|
* *TEST* add movement states SIT and SITGROUND. ScenePresence on SIT,UbitUmarov2014-09-101-15/+32
| | | | | SITGROUND or STAND, sets directly the state, and desired sitAnimation for default sits
* force update of movement animationUbitUmarov2014-09-091-1/+14
|
* *test*UbitUmarov2014-09-091-0/+17
|
* add full delete if uuid iz zero and state is ALLUbitUmarov2014-09-091-1/+4
|
* Add perms checkMelanie Thielker2014-09-091-0/+5
|
* Add some forgotten callsMelanie Thielker2014-09-091-0/+2
|
* Add missing fileMelanie Thielker2014-09-091-0/+76
|
* Actually do the overridingMelanie Thielker2014-09-091-1/+7
|
* some cleanup ( well or not )UbitUmarov2014-08-221-0/+10
|
* put bake bakes, plus a missing change forcing animations to pass byUbitUmarov2014-08-171-1/+5
| | | | scenepresence
* allow reset default animation to default as core doesUbitUmarov2014-07-261-1/+1
|
* Merge branch 'master' into careminsterMelanie2013-12-071-4/+13
|\ | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Implement most effects of AGENT_CONTROL_STOPJustin Clark-Casey (justincc)2013-11-301-4/+13
| | | | | | | | | | | | | | | | | | | | AGENT_CONTROL_STOP is specified to SP.HandleAgentUpdate if the user holds down the space bar on a viewer. For a stopped avatar, this prevents fly or walk/run (though not rotate) until released. For a walking/running avatar, this reduces movement to half speed. For a flying avatar, this stops the avatar. These are observed behaviours on the LL grid - there was no previous OpenSimulator implementation This commit introduces an optional parameter to SP.AddNewMovement(), which means that it will no longer compile on .NET 3.5 or earlier versions of Mono than 2.8 Currently, this does not work for jumping, and if used whilst flying the avatar continues the fly animation even though it does not move
* | Merge branch 'master' into careminsterMelanie2013-06-132-2/+8
|\ \ | |/
| * Add TriggerScenePresenceUpdated events when an animation is addedRobert Adams2013-06-112-2/+8
| | | | | | | | | | | | or removed. Shouldn't impact anyone as only DSG seems to use OnScenePresenceUpdated event. Some minor format changes to AnimationSet's ToString().
* | Merge branch 'master' into careminsterMelanie2013-06-043-3/+150
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
| * Trigger OnScenePresenceUpdated when the avatar's animations change.Robert Adams2013-05-301-3/+14
| |
| * Add methods to Animation and AnimationSet for easier manipulation andRobert Adams2013-05-302-0/+136
| | | | | | | | | | display of groups of animations (Equal(), ToString(), FromOSDArray(), ...). No functional change to animations.
* | Merge branch 'master' into careminsterMelanie2013-01-192-10/+53
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
| * Add "debug set set animations true|false" region console command.Justin Clark-Casey (justincc)2013-01-181-5/+28
| | | | | | | | | | Setting this logs extra information about animation add/remove, such as uuid and animation name Unfortunately cannot be done per client yet
| * Restore previous client AO behaviour by not allowing them to remove the ↵Justin Clark-Casey (justincc)2013-01-182-5/+24
| | | | | | | | | | | | | | | | | | 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.
| * Revert "Prevent empty Anim Packs"Melanie2013-01-091-12/+0
| | | | | | | | This reverts commit 5561333668f61f043cdfc0733a4eb50a1bcfb14e.
| * Revert "Fix sequence id fr default anim"Melanie2013-01-091-1/+1
| | | | | | | | This reverts commit a775931a0cec9f65748c6e20dd2695edcbe21b7f.
| * Fix sequence id fr default animMelanie2013-01-081-1/+1
| |
| * Prevent empty Anim PacksMelanie2013-01-081-0/+12
| |
* | Merge branch 'master' into careminsterMelanie2012-12-161-1/+10
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
| * minor: Add commented out log lines to ScenePresenceAnimator for future debug ↵Justin Clark-Casey (justincc)2012-12-141-1/+10
| | | | | | | | use (such as logging anim pack contents sent to clients)
* | Merge branch 'master' into careminsterMelanie2012-10-311-0/+11
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Framework/ChildAgentDataUpdate.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Store and send the current movement animation state to a new sim on crossingMelanie2012-10-301-0/+11
| |
* | Merge branch 'master' into careminsterMelanie2012-10-261-3/+5
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Separate LSL's notion of the default anim from the actually playing anims.Melanie2012-10-261-2/+4
| |
| * Revert "Fix for Mantis 0006376: Avatar no longer show Walking animation when ↵Melanie2012-10-261-1/+1
| | | | | | | | | | | | any AO hud is" This reverts commit fa484c3494a7190b4d7526094347be74d091e125.
* | Merge branch 'master' into careminsterMelanie2012-10-261-1/+1
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
| * Fix for Mantis 0006376: Avatar no longer show Walking animation when any AO ↵nebadon2012-10-251-1/+1
| | | | | | | | | | | | hud is loaded. Thank you tglion
* | Merge branch 'master' into careminsterMelanie2012-10-042-16/+29
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
| * Allow default animation to be stopped to be replaced with another one.Melanie2012-10-042-16/+29
| | | | | | | | Fixes Mantis #6327
* | Merge branch 'master' into careminsterMelanie2012-07-201-7/+1
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Stop explicitly closing and nulling out Animator in order to prevent NREs in ↵Justin Clark-Casey (justincc)2012-07-191-7/+1
| | | | | | | | | | | | | | various places due to race conditions. Even where checks are being made they aren't enough since they all assume that the Animator they just checked is still there in the next line, which is not necessarily the case without locking. The memory used is small and these should be GC'd anyway when the SP is released. If this is not happening then the wider problem of old SPs being retained needs to be resolved.
* | Merge branch 'avination' into careminsterMelanie2012-05-131-2/+18
|\ \ | |/ |/|
| * ªTEST MESS* reduce animation packets send. Added onchangeanim event with ↵UbitUmarov2012-05-121-2/+18
| | | | | | | | parameters to define if to add or remove, and if to send anims pack on that evocation, etc
| * Revert "*TO TEST/REVIEW* added current default animation in animationSet.cs ↵Melanie2012-05-041-10/+3
| | | | | | | | | | | | to/fromArray in array element 0. This may cause compatibilities issues, but think this information is needed for proper crossings. OSG regions did survived tps in/out with this. ALso added velocity in crossings cases, for now detected by Teleport flag equal to Default (0);" This reverts commit 12c9916193bbb87aaa95407f798c241cbe5e23cb.
| * *TO TEST/REVIEW* added current default animation in animationSet.cs ↵UbitUmarov2012-05-041-3/+10
| | | | | | | | to/fromArray in array element 0. This may cause compatibilities issues, but think this information is needed for proper crossings. OSG regions did survived tps in/out with this. ALso added velocity in crossings cases, for now detected by Teleport flag equal to Default (0);
* | Fixed: custom walking animations didn't stop when the avatar stopped walking.Oren Hurvitz2012-04-271-6/+13
|/ | | | | | This happened because the scripts were notified about control changes (e.g., the user stopped pressing the Forward key) when the animation was still WALK, so the script didn't stop the walking animation. Fixing this required: a) Update the movement animation *before* notifying the script; b) Add locking to prevent clashes with the Heartbeat thread (which also updates the animations); c) Handle the case of a user who stops walking just as the avatar is in the air: the avatar should STAND in that case, not WALK. This reverts commit feef1dd73243cfdd5322632fb67e64cabc1ad4bc.
* Fix bug in ScenePresenceAnimator.RemoveAnimation() introduced in commit 1a8769eJustin Clark-Casey (justincc)2012-03-231-1/+1
| | | | Forgot to uppercase the animation name for default animations, since for some reason we store and use them in upper rather than lowercase.