Commit graph

76880 commits

Author SHA1 Message Date
SamGondelman
da1ffc15e3 lasers scale with avatar 2019-03-01 15:42:45 -08:00
danteruiz
8e600adf1e making requested changes 2019-03-01 15:30:11 -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
Jason Najera
d41c2d296b
Merge pull request #15043 from r3tk0n/fargrab-manipulation
FarGrab Entity Rotation with Off-Hand
2019-03-01 14:42:59 -08:00
danteruiz
618a1d5b83 fix tablet button and gizmos rotation 2019-03-01 14:31:12 -08:00
NissimHadar
695367a3e2 Updated for Mac. 2019-03-01 14:28:23 -08:00
NissimHadar
fc3b629cfc New name. 2019-03-01 14:02:18 -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
20d65ab183
Merge pull request #15064 from danteruiz/another-login-fix
Case 21451: HMD Login Encouragement Screen is not Usable
2019-03-01 12:57:17 -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
amerhifi
8802eeadf6
Make CI android build signed, don't fail on quest build fails (#18)
merging build changes
2019-03-01 12:46:50 -08:00
Simon Walton
3cc932db96 More debugging for hero issues 2019-03-01 12:43:39 -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
NissimHadar
6697d9d49f Use python downloader. 2019-03-01 12:32:55 -08:00
NissimHadar
b6688868b0
Merge pull request #14991 from NissimHadar/21379-removeNitpickInstallerFromLinux
Case 21379: Remove nitpick installer from Linux
2019-03-01 11:51:49 -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
NissimHadar
8dadeb197b Corrected error message. 2019-03-01 11:35:08 -08:00
Roxanne Skelly
16eb3444c1 Code Review Fixes 2019-03-01 11:31:01 -08:00
Clement
135c7b667e Reduce size of _nodeMutex critical sections 2019-03-01 11:23:46 -08:00
raveenajain
dfb17c922b fix model not loading in bounding box 2019-03-01 11:21:29 -08:00
Jason Najera
6346df54af
Merge pull request #15061 from r3tk0n/away_bubble_protection
[MS#21495] Enable Bubble/Shield on Away
2019-03-01 11:17:48 -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
amer cerkic
3e3176d3a4 Merge branch 'master' of https://github.com/highfidelity/hifi 2019-03-01 10:23:30 -08:00
Simon Walton
d391d4af38 Debugging + tweaks 2019-03-01 10:08:22 -08:00
NissimHadar
8bd9fed93e Merge branch 'master' of github.com:highfidelity/hifi into 21482-addSSIMResultsImage 2019-03-01 10:05:20 -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
1084e79a2e
Merge pull request #15019 from AndrewMeadows/fix-crash-after-avatar-upload
Case 21422: fix crash for nullptr deref when looking at recently uploaded avatar in inventory
2019-03-01 09:35:01 -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
Shannon Romano
00ca3bc933
Merge pull request #15058 from SamGondelman/reload
Case 21490: Fix lasers and keyboard on reload
2019-03-01 09:31:56 -08:00
Shannon Romano
b5693b8364
Merge pull request #15063 from SamGondelman/chat
Case 21496: Fix chat.js textSize
2019-03-01 09:31:15 -08:00
NissimHadar
d4fa1e25fb Working. 2019-02-28 20:33:21 -08:00
Simon Walton
64a2025bcd Renaming in main loop to make source/destination clear
Also comment clean-up, etc
2019-02-28 18:40:53 -08:00
danteruiz
7bcf727a83 review changes 2019-02-28 18:11:51 -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
Clement
991bcfe2b2 Remove dead code 2019-02-28 18:00:21 -08:00
Simon Walton
5a8ecdffab EntityStats can have embedded EntityData 2019-02-28 17:37:56 -08:00
danteruiz
9fe0309ae6 another login fix 2019-02-28 17:11:48 -08:00
Shannon Romano
650fb41681
Merge pull request #15053 from SamGondelman/i
Case 21486: Fix context overlay
2019-02-28 17:06:02 -08:00
SamGondelman
b26b02fed6 potential 2d overlay threading fixes 2019-02-28 17:02:08 -08:00
Clement
a804d3532e Set default limit for other nodes to size_t max 2019-02-28 15:30:57 -08:00
SamGondelman
8d5a3debfa fix chat.js textSize 2019-02-28 15:28:18 -08:00
Dante Ruiz
d33400f6ad fix GCC compiler warning 2019-02-28 15:25:15 -08:00
Clement
9ea41f7122 CR 2019-02-28 15:22:07 -08:00
r3tk0n
1476251dcb Enable bubble on AFK, respect user setting upon return from AFK. 2019-02-28 15:21:24 -08:00