Commit graph

34926 commits

Author SHA1 Message Date
Anthony J. Thibault
97a2eb62d4 Fix for incorrect avatar bounds after changing avatars 2015-11-25 12:06:50 -08:00
Anthony J. Thibault
868cf83b48 Fix for attachments and MyAvatar::getDefaultEyePosition() 2015-11-25 10:07:29 -08:00
Anthony Thibault
527199bc69 Merge pull request #1 from AndrewMeadows/fix-avatar-capsule
compute bounding capsule of avatars
2015-11-25 09:39:18 -08:00
Andrew Meadows
2cc1dfe819 getRootAbsoluteBindPoseByChildName() is deprecated 2015-11-24 20:39:26 -08:00
Andrew Meadows
3ae082f09c compute bounding capsule of avatars 2015-11-24 20:28:39 -08:00
Anthony J. Thibault
76034d62d5 Eye tracking fixes 2015-11-24 16:57:26 -08:00
Anthony J. Thibault
f120e10ff4 Merge branch 'master' into tony/remove-joint-states 2015-11-24 15:00:05 -08:00
Howard Stearns
b12bc96fb7 Merge pull request #6482 from hyperlogic/tony/avatar-eye-tracking-fix
Fix for avatar eye tracking
2015-11-24 14:38:28 -08:00
Anthony J. Thibault
e07e1c5c92 Fix for avatar eye tracking
When computing a full eye to world matrix, the translations need to be the geometry coordinate frame, not scaled into meters.
2015-11-24 14:01:01 -08:00
Philip Rosedale
dde01b2071 Merge pull request #6476 from AndrewMeadows/arrow
fix for objects suffering from very small updates to physics properties
2015-11-24 11:22:25 -08:00
Brad Hefta-Gaub
fd7a704753 Merge pull request #6471 from birarda/url-cmp
fix unnecessary model URL updating thanks to URL encoding
2015-11-24 10:56:21 -08:00
Andrew Meadows
e26081e981 always update physics properties when they change
and move activation check logic to MotionState
2015-11-24 10:20:19 -08:00
Andrew Meadows
5135c9dded whitespace cleanup 2015-11-24 10:20:19 -08:00
Brad Hefta-Gaub
d32e500464 Merge pull request #6462 from jherico/rec5
Blendshapes and attachments in recordings, plus other minor fixes.
2015-11-24 10:01:17 -08:00
Stephen Birarda
5a7b0dd1ad put the parsed model URL in ModelEntityItem 2015-11-24 11:46:51 -06:00
Stephen Birarda
0d6b919448 cleanup printing of updated model URL 2015-11-24 11:22:30 -06:00
Stephen Birarda
0e19e50047 cleaner handling for QString/QUrl conversion/comparison 2015-11-24 11:17:46 -06:00
Stephen Birarda
762709748d Merge pull request #6473 from ZappoMan/waitForScriptThreads
change the ScriptEngine::waitTillDoneRunning() to wait for the script thread to complete
2015-11-24 10:39:22 -06:00
Clément Brisset
28435b6d43 Merge pull request #6478 from samcake/controllers
Let the AssertClient JS interface use global vars
2015-11-23 22:43:07 -08:00
Brad Davis
5c2b980a45 Fixing avatar facial blendshapes and attachments in recordings 2015-11-23 22:36:07 -08:00
Brad Davis
bc84265e99 Additional checking when serializing transforms to json 2015-11-23 22:35:12 -08:00
Brad Davis
3738f21936 Fix occasional deadlock in loading recordings 2015-11-23 22:34:17 -08:00
samcake
a1668cdc73 Let the AssertClient JS interface use global vars 2015-11-23 22:28:59 -08:00
Brad Hefta-Gaub
1d8e2edafb Merge pull request #6464 from ericrius1/whiteboardFix
updated whiteboard to use new controller approach
2015-11-23 19:44:28 -08:00
Brad Hefta-Gaub
eaa6d6ae28 Merge pull request #6477 from murillodigital/server-manager
Using http for quazip external
2015-11-23 19:38:16 -08:00
Anthony J. Thibault
14189ac909 Move Y_180 flip rotation out of Rig
This Y_180 flip is defined in skeletonModel not in the rig.
This is important if we wish to use the Rig for both Avatars (180 flip) and Entity models (no 180 flip).

We can hide this 180 flip from script, if we wish, by including it in all the accessors to and from
MyAvatar -> skeletalModel -> Rig.

Added Quaternions::Y_180 to GLMHelpers.
2015-11-23 19:31:27 -08:00
Brad Hefta-Gaub
5f88d958ab CR feedback 2015-11-23 18:26:15 -08:00
James B. Pollack
5ffc1f150d Merge pull request #6467 from ctrlaltdavid/20742
Fix avatar rotation with keyboard depending on frame rate
2015-11-23 18:19:46 -08:00
Leonardo Murillo
388157d432 Typo 2015-11-23 20:16:18 -06:00
Leonardo Murillo
55649717c5 Using http for quazip external 2015-11-23 20:10:32 -06:00
samcake
8bf5e3b429 Merge pull request #6469 from AlessandroSigna/groupRecording
Group recording - overlay added
2015-11-23 18:06:20 -08:00
AlessandroSigna
70cf5c6726 fixed icon position 2015-11-23 17:59:31 -08:00
AlessandroSigna
489cde7269 removed the local save of the recording 2015-11-23 17:51:58 -08:00
AlessandroSigna
44c95c13fb further UI fixes 2015-11-23 16:57:24 -08:00
Brad Hefta-Gaub
82ff0af05c Merge pull request #6472 from murillodigital/stack-manager
Stack manager - integration checkpoint
2015-11-23 16:53:53 -08:00
Leonardo Murillo
f759fa2cfa Ubuntu fixes 2015-11-23 18:30:40 -06:00
Brad Hefta-Gaub
ce46c30647 change the ScriptEngine::waitTillDoneRunning() to wait for the script thread to complete 2015-11-23 16:27:06 -08:00
Leonardo Murillo
d58b11f0a2 Ubuntu fix - case sensitivity¨ 2015-11-23 18:13:41 -06:00
Leonardo Murillo
66803ce356 Ubuntu fix - case sensitivity¨ 2015-11-23 18:04:36 -06:00
Leonardo Murillo
fee50a56e5 Ubuntu fix - case sensitivity 2015-11-23 18:02:20 -06:00
Anthony J. Thibault
8f46b8a765 Added USE_PRE_ROT_FROM_ANIM option to AnimClip
This will allow us in the future to pull preRotations from
animations instead of the model skeleton.  It is disabled
by default because our current animations preRotations are
not correct for the left hand.
2015-11-23 15:58:18 -08:00
Stephen Birarda
6339c2c48f fix for unnecessary model URL updating 2015-11-23 17:25:31 -06:00
Philip Rosedale
5c390473e7 Merge pull request #6470 from birarda/ghost-avatar
use MIN_AVATAR_SCALE to ensure avatar fades complete
2015-11-23 15:04:59 -08:00
Stephen Birarda
905e11faa3 use MIN_AVATAR_SCALE to ensure avatar fades complete 2015-11-23 16:54:17 -06:00
AlessandroSigna
8f1ce6e1fb overlay added - waiting for official logos
missing null assignment
2015-11-23 14:52:16 -08:00
Leonardo Murillo
b83e466767 Removing comments 2015-11-23 16:31:29 -06:00
Anthony J. Thibault
8252bbed9b AnimSkeleton: added pre rotation accessor methods 2015-11-23 13:50:14 -08:00
Clément Brisset
a261b240aa Merge pull request #6466 from samcake/controllers
Adding the AssetClient to the Agent
2015-11-23 13:35:50 -08:00
Andrew Meadows
865729ef26 Merge pull request #6463 from sethalves/fix-observers-dont-see-equip-motion
fix bug where observers don't see a held/equipped object moving
2015-11-23 13:17:29 -08:00
Leonardo Murillo
8b573cebfb Successfull windows build given any build type checkpoint 2015-11-23 15:16:48 -06:00