Anthony Thibault
7585391642
Merge pull request #15031 from luiscuenca/upVectorFBXFix
...
Read and apply the upVector parameter when importing FBX files
2019-03-05 16:27:42 -08:00
Shannon Romano
4f3d593d90
Merge pull request #15072 from SamGondelman/clear
...
Case 11775: Don't clear my avatar entities on domain switch
2019-03-05 15:42:51 -08:00
Sam Gondelman
94cc5b83ac
Merge pull request #15088 from SamGondelman/create
...
Case 21541: Fix mouse on create in HMD
2019-03-05 13:07:49 -08:00
John Conklin II
4729c8737e
Merge pull request #15095 from amerhifi/master
...
case 21563: adding modelScale initialization so that it does not fail the validSc…
2019-03-05 11:46:32 -08:00
Sam Gondelman
fd5e2b4672
Merge pull request #15082 from SamGondelman/modelCrash
...
Case 21528: Possible fix for model crash
2019-03-05 11:27:46 -08:00
amer cerkic
fab343a1d4
correcting spacing
2019-03-05 10:52:54 -08:00
amer cerkic
36e9c604e9
fixed based on comment
2019-03-05 10:45:15 -08:00
amer cerkic
29a308dcaa
adding modelScale initialization so that it does not fail the validScale check assert
2019-03-05 10:07:33 -08:00
SamGondelman
f2c248c0a2
disable href and entity script events when in edit mode
2019-03-04 17:10:20 -08:00
SamGondelman
fd88ec0d16
need to copy meshStates on main thread
2019-03-04 15:25:02 -08:00
SamGondelman
12f5a735d9
simplifying mouse events and fix mouse on create
2019-03-04 14:50:09 -08:00
luiscuenca
b2d08e9d42
apply axis rotation to translation and meshes
2019-03-04 15:33:21 -07:00
Shannon Romano
29d5574d93
Merge pull request #15036 from SimonWalton-HiFi/connect-class-in-nodelist-thread
...
Connection class should run in NodeList thread
2019-03-04 12:30:24 -08:00
amantley
e955c02e07
Merge pull request #15046 from amantley/bugRootHips
...
Bug Fix for the Hips not translating correctly when Hips and Root have the same location
2019-03-04 14:05:33 -05:00
Shannon Romano
06d89dc81a
Merge pull request #15077 from SamGondelman/resourceCrash
...
Case 21344: Fix resource crash on invalid resource
2019-03-04 10:47:57 -08:00
SamGondelman
708632ee82
possible fix for model crash
2019-03-04 10:00:26 -08:00
John Conklin II
d96038fd70
Merge pull request #14966 from raveenajain/gltf_model_parts
...
Case: 21139 gltf model parts
2019-03-01 16:26:17 -08:00
SamGondelman
884a64bfa6
fix resource crash
2019-03-01 15:50:50 -08:00
amantley
c046b8ffd3
made is so the boneLengthScale is only computed once per animation clip
2019-03-01 15:12:37 -08:00
Sam Gateau
cc9a3e2541
Merge pull request #15052 from amerhifi/quest-demo
...
case 21485: removing quest-demo specific changes
2019-03-01 15:03:44 -08:00
SamGondelman
3e6061e435
try to not clear my avatar entities on domain switch
2019-03-01 13:45:00 -08:00
amantley
a11c4bf4e3
resolved conflict with master in AnimClip.cpp
2019-03-01 13:35:08 -08:00
Anthony Thibault
369c718ba8
Merge pull request #15068 from hyperlogic/bug-fix/avatar-missing-animated-joints-bug
...
Fix for case when animated joints are missing from the target avatar
2019-03-01 13:03:29 -08:00
Shannon Romano
5db5fca81e
Merge pull request #15066 from SamGondelman/2d
...
Case 19188: Potential 2D overlay + Tablet threading fixes
2019-03-01 12:56:23 -08:00
amantley
54f14b2772
added the case where my avatar has no parent of hips, but the animation does
2019-03-01 12:41:05 -08:00
amantley
217145f4c5
This pr addresses two issues related to avatars that have parents joints
...
above their hip joints. First on the IK side this prevents parent joints
from being included in the accumulators in AnimInverseKinematics. Second
in AnimClip the boneLengthScale now takes into account translation and
scale on these extra parent joints.
2019-03-01 11:42:03 -08:00
raveenajain
dfb17c922b
fix model not loading in bounding box
2019-03-01 11:21:29 -08:00
Anthony Thibault
82b2050229
code review feedback
2019-03-01 11:13:56 -08:00
amer cerkic
ad69611b7c
removing redef of the two functions in avatar.h
2019-03-01 11:08:00 -08:00
SamGondelman
cfb84967d5
these seemed dangerous
2019-03-01 10:54:44 -08:00
amer cerkic
6ebc57994b
Merge branch 'master' into quest-demo
2019-03-01 10:23:41 -08:00
Shannon Romano
33e061b09b
Merge pull request #15022 from danteruiz/fix-tablet-scaling
...
Case 21424: Tablet does not properly resize when scaling avatar.
2019-03-01 09:37:47 -08:00
Shannon Romano
d68f82eb7d
Merge pull request #15060 from AndrewMeadows/avoid-mem-leaked-entities
...
Case 21494: Avoid mem leaked entities
2019-03-01 09:34:20 -08:00
Anthony Thibault
9a2bd87278
Fix for case when animated joints are missing from the target avatar skeleton
...
By copying the animation rotations over to the target avatar in absolute frame, rather then relative,
we can properly "combine" animated rotations that aren't in the target avatar skeleton.
2019-02-28 18:02:07 -08:00
Dante Ruiz
d33400f6ad
fix GCC compiler warning
2019-02-28 15:25:15 -08:00
Andrew Meadows
8a7853a701
remove crufty comment
2019-02-28 14:38:13 -08:00
Andrew Meadows
33d6e2ce3b
avoid mem-leaked entities when clearing tree
2019-02-28 14:21:35 -08:00
Andrew Meadows
ed9ebf84c9
remove unuseful log entry
2019-02-28 14:21:14 -08:00
amerhifi
35dc13e06a
Merge branch 'master' into quest-demo
2019-02-28 14:06:47 -08:00
danteruiz
f715dbe243
fix tablet scaling
2019-02-28 13:32:12 -08:00
raveenajain
c1516df58d
transforms using joints
2019-02-28 11:35:29 -08:00
amer cerkic
faedc61c37
removing quest-demo specific changes
2019-02-28 10:54:30 -08:00
Anthony Thibault
72f198fe00
Merge pull request #14904 from hyperlogic/feature/preserve-default-scale
...
Case 20943: Animations should preserve avatar joint scale
2019-02-27 16:49:27 -08:00
Anthony Thibault
b5f5900633
Replace animation scale with scale from avatar default pose
...
This allows avatars to have scale on their joints without being clobbered by animations.
Renamed variables for easier maintenance.
Also small optimization when no ikNode is present.
2019-02-27 14:40:08 -08:00
Shannon Romano
c9edf86558
Merge pull request #15040 from SamGondelman/web
...
Case 21453: Fix web interaction and debug print filling logs
2019-02-27 11:19:20 -08:00
luiscuenca
ff7995ae18
Right fix
2019-02-26 18:29:55 -07:00
SamGondelman
4d591e0624
fix web interaction and debug print filling logs
2019-02-26 16:30:31 -08:00
John Conklin II
2449693d8b
Merge pull request #15006 from Atlante45/fix/shared-connection-master
...
Case 21407: Delete old nodes with identical socket
2019-02-26 16:24:03 -08:00
amer cerkic
19d584f0af
added Sams suggestions to the logic
2019-02-26 15:28:28 -08:00
amer cerkic
f5852139f7
fixing comment since the original check was correct
2019-02-26 15:05:58 -08:00
