Howard Stearns
6f50d91208
Merge pull request #6461 from hyperlogic/tony/remove-joint-states
...
Refactor of Rig and MyAvatar animation JavaScript interface
2015-11-30 16:28:15 -08:00
Clément Brisset
e168966b87
Merge pull request #6409 from birarda/injector-hybrid
...
more efficient threading of networked AudioInjector objects
2015-11-30 15:36:41 -08:00
Anthony J. Thibault
e2d9e37eb8
Fix for head offset for models with no eyes
...
This was causing in correct body poses while wearing an HMD.
2015-11-30 14:08:21 -08:00
Anthony J. Thibault
11bfed4185
Merge branch 'master' into tony/remove-joint-states
2015-11-30 11:21:44 -08:00
James B. Pollack
85b8266537
Merge pull request #6494 from ctrlaltdavid/20744
...
Fix menu shortcuts created in JavaScript not working
2015-11-30 11:20:10 -08:00
Andrew Meadows
49a6f63663
remove whitespace and fix warning (unused var)
2015-11-30 10:00:05 -08:00
David Rowe
d6b13ef42c
Fix crash when try to remove invalid menu item in JavaScript
2015-11-30 08:33:38 +13:00
Anthony J. Thibault
7c9cb97783
Merge branch 'master' into tony/remove-joint-states
2015-11-25 15:48:51 -08:00
Andrew Meadows
527408c7c1
Merge pull request #6292 from huffman/physics-continuous-collision-detection
...
Physics continuous collision detection
2015-11-25 15:45:18 -08:00
Anthony J. Thibault
5072339a22
Warning fix
2015-11-25 14:04:01 -08:00
Anthony J. Thibault
23def8d173
Merge branch 'master' into tony/remove-joint-states
2015-11-25 13:55:23 -08:00
Anthony J. Thibault
2a9adafc09
Bumped avatar packet version number
2015-11-25 12:13:40 -08:00
Anthony J. Thibault
97a2eb62d4
Fix for incorrect avatar bounds after changing avatars
2015-11-25 12:06:50 -08:00
Clément Brisset
5ff482071e
Merge pull request #6465 from ericrius1/polyLineFix
...
moved logic to build vertex buffer to renderable polyline class, recalculati…
2015-11-25 11:02:02 -08:00
Anthony J. Thibault
868cf83b48
Fix for attachments and MyAvatar::getDefaultEyePosition()
2015-11-25 10:07:29 -08:00
Andrew Meadows
bc20b72645
Merge pull request #6453 from howard-stearns/avatar-render-controller2
...
Survive Flash Mobs Without Making Everyone Sick
2015-11-25 09:52:28 -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
386dad7aff
Fixes hand IK for some avatars
...
Specifically:
https://hifi-content.s3.amazonaws.com/ozan/dev/avatars/hifi_team/ryan/_test/ryan.fst
https://hifi-content.s3.amazonaws.com/ozan/dev/avatars/hifi_team/brad/brad.fst
https://s3.amazonaws.com/hifi-public/tony/blackmery/blackmery.fst
These avatars have "Hips" joints that are NOT the root of the skeleton.
This would cause the getRootAbsoluteBindPoseByChildName() to return (0,0,0).
Causing the IK targets to be lower then they should have.
2015-11-24 18:57:35 -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
ab7cbc0b76
Merge branch 'master' of https://github.com/highfidelity/hifi into injector-hybrid
2015-11-24 10:45:00 -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
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
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
Brad Hefta-Gaub
ce46c30647
change the ScriptEngine::waitTillDoneRunning() to wait for the script thread to complete
2015-11-23 16:27:06 -08: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
Stephen Birarda
0997d3dcae
resolve conflicts on merge with upstream/master
2015-11-23 16:15:15 -06:00
Anthony J. Thibault
8252bbed9b
AnimSkeleton: added pre rotation accessor methods
2015-11-23 13:50:14 -08:00
ericrius1
1409ed2d18
moved logic to build vertices buffer to renderable class, recalculating vertices anytime any of the normals, point, or strokeWidths data changes
2015-11-23 12:28:44 -08:00
Seth Alves
d4937071e1
rather than activating rigid body and forcing non-static on deserialize, just force non-static
2015-11-23 12:17:15 -08:00
Anthony J. Thibault
dd3f43705c
Fix for Model Entity animations.
...
Because rig->setJoint* methods take parameters in geometry space
the animations preRotation has to be applied manually.
2015-11-23 11:06:11 -08:00
Howard Stearns
c94a5389a0
comments
2015-11-23 10:31:37 -08:00
Seth Alves
6f19093cb9
if an entity with an action has a motion-type of static, flag it so it gets updated in bullet
2015-11-23 10:03:35 -08:00
