Commit graph

80307 commits

Author SHA1 Message Date
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
RebeccaStankus
cc22386f06 CR feedback changes 2019-08-20 13:29:02 -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
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
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
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
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
Simon Walton
abad9868ae Log when avatar data becomes avatar-failed 2019-08-19 12:12:10 -07:00
Zach Fox
05abff1c0b
Merge pull request #16071 from zfox23/helpApp1
Help App: Phase 1
2019-08-19 11:16:44 -07:00
Zach Fox
ca2cdfc533 Fix some engine bugs that fix muted state in all UIs including simplifiedUI 2019-08-19 11:13:11 -07:00
Zach Fox
42705c2fea
Combine conditional statements 2019-08-19 11:04:54 -07:00
Zach Fox
2b86947d4a Mipmap images; better padding 2019-08-19 10:32:08 -07:00
Ryan Huffman
b8887aa01e Fix mac launcher not correctly reading interface version
The logic to convert the interface output assumed that the output would
be null terminated, but it was not.
2019-08-19 10:02:38 -07:00
RebeccaStankus
44d0e0ba1a Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd 2019-08-19 09:16:19 -07:00
David Rowe
11f8387a5a Fix typo noticed in passing 2019-08-17 16:56:35 +12:00
David Rowe
dbb964d415 Report type of callback as "function" in JSDoc 2019-08-17 16:56:01 +12:00
Simon Walton
2fafb6822d Remove identity-resend hack - shouldn't be required now 2019-08-16 18:03:20 -07:00
Simon Walton
150b4e45d4 More robust handling of the avatar verify-failed property 2019-08-16 17:30:28 -07:00
RebeccaStankus
0699433df8 Emoji app updates emoteIndicator 2019-08-16 16:34:08 -07:00
Zach Fox
3de9f44bf3 It's working 2019-08-16 16:00:30 -07:00
Zach Fox
4c006c50aa Controls almost done 2019-08-16 15:53:30 -07:00
Zach Fox
3b138fe031
Merge pull request #16067 from zfox23/fixMutedBanner
Fix BUGZ-1263 and probably BUGZ-1273: Fix input device muted banner
2019-08-16 14:57:42 -07:00
Zach Fox
30d552919a Merge branch 'master' of github.com:highfidelity/hifi into helpApp1 2019-08-16 14:06:58 -07:00
Zach Fox
a274e5c2b1 Fix BUGZ-1263 and probably BUGZ-1273: Fix input device muted banner 2019-08-16 12:31:50 -07:00
Zach Fox
301dca6937 Merge branch 'emojiAppAdd' of github.com:MiladNazeri/hifi into emojiAppAdd 2019-08-16 12:14:52 -07:00
Zach Fox
c13697803d Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd 2019-08-16 12:14:44 -07:00