Commit graph

33226 commits

Author SHA1 Message Date
Andrew Meadows
b33e5a60c2
Merge pull request #16086 from AndrewMeadows/opaque-polylines
BUGZ-1170: improved render bounding box for PolyLines; use opaque pipeline when possible
2019-08-23 11:41:19 -07:00
Shannon Romano
74363a4382
Merge pull request #16065 from luiscuenca/fixDuplicatedJoint
BUGZ-186: Make sure joint names are unique
2019-08-23 10:55:58 -07:00
luiscuenca
07d17343bf
fix warnigns 2019-08-23 07:21:19 -07:00
Shannon Romano
4d71891763
Merge pull request #16072 from luiscuenca/improveSphereCollapsing
BUGZ-1156: Improve sphere collapsing mode
2019-08-22 16:10:53 -07:00
luiscuenca
4b1b61ae5b
Keep new offset rotation method and resolve duplicates at the end 2019-08-22 13:16:32 -07:00
Zach Fox
330b8ceb91 Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd 2019-08-22 10:24:00 -07:00
Andrew Meadows
8957cc5b2b render opaque PolyLines with opaque pipepline 2019-08-22 08:13:11 -07:00
Andrew Meadows
81eaf157a6 tighter bounding box when rendering PolyLines 2019-08-22 08:13:11 -07:00
Shannon Romano
3b3bce059b
Merge pull request #16080 from roxanneskelly/bugz1275
BUGZ-1275 Additional Grapics API info was added to the system info, which overflowed the amount of info that could be sent in a packet.
2019-08-21 15:34:31 -07:00
Andrew Meadows
54c69001b9 clarify safeLanding retry rate 2019-08-20 17:33:29 -07:00
Andrew Meadows
7084908df3 add isStuck logging, add assert because singleton 2019-08-20 17:33:29 -07:00
Andrew Meadows
4f0c2c5ee6 remove incorrect assert 2019-08-20 17:33:29 -07:00
Andrew Meadows
434af8bdfb remove support for sub-contactAddecCallbacks from PhysicsEngine 2019-08-20 17:33:29 -07:00
Andrew Meadows
dba7cadcae remove cruft 2019-08-20 17:33:29 -07:00
Andrew Meadows
42d2d4bbe5 fix warning in VisualStudio 2019-08-20 17:33:29 -07:00
Andrew Meadows
113d132d8e use pairwise collision filtering to help unstuck MyAvatar 2019-08-20 17:33:29 -07:00
Andrew Meadows
7cf0899d59 more correct safeLanding trigger 2019-08-20 17:33:29 -07:00
Andrew Meadows
027a9d34d4 fix warning on windows about signed conversion of unsigned int 2019-08-20 17:33:29 -07:00
Andrew Meadows
32400a6baf improved isStuck detection and MyAvatar::safeLanding() trigger 2019-08-20 17:33:29 -07:00
Andrew Meadows
9382fb8745 more versatile contactAddedCallback support 2019-08-20 17:33:29 -07:00
Roxanne Skelly
8ac185af11 Additional Grapics API info was added to the system info, which
overflowed the amount of info that could be sent in a packet.
2019-08-20 16:33:29 -07:00
Zach Fox
70b3f44f8c Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd 2019-08-20 14:04:35 -07:00
luiscuenca
4ced14c908
Fix warnings 2019-08-20 13:39:04 -07:00
Anthony Thibault
2b74e2a7fa
Merge pull request #16066 from hyperlogic/bug-fix/sit-bug-fixes
Avatar sitting bug fixes
2019-08-20 11:09:25 -07:00
luiscuenca
a9ebe22072
improve algorithm and fix issues 2019-08-20 09:15:36 -07:00
RebeccaStankus
e48e733343 Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd 2019-08-20 09:01:18 -07:00
Shannon Romano
1569c4049f
Merge pull request #16069 from SimonWalton-HiFi/nonverified-avatar-more-robust
BUGZ-1247: Better handling of other-avatar verify-failed appearance
2019-08-19 17:32:27 -07:00
Zach Fox
083470e4fe Ensure that geometryChanged is emitted after docked widget is resized 2019-08-19 16:48:40 -07:00
Simon Walton
abad9868ae Log when avatar data becomes avatar-failed 2019-08-19 12:12:10 -07:00
luiscuenca
32a43d5549
Remove unused variable 2019-08-19 12:08:46 -07:00
luiscuenca
08e367ffb8
Improve sphere collapsing 2019-08-19 10:53:22 -07:00
Simon Walton
150b4e45d4 More robust handling of the avatar verify-failed property 2019-08-16 17:30:28 -07:00
Anthony J. Thibault
381f7c6bc4 Avatar sitting bug fixes
* Added seatedToIdle transition, to make transition quicker to better match the capsule physics.
* Made switching into and out of instantly set animVar for the animation graph, previously it was delayed by 100 ms.
* Created "isNotSeated" anim var for exiting the seated state.
* MyAvatar::beginSit & MyAvatar::endSit no longer calls goToPosition, instead MyAvatar::slamPosition is called.
* MyAvatar::slamPosition will cause the AvatarTransit class to NOT play the teleport anticipation/reaction animation.
  Note: This does not prevent other clients from interpolating the position when entering the seat, but it prevents the teleport reaction animation from playing.
* Disable leg IK in HMD mode while seated.
2019-08-16 10:57:03 -07:00
Simon Walton
85da916a3b
Merge pull request #16061 from SimonWalton-HiFi/entities-scriptengine-takedown
BUGZ-984: Wait for client entity-scripts to unload when shutting down
2019-08-16 10:12:38 -07:00
luiscuenca
260ee59585
Make sure joint names are unique 2019-08-15 16:57:17 -07:00
luiscuenca
2ef1c6458a
Fix joint indexing when duplicated joint on skeleton 2019-08-15 14:53:30 -07:00
Anthony Thibault
4d2e7eaaba
Merge pull request #16059 from luiscuenca/fixMultisphereCrash
BUGZ-1156: Allow collapsing of all multi spheres
2019-08-15 10:40:29 -07:00
Brad Hefta-Gaub
b0b406adda
Merge pull request #16015 from HifiExperiments/renderUpdate
BUGZ-902: Drastically reduce locking and branching necessary for render updates
2019-08-15 09:35:17 -07:00
Shannon Romano
d9f78499ef
Merge pull request #16053 from samcake/toulouse
BUGZ-1173, BUGZ-1175: On Windows, Fix black edges on whiteboard lines in Forward and more issues in GL41Backend
2019-08-15 09:34:03 -07:00
Brad Hefta-Gaub
1e5c81c251
Merge pull request #16058 from jherico/fix/bugz-1119
BUGZ-1119: workaround for race condition crash in QML rendering
2019-08-15 09:32:31 -07:00
Simon Walton
9aacd136b8 Add blocking to script unload for client entity-scripts 2019-08-14 13:51:40 -07:00
Sam Gateau
eb24667218 Remove useless variable 2019-08-14 11:54:39 -07:00
Sam Gateau
a5e2cacb98 Apply the new tiering rule for macos: if intel gpu go low, else stick to mid 2019-08-14 11:45:27 -07:00
Sam Gateau
859016bf37 Addressing review comments 2019-08-14 10:28:42 -07:00
luiscuenca
02e730a4d9
fix size_t warning 2019-08-14 08:08:32 -07:00
Sam Gateau
5c085bd08d CLean the code of the task::COnfig changes 2019-08-13 18:58:35 -07:00
Sam Gateau
4a93b23d83 Address the procedural to populate all reflection versions with user uniforms bindings and make EnigneInspector works correctly 2019-08-13 18:47:57 -07:00
luiscuenca
1570c59a45
Allow collapsing of all multi spheres 2019-08-13 16:06:44 -07:00
Brad Davis
3e862950a8 BUGZ-1119: workaround for race condition crash in QML rendering 2019-08-13 15:47:59 -07:00
Sam Gateau
224e9590ec avoid using explicit dialects when we want just a default one 2019-08-13 15:45:24 -07:00