ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-25 03:05:41 +08:00
Code Issues Packages Projects Releases Wiki Activity
28,771 Commits 5 Branches 93 Tags
b52f7b920342b7ea3e0294eae054e7520801e339
Commit Graph

96 Commits

Author SHA1 Message Date
Melanie Thielker
b16abc8166 Massive tab and trailing space cleanup 2017-01-05 19:07:37 +00:00
UbitUmarov
9229d5a324 locking issue 2016-08-22 07:55:25 +01:00
UbitUmarov
6df75a927c let hoverheight rest position be a falling state 2015-09-30 20:37:14 +01:00
UbitUmarov
31afc76fcf fix some compile 2015-09-08 16:51:42 +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
UbitUmarov
371c9dd2af bad merge? 2015-09-01 14:54:35 +01: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
UbitUmarov
016e58e354 *test* 2014-09-09 21:53:27 +01:00
UbitUmarov
002a2deaf9 add full delete if uuid iz zero and state is ALL 2014-09-09 19:09:06 +01:00
Melanie Thielker
347c5b3070 Add perms check 2014-09-09 05:20:53 +02:00
Melanie Thielker
aa84ad369c Add some forgotten calls 2014-09-09 04:35:08 +02:00
Melanie Thielker
d2324b64c7 Add missing file 2014-09-09 04:12:58 +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
Oren Hurvitz
99ac770abb Close streams immediately when we finish using them 2014-07-21 08:30:03 +01:00
Oren Hurvitz
998d7009a6 Eliminated many warnings 2014-04-23 16:37:36 +03: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
Robert Adams
48a175eff7 Add methods to Animation and AnimationSet for easier manipulation and 
display of groups of animations (Equal(), ToString(), FromOSDArray(), ...).
No functional change to animations.
 2013-05-30 19:16:34 -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
f16c4a254c Revert "Prevent empty Anim Packs" 
This reverts commit 5561333668.
 2013-01-09 00:20:24 +00:00
Melanie
c1c540f454 Revert "Fix sequence id fr default anim" 
This reverts commit a775931a0c.
 2013-01-09 00:20:14 +00:00
Melanie
a775931a0c Fix sequence id fr default anim 2013-01-08 23:36:05 +00:00
Melanie
5561333668 Prevent empty Anim Packs 2013-01-08 23:12:32 +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
28a4ea73ea Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/ChildAgentDataUpdate.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2012-10-31 00:13:33 +00:00
Melanie
fd9cb3cb68 Store and send the current movement animation state to a new sim on crossing 2012-10-30 23:08:22 +00:00
Melanie
f3f794a122 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-10-26 21:47:41 +01:00
Melanie
1c5f6e48b8 Separate LSL's notion of the default anim from the actually playing anims. 2012-10-26 21:23:20 +01:00
Melanie
de6f147d3c Revert "Fix for Mantis 0006376: Avatar no longer show Walking animation when any AO hud is" 
This reverts commit fa484c3494.
 2012-10-26 21:16:27 +01:00
Melanie
26cc57b6ca Merge branch 'master' into careminster 
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
 2012-10-26 21:13:01 +01:00
nebadon
fa484c3494 Fix for Mantis 0006376: Avatar no longer show Walking animation when any AO hud is 
loaded.  Thank you tglion
 2012-10-25 11:31:25 -07:00