Commit graph

80640 commits

Author SHA1 Message Date
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
Andrew Meadows
c8c704eb57 revert last change 2019-08-20 17:33:29 -07:00
Andrew Meadows
6d7565a568 CharacterController don't fight MyaAvatar::safeLanding() 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
Ryan Huffman
de476d0569
Merge pull request #16075 from huffman/fix/mouse-look-stuck-on-macos
BUGZ-374: Fix Mac getting stuck in mouse look
2019-08-20 16:25:02 -07:00
Zach Fox
bc18ca21a3
Merge pull request #16079 from zfox23/fixGoToGrey
Remove unused TabletAddressDialog internal property, fixing BUGZ-1294
2019-08-20 15:35:43 -07:00
Zach Fox
5869ed3f20 Remove Emote App bar when in HMD mode and re-enable conditionally; don't allow keyboard shortcuts to work in HMD 2019-08-20 15:21:12 -07:00
Zach Fox
7f45a7b45c Show a not found message when the user searches for nonexistent emoji 2019-08-20 15:11:17 -07:00
Zach Fox
1cb4a31e09 Reticle update rate limiter; end reactions on shutdown 2019-08-20 15:02:36 -07:00
Zach Fox
cc9c9ec443 Fixup signal handling causing app errors; add keyboard navigation to emoji window 2019-08-20 14:52:19 -07:00
Zach Fox
8b79dc3020 Fix clapping silence issue 2019-08-20 14:22:13 -07:00
Zach Fox
58d83b6455 Merge branch 'emojiAppAdd' of github.com:MiladNazeri/hifi into emojiAppAdd 2019-08-20 14:17:30 -07:00
RebeccaStankus
0be3f133de Removed some Milad notes 2019-08-20 14:17:00 -07:00
Zach Fox
70b3f44f8c Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd 2019-08-20 14:04:35 -07:00
RebeccaStankus
a78284871e more CR feedback changes 2019-08-20 13:59:41 -07:00
luiscuenca
4ced14c908
Fix warnings 2019-08-20 13:39:04 -07:00
RebeccaStankus
cc22386f06 CR feedback changes 2019-08-20 13:29:02 -07:00
Zach Fox
780a081d16 Remove unused TabletAddressDialog internal property, fixing BUGZ-1294 2019-08-20 12:05:00 -07:00
Zach Fox
41d992a307
Merge pull request #16078 from zfox23/helpSupport1
DEV-412: Implement Support tab in Help app
2019-08-20 11:57:44 -07:00
dooglifeSF
8d05d9e5d4 fix the worst of the mismatched emote poses for the eval mtg 2019-08-20 11:57:20 -07:00
Zach Fox
bb97b4f866 Fix BUGZ-1303: Make 'View All Controls' go to knowledge base 2019-08-20 11:17:05 -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
Zach Fox
0cc28c58ae DEV-415: Implement Support tab in Help app 2019-08-20 10:54:58 -07:00
Zach Fox
010b4b8312
Merge pull request #16076 from zfox23/removeAboutFromSettings
Remove 'About' tab from Settings
2019-08-20 10:46:42 -07:00
dooglifeSF
8a3b93b913 add 3 sits with different hand placements for eval - also 2 new sit emotes 2019-08-20 10:35:56 -07:00
Sam Gateau
6cd37ef73c Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-08-20 09:41:08 -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
Sam Gateau
c5bd9ecf4f REfreshing the antialiasing qml na dconfig of the Jitter Job 2019-08-19 18:14:29 -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
78edfb9af9 Remove 'About' tab from Settings 2019-08-19 17:22:38 -07:00
Zach Fox
1d3741546e Merge branch 'emojiAppAdd' of github.com:MiladNazeri/hifi into emojiAppAdd 2019-08-19 16:48:46 -07:00
Zach Fox
083470e4fe Ensure that geometryChanged is emitted after docked widget is resized 2019-08-19 16:48:40 -07:00
Ryan Huffman
8097ecef11 Fix cmd-leftclick not working correctly on Mac OS
On Mac OS, Cmd+LeftClick is treated as a RightClick (more specifically, it seems to
be Cmd+RightClick without the modifier being dropped). Starting in Qt 5.12, only
on Mac, the MouseButtonRelease event for these mouse presses are sent to the top
level QWidgetWindow, but are not propagated further. The change here gets around
this problem by capturing these pseudo-RightClicks, and re-emitting them as
"pure" RightClicks.
2019-08-19 15:53:20 -07:00
Shannon Romano
c73dab1051
Merge pull request #16068 from ctrlaltdavid/DOC-95
DOC-95: Fix callback functions' display in JSDoc
2019-08-19 15:43:48 -07:00
RebeccaStankus
022d1aee8e Added check to remove persisting reticle entities on script startup 2019-08-19 15:36:21 -07:00
Zach Fox
b40d5658e3 Moved a timer from JS to QML; progress circle on Emote Indicator 2019-08-19 15:12:48 -07:00
Zach Fox
fd287654f4 Fixup keyboard shortcuts; Modify tooltips 2019-08-19 14:19:25 -07:00
Ryan Huffman
afc9863e17
Merge pull request #16070 from huffman/fix/mac-launcher-read-stdout
BUGZ-1293: Fix mac launcher not correctly reading interface version
2019-08-19 14:12:09 -07:00
Jamil Akram
a3919af747
Merge pull request #16062 from dooglifeSF/animation_json_tuning
Tuning pass on anim-graph, using the new blend modes and engine features
2019-08-19 14:02:37 -07:00
Zach Fox
14a04dfb1a Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd 2019-08-19 13:52:35 -07:00
RebeccaStankus
e690d4f7ef Limited distance to rez a point reticle 2019-08-19 13:40:50 -07:00
RebeccaStankus
4787785660 first version of pointing reticle 2019-08-19 13:19:01 -07:00
Zach Fox
072261f551
Merge pull request #16074 from zfox23/helpQuickFixes
BUGZ-1295: Fix typo in Help > Controls > Turn Right
2019-08-19 13:15:10 -07:00
Zach Fox
36dffb7dc8
Merge pull request #16073 from zfox23/micIconFix
Fix some engine bugs that fix muted state in all UIs including simplifiedUI
2019-08-19 13:09:43 -07:00
Zach Fox
35a2cb7f27 BUGZ-1295: Fix typo in Help > Controls > Turn Right 2019-08-19 13:08:42 -07:00