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
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
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
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
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
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
luiscuenca
08e367ffb8
Improve sphere collapsing
2019-08-19 10:53:22 -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
Ryan Huffman
73c120b154
Add mac launcher logging around latest build
2019-08-19 10:00:29 -07:00
Ryan Huffman
5916fb42ac
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 09:59:16 -07:00
Ryan Huffman
5ae6a323ac
Cleanup macos launcher download spam
2019-08-19 09:58:22 -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
Ryan Huffman
8642f2aaf8
Fix mac launcher not handling networking failures when requesting builds
2019-08-16 17:07:35 -07:00
Ryan Huffman
322ba3ad55
Add env variable to adjust builds URL in mac launcher
2019-08-16 17:07:35 -07:00
Ryan Huffman
1e65908e43
Add build tags to Mac launcher
2019-08-16 17:07:35 -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
