ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 08:06:27 +08:00
Code Issues Packages Projects Releases Wiki Activity
31,655 Commits 5 Branches 88 Tags
8d8a7347f75fa44a738becabccc0cd51be89deff
Commit Graph

77 Commits

Author SHA1 Message Date
UbitUmarov
d1fcb9c35d filter some changed events at trigger point 2020-09-04 15:31:42 +01:00
UbitUmarov
06bdfc48d0 move the ToUpper to where it belongs 2020-06-02 18:25:13 +01:00
UbitUmarov
c097f148dd locate default anims also by uuid, rename/chage a few things 2020-04-18 17:26:25 +01:00
UbitUmarov
21728b3129 some retouchs on animationset code 2018-12-28 11:38:00 +00:00
UbitUmarov
5c156508e2 mantis 8182: update/fix GenerateRandomAnimation(). not updating libomv avatar data bc have no idea why do do have it, so leave it to who does know 2017-05-31 12:33:35 +01:00
Melanie Thielker
b16abc8166 Massive tab and trailing space cleanup 2017-01-05 19:07:37 +00:00
UbitUmarov
6df75a927c let hoverheight rest position be a falling state 2015-09-30 20:37:14 +01:00
Robert Adams
e5367d822b Merge of ubitworkvarnew with opensim/master as of 20150905. 
This integrates the OpenSim refactoring to make physics, etc into modules.
AVN physics hasn't been moved to new location.
Does not compile yet.

Merge branch 'osmaster' into mbworknew1
 2015-09-08 04:54:16 -07:00
Diva Canto
ce2c67876e More namespace and dll name changes. Still no functional changes. 2015-08-30 21:05:36 -07:00
Diva Canto
2c0cad6dd3 Renamed the namespaces too 2015-08-30 20:29:31 -07:00
UbitUmarov
6f149ef6ae bug fix: leave jumping state only to landing, without fallback into 
onsurface, etc
 2014-10-04 07:49:05 +01:00
UbitUmarov
6d1f1103f3 clean up coments, use a even faster XY move request detection 2014-10-01 16:36:06 +01:00
UbitUmarov
4c8819a143 removed useless unreal inworld movement vector estimation. Do animation 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.
 2014-10-01 04:32:19 +01:00
UbitUmarov
2af7205813 keep same animation if in transit 2014-09-30 00:13:52 +01:00
UbitUmarov
3052a53889 change avatar physics and motion control. Still not that good :( 2014-09-29 20:17:05 +01:00
UbitUmarov
df8eae1957 handle AO sit ground case 2014-09-10 20:55:00 +01:00
UbitUmarov
f66b58cf00 *TEST* add movement states SIT and SITGROUND. ScenePresence on SIT, 
SITGROUND or STAND, sets directly the state, and desired sitAnimation for
default sits
 2014-09-10 19:30:57 +01:00
UbitUmarov
e37fd5e716 force update of movement animation 2014-09-09 22:27:21 +01:00
Melanie Thielker
aa84ad369c Add some forgotten calls 2014-09-09 04:35:08 +02:00
Melanie Thielker
18023169e7 Actually do the overriding 2014-09-09 04:12:10 +02:00
UbitUmarov
0295e6822d some cleanup ( well or not ) 2014-08-22 20:01:07 +01:00
UbitUmarov
31a2c07e83 put bake bakes, plus a missing change forcing animations to pass by 
scenepresence
 2014-08-17 09:54:38 +01:00
UbitUmarov
4aa55204a2 allow reset default animation to default as core does 2014-07-26 05:27:36 +01:00
Melanie
6d6b9ab791 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2013-12-07 01:08:49 +00:00
Justin Clark-Casey (justincc)
4cde02a2a3 Implement most effects of AGENT_CONTROL_STOP 
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
 2013-11-30 01:44:30 +00:00
Melanie
9975c5674c Merge branch 'master' into careminster 2013-06-13 02:49:43 +01:00
Robert Adams
7556a0f699 Add TriggerScenePresenceUpdated events when an animation is added 
or removed. Shouldn't impact anyone as only DSG seems to use
OnScenePresenceUpdated event.
Some minor format changes to AnimationSet's ToString().
 2013-06-11 17:18:12 -07:00
Melanie
648e258b8e Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
 2013-06-04 21:09:25 +01:00
Robert Adams
4d32ca19bf Trigger OnScenePresenceUpdated when the avatar's animations change. 2013-05-30 19:16:36 -07:00
Melanie
12efac494a Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
	OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
	OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
 2013-01-19 02:38:04 +00:00
Justin Clark-Casey (justincc)
115e1c2abb Add "debug set set animations true|false" region console command. 
Setting this logs extra information about animation add/remove, such as uuid and animation name
Unfortunately cannot be done per client yet
 2013-01-18 23:22:02 +00:00
Justin Clark-Casey (justincc)
74256c0cc4 Restore previous client AO behaviour by not allowing them to remove the 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.
 2013-01-18 22:57:09 +00:00
Melanie
0a876a305c Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
 2012-12-16 21:19:30 +00:00
Justin Clark-Casey (justincc)
56ec177b3b minor: Add commented out log lines to ScenePresenceAnimator for future debug use (such as logging anim pack contents sent to clients) 2012-12-14 23:42:23 +00:00
Melanie
637e9a10db Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
 2012-10-04 20:16:23 +01:00
Melanie
b977f962fa Allow default animation to be stopped to be replaced with another one. 
Fixes Mantis #6327
 2012-10-04 15:42:52 +01:00
Melanie
7da744566d Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2012-07-20 09:31:06 +01:00
Justin Clark-Casey (justincc)
e94831ddab Stop explicitly closing and nulling out Animator in order to prevent NREs in 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.
 2012-07-19 22:59:28 +01:00
Melanie
fe029cf4e8 Merge branch 'avination' into careminster 2012-05-13 01:25:03 +01:00
UbitUmarov
7461fe4554 TEST MESS* reduce animation packets send. Added onchangeanim event with parameters to define if to add or remove, and if to send anims pack on that evocation, etc 2012-05-12 15:27:37 +01:00
Oren Hurvitz
6473674bbf Fixed: custom walking animations didn't stop when the avatar stopped walking. 
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 feef1dd732.
 2012-04-27 20:47:02 +01:00
Justin Clark-Casey (justincc)
a9995ede65 Fix bug in ScenePresenceAnimator.RemoveAnimation() introduced in commit 1a8769e 
Forgot to uppercase the animation name for default animations, since for some reason we store and use them in upper rather than lowercase.
 2012-03-23 01:08:13 +00:00
Justin Clark-Casey (justincc)
9949ac2f9f refactor: Rename AvatarAnimations -> DefaultAvatarAnimations for code clarity since non-default animations are handled completely separately from this class 2012-03-22 00:10:41 +00:00
Justin Clark-Casey (justincc)
1a8769e6ef Instead of loading default avatar animations in both SLUtil and AvatarAnimations, load just in AvatarAnimations instead. 
This lets us remove the dependency of OpenSim.Framework.dll on data/avataranimations.xml, which is not necessary for ROBUST.
This commit also takes care of the odd situation where animations are stored and used internally with uppercase names (e.g. "STAND")
but scripts refer to them with lowercase names (e.g. "sit").
 2012-03-21 23:57:39 +00:00
Justin Clark-Casey (justincc)
ba163ab05b Add method doc to SPA.Falling and use automatic private get property 2012-01-07 00:29:55 +00:00
Justin Clark-Casey (justincc)
c5c079f6aa Fix bug where tapping home to stop falling would stop any avatar movement other than falling again. 
Addresses http://opensimulator.org/mantis/view.php?id=5839
 2012-01-07 00:17:40 +00:00
Justin Clark-Casey (justincc)
55de189752 minor: remove some mono compiler warnings 2011-12-08 18:56:07 +00:00
Justin Clark-Casey (justincc)
f08aad8a40 For now, disable mechanism to limit avatar animation updates since this causes avatars to never reach the correct animation after some actions. 
This reverts to situation where animation updates are made each frame on SP.PhysicsCollisionUpdate (though a packet is only sent if the anim actually changes).
m_updateCount was not being update on various avatar state changes, causing the correct animations to never be sent.
Always setting in HandleAgentUpdate() is not enough since the avatar is continually sending AgentUpdate packets.
One would need to identify all the conditions under which animations need to play out and set m_updateCount appropriately in SP.HandleAgentUpdate()
 2011-12-03 01:47:12 +00:00
Justin Clark-Casey (justincc)
0ca8491bbe refactor: Use just ScenePresenceAnimator.CurrentMovementAnimation rather than duplicating it with m_movementAnimation 2011-12-03 00:40:08 +00:00
Justin Clark-Casey (justincc)
5ba8ca5662 Rename ScenePresenceAnimator.GetMovementAnimation() -> DetermineMovementAnimation() for better code readability 2011-12-03 00:27:21 +00:00